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

[samba.git] / source3 / printing / load.c

diff --git a/source3/printing/load.c b/source3/printing/load.c
index 23144d5a9550dc9e6ba2bea5eaf94d6bccaf4427..874f7f25215560a5717905baed1f5810fea4e208 100644 (file)
--- a/source3/printing/load.c
+++ b/source3/printing/load.c
@@ -30,6 +30,10 @@ static void add_auto_printers(void)
        char *str;
        char *saveptr;
 
+       if (pnum < 0)
+               if (process_registry_service(PRINTERS_NAME))
+                       pnum = lp_servicenumber(PRINTERS_NAME);
+
        if (pnum < 0)
                return;
 
@@ -60,5 +64,5 @@ void load_printers(void)
 
        /* load all printcap printers */
        if (lp_load_printers() && lp_servicenumber(PRINTERS_NAME) >= 0)
-               pcap_printer_fn(lp_add_one_printer);
+               pcap_printer_fn(lp_add_one_printer, NULL);
 }