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 ed967fb0a7c64ca8a320e2ca5018163cd86166b4..874f7f25215560a5717905baed1f5810fea4e208 100644 (file)
--- a/source3/printing/load.c
+++ b/source3/printing/load.c
@@ -5,7 +5,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -14,52 +14,42 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 
 
-/***************************************************************************
-auto-load printer services
-***************************************************************************/
-void add_all_printers(void)
-{
-       int printers = lp_servicenumber(PRINTERS_NAME);
-
-       if (printers < 0) return;
-
-       pcap_printer_fn(lp_add_one_printer);
-}
-
 /***************************************************************************
 auto-load some homes and printer services
 ***************************************************************************/
 static void add_auto_printers(void)
 {
-       char *p;
-       int printers;
-       char *str = strdup(lp_auto_services());
+       const char *p;
+       int pnum = lp_servicenumber(PRINTERS_NAME);
+       char *str;
+       char *saveptr;
+
+       if (pnum < 0)
+               if (process_registry_service(PRINTERS_NAME))
+                       pnum = lp_servicenumber(PRINTERS_NAME);
 
-       if (!str) return;
+       if (pnum < 0)
+               return;
 
-       printers = lp_servicenumber(PRINTERS_NAME);
+       if ((str = SMB_STRDUP(lp_auto_services())) == NULL)
+               return;
 
-       if (printers < 0) {
-        SAFE_FREE(str);
-        return;
-    }
-       
-       for (p=strtok(str,LIST_SEP);p;p=strtok(NULL,LIST_SEP)) {
-               if (lp_servicenumber(p) >= 0) continue;
+       for (p = strtok_r(str, LIST_SEP, &saveptr); p;
+            p = strtok_r(NULL, LIST_SEP, &saveptr)) {
+               if (lp_servicenumber(p) >= 0)
+                       continue;
                
-               if (pcap_printername_ok(p,NULL)) {
-                       lp_add_printer(p,printers);
-               }
+               if (pcap_printername_ok(p))
+                       lp_add_printer(p, pnum);
        }
 
-    SAFE_FREE(str);
+       SAFE_FREE(str);
 }
 
 /***************************************************************************
@@ -67,7 +57,12 @@ load automatic printer services
 ***************************************************************************/
 void load_printers(void)
 {
+       if (!pcap_cache_loaded())
+               pcap_cache_reload();
+
        add_auto_printers();
-       if (lp_load_printers())
-               add_all_printers();
+
+       /* load all printcap printers */
+       if (lp_load_printers() && lp_servicenumber(PRINTERS_NAME) >= 0)
+               pcap_printer_fn(lp_add_one_printer, NULL);
 }