Changeset 746 for vendor/current/source3/smbd/server.c

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

File:

• vendor/current/source3/smbd/server.c (modified) (16 diffs)

vendor/current/source3/smbd/server.c

@@ -65 +65 @@
          */
 
+        if (sconn->client_id.name != NULL &&
+            sconn->client_id.name != sconn->client_id.addr) {
+                talloc_free(discard_const_p(char, sconn->client_id.name));
+                sconn->client_id.name = NULL;
+        }
+
         client_addr(fd, sconn->client_id.addr, sizeof(sconn->client_id.addr));
 
@@ -277 +283 @@
         static struct timed_event *cleanup_te;
         struct server_id child_id;
+
+        child_id = procid_self(); /* Just initialize pid and potentially vnn */
+        child_id.pid = pid;
+
+        for (child = children; child != NULL; child = child->next) {
+                if (child->pid == pid) {
+                        struct child_pid *tmp = child;
+                        DLIST_REMOVE(children, child);
+                        SAFE_FREE(tmp);
+                        num_children -= 1;
+                        break;
+                }
+        }
+
+        if (child == NULL) {
+                /* not all forked child processes are added to the children list */
+                DEBUG(2, ("Could not find child %d -- ignoring\n", (int)pid));
+                return;
+        }
 
         if (unclean_shutdown) {
@@ -296 +321 @@
         }
 
-        child_id = procid_self(); /* Just initialize pid and potentially vnn */
-        child_id.pid = pid;
-
         if (!serverid_deregister(child_id)) {
                 DEBUG(1, ("Could not remove pid %d from serverid.tdb\n",
                           (int)pid));
         }
-
-        for (child = children; child != NULL; child = child->next) {
-                if (child->pid == pid) {
-                        struct child_pid *tmp = child;
-                        DLIST_REMOVE(children, child);
-                        SAFE_FREE(tmp);
-                        num_children -= 1;
-                        return;
-                }
-        }
-
-        /* not all forked child processes are added to the children list */
-        DEBUG(1, ("Could not find child %d -- ignoring\n", (int)pid));
 }
 
@@ -442 +451 @@
          * the global random state in the parent.
          */
-        generate_random_buffer((uint8_t *)&unique_id, sizeof(unique_id));
+        unique_id = serverid_get_random_unique_id();
 
         pid = sys_fork();
@@ -611 +620 @@
 }
 
-static bool smbd_parent_housekeeping(const struct timeval *now, void *private_data)
-{
-        time_t printcap_cache_time = (time_t)lp_printcap_cache_time();
-        time_t t = time_mono(NULL);
-
-        DEBUG(5, ("parent housekeeping\n"));
-
-        /* if periodic printcap rescan is enabled, see if it's time to reload */
-        if ((printcap_cache_time != 0)
-         && (t >= (last_printer_reload_time + printcap_cache_time))) {
-                DEBUG( 3,( "Printcap cache time expired.\n"));
-                pcap_cache_reload(server_event_context(),
-                                  smbd_messaging_context(),
-                                  &reload_pcap_change_notify);
-                last_printer_reload_time = t;
-        }
-
-        return true;
-}
-
 /****************************************************************************
  Open the socket communication.
@@ -642 +631 @@
         int i;
         char *ports;
+        char *tok;
+        const char *ptr;
         unsigned dns_port = 0;
 
@@ -663 +654 @@
         }
 
+        for (ptr = ports;
+             next_token_talloc(talloc_tos(),&ptr, &tok, " \t,");) {
+                unsigned port = atoi(tok);
+
+                if (port == 0 || port > 0xffff) {
+                        exit_server_cleanly("Invalid port in the config or on "
+                                            "the commandline specified!");
+                }
+        }
+
         if (lp_interfaces() && lp_bind_interfaces_only()) {
                 /* We have been given an interfaces line, and been
@@ -674 +675 @@
                         const struct sockaddr_storage *ifss =
                                         iface_n_sockaddr_storage(i);
-                        char *tok;
-                        const char *ptr;
 
                         if (ifss == NULL) {
@@ -687 +686 @@
                              next_token_talloc(talloc_tos(),&ptr, &tok, " \t,");) {
                                 unsigned port = atoi(tok);
-                                if (port == 0 || port > 0xffff) {
-                                        continue;
-                                }
 
                                 /* Keep the first port for mDNS service
@@ -707 +703 @@
                    from anywhere. */
 
-                char *tok;
-                const char *ptr;
                 const char *sock_addr = lp_socket_address();
                 char *sock_tok;
@@ -726 +720 @@
                         for (ptr=ports; next_token_talloc(talloc_tos(), &ptr, &tok, " \t,"); ) {
                                 struct sockaddr_storage ss;
-
                                 unsigned port = atoi(tok);
-                                if (port == 0 || port > 0xffff) {
-                                        continue;
-                                }
 
                                 /* Keep the first port for mDNS service
@@ -769 +759 @@
                 DEBUG(0, ("open_sockets_smbd: Failed to register "
                           "myself in serverid.tdb\n"));
-                return false;
-        }
-
-        if (!(event_add_idle(smbd_event_context(), NULL,
-                             timeval_set(SMBD_HOUSEKEEPING_INTERVAL, 0),
-                             "parent_housekeeping", smbd_parent_housekeeping,
-                             NULL))) {
-                DEBUG(0, ("Could not add parent_housekeeping event\n"));
                 return false;
         }
@@ -915 +897 @@
         TALLOC_CTX *frame;
         NTSTATUS status;
-        uint64_t unique_id;
 
         /*
@@ -1114 +1095 @@
         }
 
-        generate_random_buffer((uint8_t *)&unique_id, sizeof(unique_id));
-        set_my_unique_id(unique_id);
+        set_my_unique_id(serverid_get_random_unique_id());
 
 #if HAVE_SETPGID
@@ -1206 +1186 @@
                 exit(1);
 
-        if (!print_backend_init(smbd_messaging_context()))
-                exit(1);
-
         /* Open the share_info.tdb here, so we don't have to open
            after the fork on every single connection.  This is a small
@@ -1250 +1227 @@
                 exit(1);
         }
+
+        /*
+         * The print backend init also migrates the printing tdb's,
+         * this requires a winreg pipe.
+         */
+        if (!print_backend_init(smbd_messaging_context()))
+                exit(1);
 
         /* Publish nt printers, this requires a working winreg pipe */