Changeset 599 for trunk/server/source3/smbd/server.c

Timestamp:

Jul 6, 2011, 8:21:13 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.9

File:

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

trunk/server/source3/smbd/server.c

@@ -542 +542 @@
 }
 
+static bool parent_housekeeping_fn(const struct timeval *now, void *private_data)
+{
+        DEBUG(5, ("houskeeping\n"));
+        /* check if we need to reload services */
+        check_reload(time(NULL));
+        return true;
+}
+
 /****************************************************************************
  Open the socket communication.
@@ -601 +609 @@
                                 }
 
+                                /* Keep the first port for mDNS service
+                                 * registration.
+                                 */
+                                if (dns_port == 0) {
+                                        dns_port = port;
+                                }
+
                                 if (!smbd_open_one_socket(parent, ifss, port)) {
                                         return false;
@@ -668 +683 @@
         claim_connection(NULL,"",
                          FLAG_MSG_GENERAL|FLAG_MSG_SMBD|FLAG_MSG_DBWRAP);
+
+        if (!(event_add_idle(smbd_event_context(), NULL,
+                             timeval_set(SMBD_HOUSEKEEPING_INTERVAL, 0),
+                             "parent_housekeeping", parent_housekeeping_fn,
+                             parent))) {
+                DEBUG(0, ("Could not add housekeeping event\n"));
+                exit(1);
+        }
 
         /* Listen to messages */
@@ -735 +758 @@
 }
 
-/****************************************************************************
- Reload printers
-**************************************************************************/
+/***************************************************************************
+ purge stale printers and reload from pre-populated pcap cache
+***************************************************************************/
 void reload_printers(void)
 {
@@ -745 +768 @@
         const char *pname;
 
-        pcap_cache_reload();
-
-        /* remove stale printers */
+        DEBUG(10, ("reloading printer services from pcap cache\n"));
         for (snum = 0; snum < n_services; snum++) {
                 /* avoid removing PRINTERS_NAME or non-autoloaded printers */
@@ -794 +815 @@
         ret = lp_load(get_dyn_CONFIGFILE(), False, False, True, True);
 
-        reload_printers();
+        pcap_cache_reload(&reload_printers);
 
         /* perhaps the config filename is now set */