Changeset 751 for trunk/server/source3/smbd/server_reload.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/smbd/server_reload.c (modified) (5 diffs)

trunk/server/source3/smbd/server_reload.c

@@ -39 +39 @@
         struct auth_serversupplied_info *session_info = NULL;
         struct spoolss_PrinterInfo2 *pinfo2 = NULL;
+        int n_services;
+        int pnum;
         int snum;
-        int n_services = lp_numservices();
-        int pnum = lp_servicenumber(PRINTERS_NAME);
         const char *pname;
+        const char *sname;
         NTSTATUS status;
-        bool skip = false;
 
-        SMB_ASSERT(pcap_cache_loaded());
+        load_printers(ev, msg_ctx);
+
+        n_services = lp_numservices();
+        pnum = lp_servicenumber(PRINTERS_NAME);
+
         DEBUG(10, ("reloading printer services from pcap cache\n"));
 
@@ -55 +59 @@
                 /* can't remove stale printers before we
                  * are fully initilized */
-                skip = true;
+                return;
         }
 
-        /* remove stale printers */
-        for (snum = 0; skip == false && snum < n_services; snum++) {
-                /* avoid removing PRINTERS_NAME or non-autoloaded printers */
-                if (snum == pnum || !(lp_snum_ok(snum) && lp_print_ok(snum) &&
-                                      lp_autoloaded(snum)))
+        /*
+         * Add default config for printers added to smb.conf file and remove
+         * stale printers
+         */
+        for (snum = 0; snum < n_services; snum++) {
+                /* avoid removing PRINTERS_NAME */
+                if (snum == pnum) {
                         continue;
+                }
 
+                /* skip no-printer services */
+                if (!(lp_snum_ok(snum) && lp_print_ok(snum))) {
+                        continue;
+                }
+
+                sname = lp_const_servicename(snum);
                 pname = lp_printername(snum);
-                if (!pcap_printername_ok(pname)) {
+
+                /* check printer, but avoid removing non-autoloaded printers */
+                if (lp_autoloaded(snum) && !pcap_printername_ok(pname)) {
                         DEBUG(3, ("removing stale printer %s\n", pname));
 
@@ -83 +98 @@
                                           pname);
                         lp_killservice(snum);
+                } else {
+                        DEBUG(8, ("Adding default registry entry for printer "
+                                  "[%s], if it doesn't exist.\n", sname));
+                        nt_printer_add(session_info, session_info, msg_ctx,
+                                       sname);
                 }
         }
 
+        /* Make sure deleted printers are gone */
         load_printers(ev, msg_ctx);
 
@@ -107 +128 @@
                         test = False;
                 }
+                TALLOC_FREE(fname);
         }
 
@@ -146 +168 @@
                                struct messaging_context *msg_ctx)
 {
+        /*
+         * Reload the printers first in the background process so that
+         * newly added printers get default values created in the registry.
+         *
+         * This will block the process for some time (~1 sec per printer), but
+         * it doesn't block smbd's servering clients.
+         */
+        reload_printers(ev, msg_ctx);
+
         message_send_all(msg_ctx, MSG_PRINTER_PCAP, NULL, 0, NULL);
 }