[SCM] Samba Shared Repository - branch master updated

[Jim McDonough]

The branch, master has been updated
       via  efd8229... s3-printing: fix BUG 7280 - auto printers not loading with registry config
      from  dadcc84... s4:samdb_set_password_sid - fix comment

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


- Log -----------------------------------------------------------------
commit efd822982e531d82b4b95624146b90cd3334f78f
Author: Jim McDonough <jmcd at samba.org>
Date:   Mon Aug 16 14:07:44 2010 -0400

    s3-printing: fix BUG 7280 - auto printers not loading with registry
    config

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

Summary of changes:
 source3/printing/load.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/load.c b/source3/printing/load.c
index dd5d4ea..4f1bb88 100644
--- a/source3/printing/load.c
+++ b/source3/printing/load.c
@@ -32,6 +32,10 @@ static void add_auto_printers(void)
 	char *saveptr;
 
 	if (pnum < 0)
+		if (process_registry_service(PRINTERS_NAME))
+			pnum = lp_servicenumber(PRINTERS_NAME);
+
+	if (pnum < 0)
 		return;
 
 	if ((str = SMB_STRDUP(lp_auto_services())) == NULL)


-- 
Samba Shared Repository