svn commit: samba r6955 - in trunk/source: registry rpc_server

[jerry at samba.org]

Author: jerry
Date: 2005-05-24 13:22:04 +0000 (Tue, 24 May 2005)
New Revision: 6955

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6955

Log:
merging vl's reg_printing.c fix from 3.0 (and another spoolss changes as well)
Modified:
   trunk/source/registry/reg_printing.c
   trunk/source/rpc_server/srv_spoolss_nt.c


Changeset:
Modified: trunk/source/registry/reg_printing.c
===================================================================
--- trunk/source/registry/reg_printing.c	2005-05-24 12:28:11 UTC (rev 6954)
+++ trunk/source/registry/reg_printing.c	2005-05-24 13:22:04 UTC (rev 6955)
@@ -55,9 +55,9 @@
 	uint16 key_len = strlen(path);
 	uint16 base_key_len;
 
-	static int key_printing_len = strlen( KEY_PRINTING );
-	static int key_printing2k_len = strlen( KEY_PRINTING_2K );
-	static int key_printing_ports_len = strlen( KEY_PRINTING_PORTS );
+	int key_printing_len = strlen( KEY_PRINTING );
+	int key_printing2k_len = strlen( KEY_PRINTING_2K );
+	int key_printing_ports_len = strlen( KEY_PRINTING_PORTS );
 
 
 	

Modified: trunk/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- trunk/source/rpc_server/srv_spoolss_nt.c	2005-05-24 12:28:11 UTC (rev 6954)
+++ trunk/source/rpc_server/srv_spoolss_nt.c	2005-05-24 13:22:04 UTC (rev 6955)
@@ -28,6 +28,8 @@
 
 #include "includes.h"
 
+extern userdom_struct current_user_info;
+
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
@@ -6032,7 +6034,6 @@
 
 static BOOL add_printer_hook(NT_USER_TOKEN *token, NT_PRINTER_INFO_LEVEL *printer)
 {
-	extern userdom_struct current_user_info;
 	char *cmd = lp_addprinter_cmd();
 	char **qlines;
 	pstring command;