s3-smbd: add a rate limited cleanup of brl, connections and locking db
[ira/wip.git] / source3 / smbd / server.c
index d71a04ebc17cff7910c904580119d9abade7d522..37716c4171061aa4cfb79b944d422da495c8417d 100644 (file)
@@ -94,6 +94,7 @@ static void smb_conf_updated(struct messaging_context *msg,
 {
        DEBUG(10,("smb_conf_updated: Got message saying smb.conf was "
                  "updated. Reloading.\n"));
+       change_to_root_user();
        reload_services(False);
 }
 
@@ -180,19 +181,33 @@ static void msg_inject_fault(struct messaging_context *msg,
 }
 #endif /* DEVELOPER */
 
-struct child_pid {
-       struct child_pid *prev, *next;
-       pid_t pid;
-};
-
-static void add_child_pid(pid_t pid)
+/*
+ * Parent smbd process sets its own debug level first and then
+ * sends a message to all the smbd children to adjust their debug
+ * level to that of the parent.
+ */
+
+static void smbd_msg_debug(struct messaging_context *msg_ctx,
+                          void *private_data,
+                          uint32_t msg_type,
+                          struct server_id server_id,
+                          DATA_BLOB *data)
 {
        struct child_pid *child;
 
-       if (lp_max_smbd_processes() == 0) {
-               /* Don't bother with the child list if we don't care anyway */
-               return;
+       debug_message(msg_ctx, private_data, MSG_DEBUG, server_id, data);
+
+       for (child = children; child != NULL; child = child->next) {
+               messaging_send_buf(msg_ctx, pid_to_procid(child->pid),
+                                  MSG_DEBUG,
+                                  data->data,
+                                  strlen((char *) data->data) + 1);
        }
+}
+
+static void add_child_pid(pid_t pid)
+{
+       struct child_pid *child;
 
        child = SMB_MALLOC_P(struct child_pid);
        if (child == NULL) {
@@ -204,24 +219,53 @@ static void add_child_pid(pid_t pid)
        num_children += 1;
 }
 
+/*
+  at most every smbd:cleanuptime seconds (default 20), we scan the BRL
+  and locking database for entries to cleanup. As a side effect this
+  also cleans up dead entries in the connections database (due to the
+  traversal in message_send_all()
+
+  Using a timer for this prevents a flood of traversals when a large
+  number of clients disconnect at the same time (perhaps due to a
+  network outage).  
+*/
+
+static void cleanup_timeout_fn(struct event_context *event_ctx,
+                               struct timed_event *te,
+                               struct timeval now,
+                               void *private_data)
+{
+       struct timed_event **cleanup_te = (struct timed_event **)private_data;
+
+       DEBUG(1,("Cleaning up brl and lock database after unclean shutdown\n"));
+       message_send_all(smbd_messaging_context(), MSG_SMB_UNLOCK, NULL, 0, NULL);
+       messaging_send_buf(smbd_messaging_context(), procid_self(), 
+                               MSG_SMB_BRL_VALIDATE, NULL, 0);
+       /* mark the cleanup as having been done */
+       (*cleanup_te) = NULL;
+}
+
 static void remove_child_pid(pid_t pid, bool unclean_shutdown)
 {
        struct child_pid *child;
+       static struct timed_event *cleanup_te;
 
        if (unclean_shutdown) {
-               /* a child terminated uncleanly so tickle all processes to see 
-                  if they can grab any of the pending locks
-               */
-               DEBUG(3,(__location__ " Unclean shutdown of pid %u\n", pid));
-               messaging_send_buf(smbd_messaging_context(), procid_self(), 
-                                  MSG_SMB_BRL_VALIDATE, NULL, 0);
-               message_send_all(smbd_messaging_context(), 
-                                MSG_SMB_UNLOCK, NULL, 0, NULL);
-       }
-
-       if (lp_max_smbd_processes() == 0) {
-               /* Don't bother with the child list if we don't care anyway */
-               return;
+               /* a child terminated uncleanly so tickle all
+                  processes to see if they can grab any of the
+                  pending locks
+                */
+               DEBUG(3,(__location__ " Unclean shutdown of pid %u\n", 
+                       (unsigned int)pid));
+               if (!cleanup_te) {
+                       /* call the cleanup timer, but not too often */
+                       int cleanup_time = lp_parm_int(-1, "smbd", "cleanuptime", 20);
+                       cleanup_te = event_add_timed(smbd_event_context(), NULL,
+                                               timeval_current_ofs(cleanup_time, 0),
+                                               cleanup_timeout_fn, 
+                                               &cleanup_te);
+                       DEBUG(1,("Scheduled cleanup of brl and lock database after unclean shutdown\n"));
+               }
        }
 
        for (child = children; child != NULL; child = child->next) {
@@ -295,44 +339,237 @@ static void smbd_setup_sig_chld_handler(void)
        }
 }
 
+struct smbd_open_socket;
+
+struct smbd_parent_context {
+       bool interactive;
+
+       /* the list of listening sockets */
+       struct smbd_open_socket *sockets;
+};
+
+struct smbd_open_socket {
+       struct smbd_open_socket *prev, *next;
+       struct smbd_parent_context *parent;
+       int fd;
+       struct tevent_fd *fde;
+};
+
+static void smbd_open_socket_close_fn(struct tevent_context *ev,
+                                     struct tevent_fd *fde,
+                                     int fd,
+                                     void *private_data)
+{
+       /* this might be the socket_wrapper swrap_close() */
+       close(fd);
+}
+
+static void smbd_accept_connection(struct tevent_context *ev,
+                                  struct tevent_fd *fde,
+                                  uint16_t flags,
+                                  void *private_data)
+{
+       struct smbd_open_socket *s = talloc_get_type_abort(private_data,
+                                    struct smbd_open_socket);
+       struct sockaddr_storage addr;
+       socklen_t in_addrlen = sizeof(addr);
+       pid_t pid = 0;
+
+       smbd_set_server_fd(accept(s->fd,(struct sockaddr *)&addr,&in_addrlen));
+
+       if (smbd_server_fd() == -1 && errno == EINTR)
+               return;
+
+       if (smbd_server_fd() == -1) {
+               DEBUG(0,("open_sockets_smbd: accept: %s\n",
+                        strerror(errno)));
+               return;
+       }
+
+       if (s->parent->interactive) {
+               smbd_process();
+               exit_server_cleanly("end of interactive mode");
+               return;
+       }
+
+       if (!allowable_number_of_smbd_processes()) {
+               close(smbd_server_fd());
+               smbd_set_server_fd(-1);
+               return;
+       }
+
+       pid = sys_fork();
+       if (pid == 0) {
+               NTSTATUS status = NT_STATUS_OK;
+               /* Child code ... */
+               am_parent = 0;
+
+               /* Stop zombies, the parent explicitly handles
+                * them, counting worker smbds. */
+               CatchChild();
+
+               /* close our standard file
+                  descriptors */
+               close_low_fds(False);
+
+               /*
+                * Can't use TALLOC_FREE here. Nulling out the argument to it
+                * would overwrite memory we've just freed.
+                */
+               talloc_free(s->parent);
+               s = NULL;
+
+               status = reinit_after_fork(smbd_messaging_context(),
+                                          smbd_event_context(), true);
+               if (!NT_STATUS_IS_OK(status)) {
+                       if (NT_STATUS_EQUAL(status,
+                                           NT_STATUS_TOO_MANY_OPENED_FILES)) {
+                               DEBUG(0,("child process cannot initialize "
+                                        "because too many files are open\n"));
+                               goto exit;
+                       }
+                       DEBUG(0,("reinit_after_fork() failed\n"));
+                       smb_panic("reinit_after_fork() failed");
+               }
+
+               smbd_setup_sig_term_handler();
+               smbd_setup_sig_hup_handler();
+
+               smbd_process();
+        exit:
+               exit_server_cleanly("end of child");
+               return;
+       } else if (pid < 0) {
+               DEBUG(0,("smbd_accept_connection: sys_fork() failed: %s\n",
+                        strerror(errno)));
+       }
+
+       /* The parent doesn't need this socket */
+       close(smbd_server_fd());
+
+       /* Sun May 6 18:56:14 2001 ackley@cs.unm.edu:
+               Clear the closed fd info out of server_fd --
+               and more importantly, out of client_fd in
+               util_sock.c, to avoid a possible
+               getpeername failure if we reopen the logs
+               and use %I in the filename.
+       */
+
+       smbd_set_server_fd(-1);
+
+       if (pid != 0) {
+               add_child_pid(pid);
+       }
+
+       /* Force parent to check log size after
+        * spawning child.  Fix from
+        * klausr@ITAP.Physik.Uni-Stuttgart.De.  The
+        * parent smbd will log to logserver.smb.  It
+        * writes only two messages for each child
+        * started/finished. But each child writes,
+        * say, 50 messages also in logserver.smb,
+        * begining with the debug_count of the
+        * parent, before the child opens its own log
+        * file logserver.client. In a worst case
+        * scenario the size of logserver.smb would be
+        * checked after about 50*50=2500 messages
+        * (ca. 100kb).
+        * */
+       force_check_log_size();
+}
+
+static bool smbd_open_one_socket(struct smbd_parent_context *parent,
+                                const struct sockaddr_storage *ifss,
+                                uint16_t port)
+{
+       struct smbd_open_socket *s;
+
+       s = talloc(parent, struct smbd_open_socket);
+       if (!s) {
+               return false;
+       }
+
+       s->parent = parent;
+       s->fd = open_socket_in(SOCK_STREAM,
+                              port,
+                              parent->sockets == NULL ? 0 : 2,
+                              ifss,
+                              true);
+       if (s->fd == -1) {
+               DEBUG(0,("smbd_open_once_socket: open_socket_in: "
+                       "%s\n", strerror(errno)));
+               TALLOC_FREE(s);
+               /*
+                * We ignore an error here, as we've done before
+                */
+               return true;
+       }
+
+       /* ready to listen */
+       set_socket_options(s->fd, "SO_KEEPALIVE");
+       set_socket_options(s->fd, lp_socket_options());
+
+       /* Set server socket to
+        * non-blocking for the accept. */
+       set_blocking(s->fd, False);
+
+       if (listen(s->fd, SMBD_LISTEN_BACKLOG) == -1) {
+               DEBUG(0,("open_sockets_smbd: listen: "
+                       "%s\n", strerror(errno)));
+                       close(s->fd);
+               TALLOC_FREE(s);
+               return false;
+       }
+
+       s->fde = tevent_add_fd(smbd_event_context(),
+                              s,
+                              s->fd, TEVENT_FD_READ,
+                              smbd_accept_connection,
+                              s);
+       if (!s->fde) {
+               DEBUG(0,("open_sockets_smbd: "
+                        "tevent_add_fd: %s\n",
+                        strerror(errno)));
+               close(s->fd);
+               TALLOC_FREE(s);
+               return false;
+       }
+       tevent_fd_set_close_fn(s->fde, smbd_open_socket_close_fn);
+
+       DLIST_ADD_END(parent->sockets, s, struct smbd_open_socket *);
+
+       return true;
+}
+
 /****************************************************************************
  Open the socket communication.
 ****************************************************************************/
 
-static bool open_sockets_smbd(bool interactive, const char *smb_ports)
+static bool open_sockets_smbd(struct smbd_parent_context *parent,
+                             const char *smb_ports)
 {
        int num_interfaces = iface_count();
-       int num_sockets = 0;
-       int fd_listenset[FD_SETSIZE];
-       fd_set listen_set;
-       int s;
-       int maxfd = 0;
        int i;
        char *ports;
-       TALLOC_CTX *dns_ctx = NULL;
        unsigned dns_port = 0;
 
 #ifdef HAVE_ATEXIT
        atexit(killkids);
 #endif
 
-       dns_ctx = talloc_new(NULL);
-
        /* Stop zombies */
        smbd_setup_sig_chld_handler();
 
-       FD_ZERO(&listen_set);
-
        /* use a reasonable default set of ports - listing on 445 and 139 */
        if (!smb_ports) {
                ports = lp_smb_ports();
                if (!ports || !*ports) {
-                       ports = smb_xstrdup(SMB_PORTS);
+                       ports = talloc_strdup(talloc_tos(), SMB_PORTS);
                } else {
-                       ports = smb_xstrdup(ports);
+                       ports = talloc_strdup(talloc_tos(), ports);
                }
        } else {
-               ports = smb_xstrdup(smb_ports);
+               ports = talloc_strdup(talloc_tos(), smb_ports);
        }
 
        if (lp_interfaces() && lp_bind_interfaces_only()) {
@@ -344,7 +581,6 @@ static bool open_sockets_smbd(bool interactive, const char *smb_ports)
                /* Now open a listen socket for each of the
                   interfaces. */
                for(i = 0; i < num_interfaces; i++) {
-                       TALLOC_CTX *frame = NULL;
                        const struct sockaddr_storage *ifss =
                                        iface_n_sockaddr_storage(i);
                        char *tok;
@@ -357,64 +593,22 @@ static bool open_sockets_smbd(bool interactive, const char *smb_ports)
                                continue;
                        }
 
-                       frame = talloc_stackframe();
                        for (ptr=ports;
-                                       next_token_talloc(frame,&ptr, &tok, " \t,");) {
+                            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
-                                * registration.
-                                */
-                               if (dns_port == 0) {
-                                       dns_port = port;
-                               }
-
-                               s = fd_listenset[num_sockets] =
-                                       open_socket_in(SOCK_STREAM,
-                                                       port,
-                                                       num_sockets == 0 ? 0 : 2,
-                                                       ifss,
-                                                       true);
-                               if(s == -1) {
-                                       continue;
-                               }
-
-                               /* ready to listen */
-                               set_socket_options(s,"SO_KEEPALIVE");
-                               set_socket_options(s,lp_socket_options());
-
-                               /* Set server socket to
-                                * non-blocking for the accept. */
-                               set_blocking(s,False);
-
-                               if (listen(s, SMBD_LISTEN_BACKLOG) == -1) {
-                                       DEBUG(0,("open_sockets_smbd: listen: "
-                                               "%s\n", strerror(errno)));
-                                       close(s);
-                                       TALLOC_FREE(frame);
-                                       return False;
-                               }
-                               FD_SET(s,&listen_set);
-                               maxfd = MAX( maxfd, s);
-
-                               num_sockets++;
-                               if (num_sockets >= FD_SETSIZE) {
-                                       DEBUG(0,("open_sockets_smbd: Too "
-                                               "many sockets to bind to\n"));
-                                       TALLOC_FREE(frame);
-                                       return False;
+                               if (!smbd_open_one_socket(parent, ifss, port)) {
+                                       return false;
                                }
                        }
-                       TALLOC_FREE(frame);
                }
        } else {
                /* Just bind to 0.0.0.0 - accept connections
                   from anywhere. */
 
-               TALLOC_CTX *frame = talloc_stackframe();
                char *tok;
                const char *ptr;
                const char *sock_addr = lp_socket_address();
@@ -431,8 +625,8 @@ static bool open_sockets_smbd(bool interactive, const char *smb_ports)
                }
 
                for (sock_ptr=sock_addr;
-                               next_token_talloc(frame, &sock_ptr, &sock_tok, " \t,"); ) {
-                       for (ptr=ports; next_token_talloc(frame, &ptr, &tok, " \t,"); ) {
+                    next_token_talloc(talloc_tos(), &sock_ptr, &sock_tok, " \t,"); ) {
+                       for (ptr=ports; next_token_talloc(talloc_tos(), &ptr, &tok, " \t,"); ) {
                                struct sockaddr_storage ss;
 
                                unsigned port = atoi(tok);
@@ -453,52 +647,14 @@ static bool open_sockets_smbd(bool interactive, const char *smb_ports)
                                        continue;
                                }
 
-                               s = open_socket_in(SOCK_STREAM,
-                                               port,
-                                               num_sockets == 0 ? 0 : 2,
-                                               &ss,
-                                               true);
-                               if (s == -1) {
-                                       continue;
-                               }
-
-                               /* ready to listen */
-                               set_socket_options(s,"SO_KEEPALIVE");
-                               set_socket_options(s,lp_socket_options());
-
-                               /* Set server socket to non-blocking
-                                * for the accept. */
-                               set_blocking(s,False);
-
-                               if (listen(s, SMBD_LISTEN_BACKLOG) == -1) {
-                                       DEBUG(0,("open_sockets_smbd: "
-                                               "listen: %s\n",
-                                                strerror(errno)));
-                                       close(s);
-                                       TALLOC_FREE(frame);
-                                       return False;
-                               }
-
-                               fd_listenset[num_sockets] = s;
-                               FD_SET(s,&listen_set);
-                               maxfd = MAX( maxfd, s);
-
-                               num_sockets++;
-
-                               if (num_sockets >= FD_SETSIZE) {
-                                       DEBUG(0,("open_sockets_smbd: Too "
-                                               "many sockets to bind to\n"));
-                                       TALLOC_FREE(frame);
-                                       return False;
+                               if (!smbd_open_one_socket(parent, &ss, port)) {
+                                       return false;
                                }
                        }
                }
-               TALLOC_FREE(frame);
        }
 
-       SAFE_FREE(ports);
-
-       if (num_sockets == 0) {
+       if (parent->sockets == NULL) {
                DEBUG(0,("open_sockets_smbd: No "
                        "sockets available to bind to.\n"));
                return false;
@@ -524,6 +680,8 @@ static bool open_sockets_smbd(bool interactive, const char *smb_ports)
                           MSG_SMB_CONF_UPDATED, smb_conf_updated);
        messaging_register(smbd_messaging_context(), NULL,
                           MSG_SMB_STAT_CACHE_DELETE, smb_stat_cache_delete);
+       messaging_register(smbd_messaging_context(), NULL,
+                          MSG_DEBUG, smbd_msg_debug);
        brl_register_msgs(smbd_messaging_context());
 
 #ifdef CLUSTER_SUPPORT
@@ -538,150 +696,39 @@ static bool open_sockets_smbd(bool interactive, const char *smb_ports)
 #endif
 
        if (dns_port != 0) {
+#ifdef WITH_DNSSD_SUPPORT
                smbd_setup_mdns_registration(smbd_event_context(),
-                                            dns_ctx, dns_port);
+                                            parent, dns_port);
+#endif
+#ifdef WITH_AVAHI_SUPPORT
+               void *avahi_conn;
+
+               avahi_conn = avahi_start_register(
+                       smbd_event_context(), smbd_event_context(), dns_port);
+               if (avahi_conn == NULL) {
+                       DEBUG(10, ("avahi_start_register failed\n"));
+               }
+#endif
        }
 
+       return true;
+}
+
+static void smbd_parent_loop(struct smbd_parent_context *parent)
+{
        /* now accept incoming connections - forking a new process
           for each incoming connection */
-       DEBUG(2,("waiting for a connection\n"));
+       DEBUG(2,("waiting for connections\n"));
        while (1) {
-               struct timeval now, idle_timeout;
-               fd_set r_fds, w_fds;
-               int num;
-
-               if (run_events(smbd_event_context(), 0, NULL, NULL)) {
-                       continue;
-               }
-
-               idle_timeout = timeval_zero();
-
-               memcpy((char *)&r_fds, (char *)&listen_set,
-                      sizeof(listen_set));
-               FD_ZERO(&w_fds);
-               GetTimeOfDay(&now);
-
-               event_add_to_select_args(smbd_event_context(), &now,
-                                        &r_fds, &w_fds, &idle_timeout,
-                                        &maxfd);
-
-               num = sys_select(maxfd+1,&r_fds,&w_fds,NULL,
-                                timeval_is_zero(&idle_timeout) ?
-                                NULL : &idle_timeout);
-
-               if (run_events(smbd_event_context(), num, &r_fds, &w_fds)) {
-                       continue;
-               }
+               int ret;
+               TALLOC_CTX *frame = talloc_stackframe();
 
-               /* If the idle timeout fired and we don't have any connected
-                * users, exit gracefully. We should be running under a process
-                * controller that will restart us if necessry.
-                */
-               if (num == 0 && count_all_current_connections() == 0) {
-                       exit_server_cleanly("idle timeout");
+               ret = tevent_loop_once(smbd_event_context());
+               if (ret != 0) {
+                       exit_server_cleanly("tevent_loop_once() error");
                }
 
-               /* check if we need to reload services */
-               check_reload(time(NULL));
-
-               /* Find the sockets that are read-ready -
-                  accept on these. */
-               for( ; num > 0; num--) {
-                       struct sockaddr addr;
-                       socklen_t in_addrlen = sizeof(addr);
-                       pid_t child = 0;
-
-                       s = -1;
-                       for(i = 0; i < num_sockets; i++) {
-                               if(FD_ISSET(fd_listenset[i],&r_fds)) {
-                                       s = fd_listenset[i];
-                                       /* Clear this so we don't look
-                                          at it again. */
-                                       FD_CLR(fd_listenset[i],&r_fds);
-                                       break;
-                               }
-                       }
-
-                       smbd_set_server_fd(accept(s,&addr,&in_addrlen));
-
-                       if (smbd_server_fd() == -1 && errno == EINTR)
-                               continue;
-
-                       if (smbd_server_fd() == -1) {
-                               DEBUG(2,("open_sockets_smbd: accept: %s\n",
-                                        strerror(errno)));
-                               continue;
-                       }
-
-                       if (interactive)
-                               return True;
-
-                       if (allowable_number_of_smbd_processes() &&
-                           ((child = sys_fork())==0)) {
-                               /* Child code ... */
-
-                               TALLOC_FREE(dns_ctx);
-
-                               /* Stop zombies, the parent explicitly handles
-                                * them, counting worker smbds. */
-                               CatchChild();
-
-                               /* close the listening socket(s) */
-                               for(i = 0; i < num_sockets; i++)
-                                       close(fd_listenset[i]);
-
-                               /* close our standard file
-                                  descriptors */
-                               close_low_fds(False);
-                               am_parent = 0;
-
-                               if (!reinit_after_fork(
-                                           smbd_messaging_context(),
-                                           smbd_event_context(),
-                                           true)) {
-                                       DEBUG(0,("reinit_after_fork() failed\n"));
-                                       smb_panic("reinit_after_fork() failed");
-                               }
-
-                               smbd_setup_sig_term_handler();
-                               smbd_setup_sig_hup_handler();
-
-                               return True;
-                       }
-                       /* The parent doesn't need this socket */
-                       close(smbd_server_fd());
-
-                       /* Sun May 6 18:56:14 2001 ackley@cs.unm.edu:
-                               Clear the closed fd info out of server_fd --
-                               and more importantly, out of client_fd in
-                               util_sock.c, to avoid a possible
-                               getpeername failure if we reopen the logs
-                               and use %I in the filename.
-                       */
-
-                       smbd_set_server_fd(-1);
-
-                       if (child != 0) {
-                               add_child_pid(child);
-                       }
-
-                       /* Force parent to check log size after
-                        * spawning child.  Fix from
-                        * klausr@ITAP.Physik.Uni-Stuttgart.De.  The
-                        * parent smbd will log to logserver.smb.  It
-                        * writes only two messages for each child
-                        * started/finished. But each child writes,
-                        * say, 50 messages also in logserver.smb,
-                        * begining with the debug_count of the
-                        * parent, before the child opens its own log
-                        * file logserver.client. In a worst case
-                        * scenario the size of logserver.smb would be
-                        * checked after about 50*50=2500 messages
-                        * (ca. 100kb).
-                        * */
-                       force_check_log_size();
-
-               } /* end for num */
+               TALLOC_FREE(frame);
        } /* end while 1 */
 
 /* NOTREACHED  return True; */
@@ -711,7 +758,7 @@ void reload_printers(void)
                        DEBUG(3, ("removing stale printer %s\n", pname));
 
                        if (is_printer_published(NULL, snum, NULL))
-                               nt_printer_publish(NULL, snum, SPOOL_DS_UNPUBLISH);
+                               nt_printer_publish(NULL, snum, DSPRINT_UNPUBLISH);
                        del_a_printer(pname);
                        lp_killservice(snum);
                }
@@ -783,7 +830,8 @@ static void exit_server_common(enum server_exit_reason how,
 static void exit_server_common(enum server_exit_reason how,
        const char *const reason)
 {
-       bool had_open_conn;
+       bool had_open_conn = false;
+       struct smbd_server_connection *sconn = smbd_server_conn;
 
        if (!exit_firsttime)
                exit(0);
@@ -791,13 +839,15 @@ static void exit_server_common(enum server_exit_reason how,
 
        change_to_root_user();
 
-       if (negprot_global_auth_context) {
-               (negprot_global_auth_context->free)(&negprot_global_auth_context);
+       if (sconn && sconn->smb1.negprot.auth_context) {
+               struct auth_context *a = sconn->smb1.negprot.auth_context;
+               a->free(&sconn->smb1.negprot.auth_context);
        }
 
-       had_open_conn = conn_close_all();
-
-       invalidate_all_vuids();
+       if (sconn) {
+               had_open_conn = conn_close_all(sconn);
+               invalidate_all_vuids(sconn);
+       }
 
        /* 3 second timeout. */
        print_notify_send_messages(smbd_messaging_context(), 3);
@@ -823,6 +873,15 @@ static void exit_server_common(enum server_exit_reason how,
        locking_end();
        printing_end();
 
+       /*
+        * we need to force the order of freeing the following,
+        * because smbd_msg_ctx is not a talloc child of smbd_server_conn.
+        */
+       sconn = NULL;
+       TALLOC_FREE(smbd_server_conn);
+       TALLOC_FREE(smbd_msg_ctx);
+       TALLOC_FREE(smbd_event_ctx);
+
        if (how != SERVER_EXIT_NORMAL) {
                int oldlevel = DEBUGLEVEL;
 
@@ -841,6 +900,10 @@ static void exit_server_common(enum server_exit_reason how,
        } else {    
                DEBUG(3,("Server exit (%s)\n",
                        (reason ? reason : "normal exit")));
+               if (am_parent) {
+                       pidfile_unlink();
+               }
+               gencache_stabilize();
        }
 
        /* if we had any open SMB connections when we exited then we
@@ -883,12 +946,8 @@ static bool init_structs(void )
        if (!init_names())
                return False;
 
-       conn_init();
-
        file_init();
 
-       init_dptrs();
-
        if (!secrets_init())
                return False;
 
@@ -939,6 +998,7 @@ extern void build_options(bool screen);
        POPT_COMMON_DYNCONFIG
        POPT_TABLEEND
        };
+       struct smbd_parent_context *parent = NULL;
        TALLOC_CTX *frame = talloc_stackframe(); /* Setup tos. */
 
        smbd_init_globals();
@@ -1021,6 +1081,14 @@ extern void build_options(bool screen);
        gain_root_privilege();
        gain_root_group_privilege();
 
+       /*
+        * Ensure we have CAP_KILL capability set on Linux,
+        * where we need this to communicate with threads.
+        * This is inherited by new threads, but not by new
+        * processes across exec().
+        */
+       set_effective_capability(KILL_CAPABILITY);
+
        fault_setup((void (*)(void *))exit_server_fault);
        dump_core_setup("smbd");
 
@@ -1043,6 +1111,11 @@ extern void build_options(bool screen);
        BlockSignals(False, SIGUSR1);
        BlockSignals(False, SIGTERM);
 
+       /* Ensure we leave no zombies until we
+        * correctly set up child handling below. */
+
+       CatchChild();
+
        /* we want total control over the permissions on created files,
           so set our umask to 0 */
        umask(0);
@@ -1127,8 +1200,8 @@ extern void build_options(bool screen);
        if (is_daemon)
                pidfile_create("smbd");
 
-       if (!reinit_after_fork(smbd_messaging_context(),
-                              smbd_event_context(), false)) {
+       if (!NT_STATUS_IS_OK(reinit_after_fork(smbd_messaging_context(),
+                            smbd_event_context(), false))) {
                DEBUG(0,("reinit_after_fork() failed\n"));
                exit(1);
        }
@@ -1187,6 +1260,15 @@ extern void build_options(bool screen);
                return -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
+          performance improvment and reduces the total number of system
+          fds used. */
+       if (!share_info_db_init()) {
+               DEBUG(0,("ERROR: failed to load share info db.\n"));
+               exit(1);
+       }
+
        /* only start the background queue daemon if we are 
           running as a daemon -- bad things will happen if
           smbd is launched via inetd and we fork a copy of 
@@ -1209,18 +1291,31 @@ extern void build_options(bool screen);
                /* close our standard file descriptors */
                close_low_fds(False); /* Don't close stderr */
 
+#ifdef HAVE_ATEXIT
+               atexit(killkids);
+#endif
+
+               /* Stop zombies */
+               smbd_setup_sig_chld_handler();
+
                smbd_process();
 
                exit_server_cleanly(NULL);
                return(0);
        }
 
-       if (!open_sockets_smbd(interactive, ports))
-               exit(1);
+       parent = talloc_zero(smbd_event_context(), struct smbd_parent_context);
+       if (!parent) {
+               exit_server("talloc(struct smbd_parent_context) failed");
+       }
+       parent->interactive = interactive;
+
+       if (!open_sockets_smbd(parent, ports))
+               exit_server("open_sockets_smbd() failed");
 
        TALLOC_FREE(frame);
 
-       smbd_process();
+       smbd_parent_loop(parent);
 
        exit_server_cleanly(NULL);
        return(0);