Changeset 988 for vendor/current/source3/printing/load.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/printing/load.c (modified) (4 diffs)

vendor/current/source3/printing/load.c

@@ -21 +21 @@
 #include "printing/pcap.h"
 #include "printing/load.h"
+#include "lib/param/loadparm.h"
 
 /***************************************************************************
@@ -40 +41 @@
                 return;
 
-        auto_serv = lp_auto_services();
+        auto_serv = lp_auto_services(talloc_tos());
         str = SMB_STRDUP(auto_serv);
         TALLOC_FREE(auto_serv);
@@ -65 +66 @@
                    struct messaging_context *msg_ctx)
 {
-        SMB_ASSERT(pcap_cache_loaded());
+        SMB_ASSERT(pcap_cache_loaded(NULL));
 
         add_auto_printers();
@@ -71 +72 @@
         /* load all printcap printers */
         if (lp_load_printers() && lp_servicenumber(PRINTERS_NAME) >= 0)
-                pcap_printer_fn(lp_add_one_printer, NULL);
+                pcap_printer_read_fn(lp_add_one_printer, NULL);
 }