[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  45952b5... spoolss: fix potential crash bug in spoolss_PrinterEnumValues push path.
       via  ff1c5b3... s3-spoolss: remove unused MAX_OPEN_PRINTER_EXS define.
      from  322b524... s3-build: fix some c++ build warnings.

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


- Log -----------------------------------------------------------------
commit 45952b56797982d27731b20d97f5648c9414814a
Author: Günther Deschner <gd at samba.org>
Date:   Mon Aug 2 15:52:09 2010 +0200

    spoolss: fix potential crash bug in spoolss_PrinterEnumValues push path.
    
    Guenther

commit ff1c5b37f619ed3373b65af72c026a36de4b94c9
Author: Günther Deschner <gd at samba.org>
Date:   Mon Aug 2 15:31:10 2010 +0200

    s3-spoolss: remove unused MAX_OPEN_PRINTER_EXS define.
    
    Guenther

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

Summary of changes:
 librpc/idl/spoolss.idl              |    2 +-
 source3/rpc_server/srv_spoolss_nt.c |    4 ----
 2 files changed, 1 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 028015b..c61cba5 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -2855,7 +2855,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
 		[value(2*strlen_m_term(value_name))] uint32 value_name_len;
 		winreg_Type type;
 		[relative,subcontext(0),subcontext_size(data_length),flag(NDR_REMAINING)] DATA_BLOB *data;
-		[value(data->length)] uint32 data_length;
+		[value(data ? data->length : 0)] uint32 data_length;
 	} spoolss_PrinterEnumValues;
 
 	[public,noopnum,noprint] WERROR _spoolss_EnumPrinterDataEx(
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 9ef1ff1..1d9632f 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -54,10 +54,6 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
-#ifndef MAX_OPEN_PRINTER_EXS
-#define MAX_OPEN_PRINTER_EXS 50
-#endif
-
 static Printer_entry *printers_list;
 
 typedef struct _counter_printer_0 {


-- 
Samba Shared Repository