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

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/server_reload.c (modified) (6 diffs)

trunk/server/source3/smbd/server_reload.c

@@ -37 +37 @@
                      struct messaging_context *msg_ctx)
 {
+        int n_services;
+        int pnum;
+        int snum;
+        const char *pname;
+
+        n_services = lp_numservices();
+        pnum = lp_servicenumber(PRINTERS_NAME);
+
+        DEBUG(10, ("reloading printer services from pcap cache\n"));
+
+        /*
+         * 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;
+                }
+
+                pname = lp_printername(snum);
+
+                /* check printer, but avoid removing non-autoloaded printers */
+                if (lp_autoloaded(snum) && !pcap_printername_ok(pname)) {
+                        DEBUG(3, ("removing stale printer %s\n", pname));
+                        lp_killservice(snum);
+                }
+        }
+
+        /* Make sure deleted printers are gone */
+        load_printers(ev, msg_ctx);
+}
+
+/****************************************************************************
+ purge stale printers and reload from pre-populated pcap cache
+**************************************************************************/
+void reload_printers_full(struct tevent_context *ev,
+                          struct messaging_context *msg_ctx)
+{
         struct auth_serversupplied_info *session_info = NULL;
-        struct spoolss_PrinterInfo2 *pinfo2 = NULL;
         int n_services;
         int pnum;
@@ -46 +89 @@
         NTSTATUS status;
 
-        load_printers(ev, msg_ctx);
-
         n_services = lp_numservices();
         pnum = lp_servicenumber(PRINTERS_NAME);
 
-        DEBUG(10, ("reloading printer services from pcap cache\n"));
-
-        status = make_session_info_system(talloc_tos(), &session_info);
+        status = make_session_info_system(talloc_new(NULL), &session_info);
         if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(3, ("reload_printers: "
-                          "Could not create system session_info\n"));
+                DEBUG(3, ("Could not create system session_info\n"));
                 /* can't remove stale printers before we
                  * are fully initilized */
@@ -82 +120 @@
                 /* check printer, but avoid removing non-autoloaded printers */
                 if (lp_autoloaded(snum) && !pcap_printername_ok(pname)) {
-                        DEBUG(3, ("removing stale printer %s\n", pname));
-
+                        struct spoolss_PrinterInfo2 *pinfo2 = NULL;
                         if (is_printer_published(session_info, session_info,
                                                  msg_ctx,
-                                                 NULL, lp_servicename(snum),
-                                                 NULL, &pinfo2)) {
+                                                 NULL,
+                                                 lp_servicename(snum),
+                                                 &pinfo2)) {
                                 nt_printer_publish(session_info,
                                                    session_info,
@@ -97 +135 @@
                         nt_printer_remove(session_info, session_info, msg_ctx,
                                           pname);
-                        lp_killservice(snum);
                 } else {
                         DEBUG(8, ("Adding default registry entry for printer "
@@ -106 +143 @@
         }
 
-        /* Make sure deleted printers are gone */
-        load_printers(ev, msg_ctx);
+        /* finally, purge old snums */
+        reload_printers(ev, msg_ctx);
 
         TALLOC_FREE(session_info);
@@ -161 +198 @@
         return(ret);
 }
-
-/****************************************************************************
- Notify smbds of new printcap data
-**************************************************************************/
-void reload_pcap_change_notify(struct tevent_context *ev,
-                               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);
-}