[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  07697fa s3-auth_util: make sure the system server info actually contains S-1-5-18.
       via  314d738 s3-printing: remove unused old structs.
      from  b4a5ece ldb: Fix path to alternative buildtools.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 07697fa053099a01035a30f4d05dffeafff96c75
Author: Günther Deschner <gd at samba.org>
Date:   Tue Sep 28 07:45:47 2010 +0200

    s3-auth_util: make sure the system server info actually contains S-1-5-18.
    
    Without this, all security descriptor checks for the winreg spoolss backend fail
    and make our spoolss system in its current shape basically unusable.
    
    Andreas, please check.
    
    Guenther

commit 314d738f907958a86e2638689f5c45f3b931047e
Author: Günther Deschner <gd at samba.org>
Date:   Tue Sep 28 05:39:42 2010 +0200

    s3-printing: remove unused old structs.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/auth/auth_util.c      |    9 ++++++
 source3/include/nt_printing.h |   60 -----------------------------------------
 2 files changed, 9 insertions(+), 60 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 94adc3c..9fbc7f1 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -768,6 +768,15 @@ static NTSTATUS make_new_server_info_system(TALLOC_CTX *mem_ctx,
 
 	(*server_info)->system = true;
 
+	status = add_sid_to_array_unique((*server_info)->ptok->sids,
+					 &global_sid_System,
+					 &(*server_info)->ptok->sids,
+					 &(*server_info)->ptok->num_sids);
+	if (!NT_STATUS_IS_OK(status)) {
+		TALLOC_FREE((*server_info));
+		return status;
+	}
+
 	return NT_STATUS_OK;
 }
 
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index 52b11fe..d244b2c 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -25,66 +25,6 @@
 #include "client.h"
 #include "../librpc/gen_ndr/srv_spoolss.h"
 
-/* container for a single registry key */
-
-typedef struct {
-	char			*name;
-	struct regval_ctr	*values;
-} NT_PRINTER_KEY;
-
-/* container for all printer data */
-
-typedef struct {
-	int		num_keys;
-	NT_PRINTER_KEY	*keys;
-} NT_PRINTER_DATA;
-
-typedef struct nt_printer_info_level_2
-{
-	uint32 attributes;
-	uint32 priority;
-	uint32 default_priority;
-	uint32 starttime;
-	uint32 untiltime;
-	uint32 status;
-	uint32 cjobs;
-	uint32 averageppm;
-	fstring servername;
-	fstring printername;
-	fstring sharename;
-	fstring portname;
-	fstring drivername;
-	char comment[1024];
-	fstring location;
-	struct spoolss_DeviceMode *devmode;
-	fstring sepfile;
-	fstring printprocessor;
-	fstring datatype;
-	fstring parameters;
-	NT_PRINTER_DATA *data;
-	struct sec_desc_buf *secdesc_buf;
-	uint32 changeid;
-	uint32 c_setprinter;
-	uint32 setuptime;	
-} NT_PRINTER_INFO_LEVEL_2;
-
-typedef struct nt_printer_info_level
-{
-	NT_PRINTER_INFO_LEVEL_2 *info_2;
-} NT_PRINTER_INFO_LEVEL;
-
-typedef struct
-{
-	fstring name;
-	uint32 flag;
-	uint32 width;
-	uint32 length;
-	uint32 left;
-	uint32 top;
-	uint32 right;
-	uint32 bottom;
-} nt_forms_struct;
-
 #ifndef SAMBA_PRINTER_PORT_NAME
 #define SAMBA_PRINTER_PORT_NAME "Samba Printer Port"
 #endif


-- 
Samba Shared Repository