Remove redundant parameter fd from SMB_VFS_FTRUNCATE().
[ira/wip.git] / source3 / smbd / server.c
index b76ade957c2aee43d12fcd72b67609c88553e541..43a6d62a2898c544b45a6654d13cbfe1bb7b515b 100644 (file)
@@ -1,39 +1,36 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Main SMB server routines
    Copyright (C) Andrew Tridgell               1992-1998
    Copyright (C) Martin Pool                   2002
    Copyright (C) Jelmer Vernooij               2002-2003
-   
+   Copyright (C) Volker Lendecke               1993-2007
+   Copyright (C) Jeremy Allison                        1993-2007
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 
-static int am_parent = 1;
-
-/* the last message the was processed */
-int last_message = -1;
+static_decl_rpc;
 
-/* a useful macro to debug the last message processed */
-#define LAST_MESSAGE() smb_fn_name(last_message)
+static int am_parent = 1;
 
 extern struct auth_context *negprot_global_auth_context;
-extern pstring user_socket_options;
 extern SIG_ATOMIC_T got_sig_term;
 extern SIG_ATOMIC_T reload_after_sighup;
+static SIG_ATOMIC_T got_sig_cld;
 
 #ifdef WITH_DFS
 extern int dcelogin_atmost_once;
@@ -55,21 +52,78 @@ int smbd_server_fd(void)
 static void smbd_set_server_fd(int fd)
 {
        server_fd = fd;
-       client_setfd(fd);
+}
+
+int get_client_fd(void)
+{
+       return server_fd;
+}
+
+struct event_context *smbd_event_context(void)
+{
+       static struct event_context *ctx;
+
+       if (!ctx && !(ctx = event_context_init(NULL))) {
+               smb_panic("Could not init smbd event context");
+       }
+       return ctx;
+}
+
+struct messaging_context *smbd_messaging_context(void)
+{
+       static struct messaging_context *ctx;
+
+       if (!ctx && !(ctx = messaging_init(NULL, server_id_self(),
+                                          smbd_event_context()))) {
+               smb_panic("Could not init smbd messaging context");
+       }
+       return ctx;
+}
+
+struct memcache *smbd_memcache(void)
+{
+       static struct memcache *cache;
+
+       if (!cache
+           && !(cache = memcache_init(NULL,
+                                      lp_max_stat_cache_size()*1024))) {
+
+               smb_panic("Could not init smbd memcache");
+       }
+       return cache;
 }
 
 /*******************************************************************
  What to do when smb.conf is updated.
  ********************************************************************/
 
-static void smb_conf_updated(int msg_type, struct process_id src,
-                            void *buf, size_t len)
+static void smb_conf_updated(struct messaging_context *msg,
+                            void *private_data,
+                            uint32_t msg_type,
+                            struct server_id server_id,
+                            DATA_BLOB *data)
 {
-       DEBUG(10,("smb_conf_updated: Got message saying smb.conf was updated. Reloading.\n"));
+       DEBUG(10,("smb_conf_updated: Got message saying smb.conf was "
+                 "updated. Reloading.\n"));
        reload_services(False);
 }
 
 
+/*******************************************************************
+ Delete a statcache entry.
+ ********************************************************************/
+
+static void smb_stat_cache_delete(struct messaging_context *msg,
+                                 void *private_data,
+                                 uint32_t msg_tnype,
+                                 struct server_id server_id,
+                                 DATA_BLOB *data)
+{
+       const char *name = (const char *)data->data;
+       DEBUG(10,("smb_stat_cache_delete: delete name %s\n", name));
+       stat_cache_delete(name);
+}
+
 /****************************************************************************
  Terminate signal.
 ****************************************************************************/
@@ -90,6 +144,15 @@ static void sig_hup(int sig)
        sys_select_signal(SIGHUP);
 }
 
+/****************************************************************************
+ Catch a sigcld
+****************************************************************************/
+static void sig_cld(int sig)
+{
+       got_sig_cld = 1;
+       sys_select_signal(SIGCLD);
+}
+
 /****************************************************************************
   Send a SIGTERM to our process group.
 *****************************************************************************/
@@ -104,36 +167,21 @@ static void  killkids(void)
  somewhere else.
 ****************************************************************************/
 
-static void msg_sam_sync(int UNUSED(msg_type), struct process_id UNUSED(pid),
-                        void *UNUSED(buf), size_t UNUSED(len))
+static void msg_sam_sync(struct messaging_context *msg,
+                        void *private_data,
+                        uint32_t msg_type,
+                        struct server_id server_id,
+                        DATA_BLOB *data)
 {
         DEBUG(10, ("** sam sync message received, ignoring\n"));
 }
 
-/****************************************************************************
- Process a sam sync replicate message - not sure whether to do this here or
- somewhere else.
-****************************************************************************/
-
-static void msg_sam_repl(int msg_type, struct process_id pid,
-                        void *buf, size_t len)
-{
-        uint32 low_serial;
-
-        if (len != sizeof(uint32))
-                return;
-
-        low_serial = *((uint32 *)buf);
-
-        DEBUG(3, ("received sam replication message, serial = 0x%04x\n",
-                  low_serial));
-}
 
 /****************************************************************************
  Open the socket communication - inetd.
 ****************************************************************************/
 
-static BOOL open_sockets_inetd(void)
+static bool open_sockets_inetd(void)
 {
        /* Started from inetd. fd 0 is the socket. */
        /* We will abort gracefully when the client or remote system 
@@ -144,89 +192,123 @@ static BOOL open_sockets_inetd(void)
        close_low_fds(False); /* Don't close stderr */
        
        set_socket_options(smbd_server_fd(),"SO_KEEPALIVE");
-       set_socket_options(smbd_server_fd(), user_socket_options);
+       set_socket_options(smbd_server_fd(), lp_socket_options());
 
        return True;
 }
 
-static void msg_exit_server(int msg_type, struct process_id src,
-                           void *buf, size_t len)
+static void msg_exit_server(struct messaging_context *msg,
+                           void *private_data,
+                           uint32_t msg_type,
+                           struct server_id server_id,
+                           DATA_BLOB *data)
 {
        DEBUG(3, ("got a SHUTDOWN message\n"));
        exit_server_cleanly(NULL);
 }
 
 #ifdef DEVELOPER
-static void msg_inject_fault(int msg_type, struct process_id src,
-                           void *buf, size_t len)
+static void msg_inject_fault(struct messaging_context *msg,
+                            void *private_data,
+                            uint32_t msg_type,
+                            struct server_id src,
+                            DATA_BLOB *data)
 {
        int sig;
 
-       if (len != sizeof(int)) {
+       if (data->length != sizeof(sig)) {
                
-               DEBUG(0, ("Process %llu sent bogus signal injection request\n",
-                       (unsigned long long)src.pid));
+               DEBUG(0, ("Process %s sent bogus signal injection request\n",
+                         procid_str_static(&src)));
                return;
        }
 
-       sig = *(int *)buf;
+       sig = *(int *)data->data;
        if (sig == -1) {
                exit_server("internal error injected");
                return;
        }
 
 #if HAVE_STRSIGNAL
-       DEBUG(0, ("Process %llu requested injection of signal %d (%s)\n",
-                   (unsigned long long)src.pid, sig, strsignal(sig)));
+       DEBUG(0, ("Process %s requested injection of signal %d (%s)\n",
+                 procid_str_static(&src), sig, strsignal(sig)));
 #else
-       DEBUG(0, ("Process %llu requested injection of signal %d\n",
-                   (unsigned long long)src.pid, sig));
+       DEBUG(0, ("Process %s requested injection of signal %d\n",
+                 procid_str_static(&src), sig));
 #endif
 
        kill(sys_getpid(), sig);
 }
 #endif /* DEVELOPER */
 
+struct child_pid {
+       struct child_pid *prev, *next;
+       pid_t pid;
+};
+
+static struct child_pid *children;
+static int num_children;
+
+static void add_child_pid(pid_t pid)
+{
+       struct child_pid *child;
+
+       if (lp_max_smbd_processes() == 0) {
+               /* Don't bother with the child list if we don't care anyway */
+               return;
+       }
+
+       child = SMB_MALLOC_P(struct child_pid);
+       if (child == NULL) {
+               DEBUG(0, ("Could not add child struct -- malloc failed\n"));
+               return;
+       }
+       child->pid = pid;
+       DLIST_ADD(children, child);
+       num_children += 1;
+}
+
+static void remove_child_pid(pid_t pid)
+{
+       struct child_pid *child;
+
+       if (lp_max_smbd_processes() == 0) {
+               /* Don't bother with the child list if we don't care anyway */
+               return;
+       }
+
+       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;
+               }
+       }
+
+       DEBUG(0, ("Could not find child %d -- ignoring\n", (int)pid));
+}
 
 /****************************************************************************
  Have we reached the process limit ?
 ****************************************************************************/
 
-static BOOL allowable_number_of_smbd_processes(void)
+static bool allowable_number_of_smbd_processes(void)
 {
        int max_processes = lp_max_smbd_processes();
 
        if (!max_processes)
                return True;
 
-       {
-               TDB_CONTEXT *tdb = conn_tdb_ctx();
-               int32 val;
-               if (!tdb) {
-                       DEBUG(0,("allowable_number_of_smbd_processes: can't open connection tdb.\n" ));
-                       return False;
-               }
-
-               val = tdb_fetch_int32(tdb, "INFO/total_smbds");
-               if (val == -1 && (tdb_error(tdb) != TDB_ERR_NOEXIST)) {
-                       DEBUG(0,("allowable_number_of_smbd_processes: can't fetch INFO/total_smbds. Error %s\n",
-                               tdb_errorstr(tdb) ));
-                       return False;
-               }
-               if (val > max_processes) {
-                       DEBUG(0,("allowable_number_of_smbd_processes: number of processes (%d) is over allowed limit (%d)\n",
-                               val, max_processes ));
-                       return False;
-               }
-       }
-       return True;
+       return num_children < max_processes;
 }
 
 /****************************************************************************
  Open the socket communication.
 ****************************************************************************/
 
-static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_ports)
+static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_ports)
 {
        int num_interfaces = iface_count();
        int num_sockets = 0;
@@ -236,12 +318,13 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
        int maxfd = 0;
        int i;
        char *ports;
+       struct dns_reg_state * dns_reg = NULL;
+       unsigned dns_port = 0;
 
        if (!is_daemon) {
                return open_sockets_inetd();
        }
 
-               
 #ifdef HAVE_ATEXIT
        {
                static int atexit_set;
@@ -253,8 +336,8 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
 #endif
 
        /* Stop zombies */
-       CatchChild();
-                               
+       CatchSignal(SIGCLD, sig_cld);
+
        FD_ZERO(&listen_set);
 
        /* use a reasonable default set of ports - listing on 445 and 139 */
@@ -270,42 +353,62 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
        }
 
        if (lp_interfaces() && lp_bind_interfaces_only()) {
-               /* We have been given an interfaces line, and been 
+               /* We have been given an interfaces line, and been
                   told to only bind to those interfaces. Create a
                   socket per interface and bind to only these.
                */
-               
+
                /* Now open a listen socket for each of the
                   interfaces. */
                for(i = 0; i < num_interfaces; i++) {
-                       struct in_addr *ifip = iface_n_ip(i);
-                       fstring tok;
+                       TALLOC_CTX *frame = NULL;
+                       const struct sockaddr_storage *ifss =
+                                       iface_n_sockaddr_storage(i);
+                       char *tok;
                        const char *ptr;
 
-                       if(ifip == NULL) {
-                               DEBUG(0,("open_sockets_smbd: interface %d has NULL IP address !\n", i));
+                       if (ifss == NULL) {
+                               DEBUG(0,("open_sockets_smbd: "
+                                       "interface %d has NULL IP address !\n",
+                                       i));
                                continue;
                        }
 
-                       for (ptr=ports; next_token(&ptr, tok, " \t,", sizeof(tok)); ) {
+                       frame = talloc_stackframe();
+                       for (ptr=ports;
+                                       next_token_talloc(frame,&ptr, &tok, " \t,");) {
                                unsigned port = atoi(tok);
-                               if (port == 0) {
+                               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, 0,
+                                                       ifss, True);
+                               if(s == -1) {
                                        continue;
                                }
-                               s = fd_listenset[num_sockets] = open_socket_in(SOCK_STREAM, port, 0, ifip->s_addr, True);
-                               if(s == -1)
-                                       return False;
 
                                /* ready to listen */
-                               set_socket_options(s,"SO_KEEPALIVE"); 
-                               set_socket_options(s,user_socket_options);
-     
-                               /* Set server socket to non-blocking for the accept. */
-                               set_blocking(s,False); 
+                               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,("listen: %s\n",strerror(errno)));
+                                       DEBUG(0,("open_sockets_smbd: listen: "
+                                               "%s\n", strerror(errno)));
                                        close(s);
+                                       TALLOC_FREE(frame);
                                        return False;
                                }
                                FD_SET(s,&listen_set);
@@ -313,88 +416,172 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
 
                                num_sockets++;
                                if (num_sockets >= FD_SETSIZE) {
-                                       DEBUG(0,("open_sockets_smbd: Too many sockets to bind to\n"));
+                                       DEBUG(0,("open_sockets_smbd: Too "
+                                               "many sockets to bind to\n"));
+                                       TALLOC_FREE(frame);
                                        return False;
                                }
                        }
+                       TALLOC_FREE(frame);
                }
        } else {
                /* Just bind to 0.0.0.0 - accept connections
                   from anywhere. */
 
-               fstring tok;
+               TALLOC_CTX *frame = talloc_stackframe();
+               char *tok;
                const char *ptr;
+               const char *sock_addr = lp_socket_address();
+               char *sock_tok;
+               const char *sock_ptr;
+
+               if (strequal(sock_addr, "0.0.0.0") ||
+                               strequal(sock_addr, "::")) {
+#if HAVE_IPV6
+                       sock_addr = "::,0.0.0.0";
+#else
+                       sock_addr = "0.0.0.0";
+#endif
+               }
 
-               num_interfaces = 1;
-               
-               for (ptr=ports; next_token(&ptr, tok, " \t,", sizeof(tok)); ) {
-                       unsigned port = atoi(tok);
-                       if (port == 0) continue;
-                       /* open an incoming socket */
-                       s = open_socket_in(SOCK_STREAM, port, 0,
-                                          interpret_addr(lp_socket_address()),True);
-                       if (s == -1)
-                               return(False);
-               
-                       /* ready to listen */
-                       set_socket_options(s,"SO_KEEPALIVE"); 
-                       set_socket_options(s,user_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);
-                               return False;
-                       }
+               for (sock_ptr=sock_addr;
+                               next_token_talloc(frame, &sock_ptr, &sock_tok, " \t,"); ) {
+                       for (ptr=ports; next_token_talloc(frame, &ptr, &tok, " \t,"); ) {
+                               struct sockaddr_storage ss;
 
-                       fd_listenset[num_sockets] = s;
-                       FD_SET(s,&listen_set);
-                       maxfd = MAX( maxfd, s);
+                               unsigned port = atoi(tok);
+                               if (port == 0 || port > 0xffff) {
+                                       continue;
+                               }
 
-                       num_sockets++;
+                               /* Keep the first port for mDNS service
+                                * registration.
+                                */
+                               if (dns_port == 0) {
+                                       dns_port = port;
+                               }
+
+                               /* open an incoming socket */
+                               if (!interpret_string_addr(&ss, sock_tok,
+                                               AI_NUMERICHOST|AI_PASSIVE)) {
+                                       continue;
+                               }
+
+                               s = open_socket_in(SOCK_STREAM, port, 0,
+                                                  &ss, true);
+                               if (s == -1) {
+                                       continue;
+                               }
 
-                       if (num_sockets >= FD_SETSIZE) {
-                               DEBUG(0,("open_sockets_smbd: Too many sockets to bind to\n"));
-                               return False;
+                               /* 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;
+                               }
                        }
                }
-       } 
+               TALLOC_FREE(frame);
+       }
 
        SAFE_FREE(ports);
 
+       if (num_sockets == 0) {
+               DEBUG(0,("open_sockets_smbd: No "
+                       "sockets available to bind to.\n"));
+               return false;
+       }
+
+       /* Setup the main smbd so that we can get messages. Note that
+          do this after starting listening. This is needed as when in
+          clustered mode, ctdb won't allow us to start doing database
+          operations until it has gone thru a full startup, which
+          includes checking to see that smbd is listening. */
+       claim_connection(NULL,"",FLAG_MSG_GENERAL|FLAG_MSG_SMBD);
+
         /* Listen to messages */
 
-        message_register(MSG_SMB_SAM_SYNC, msg_sam_sync);
-        message_register(MSG_SMB_SAM_REPL, msg_sam_repl);
-        message_register(MSG_SHUTDOWN, msg_exit_server);
-        message_register(MSG_SMB_FILE_RENAME, msg_file_was_renamed);
-       message_register(MSG_SMB_CONF_UPDATED, smb_conf_updated); 
+       messaging_register(smbd_messaging_context(), NULL,
+                          MSG_SMB_SAM_SYNC, msg_sam_sync);
+       messaging_register(smbd_messaging_context(), NULL,
+                          MSG_SHUTDOWN, msg_exit_server);
+       messaging_register(smbd_messaging_context(), NULL,
+                          MSG_SMB_FILE_RENAME, msg_file_was_renamed);
+       messaging_register(smbd_messaging_context(), NULL,
+                          MSG_SMB_CONF_UPDATED, smb_conf_updated);
+       messaging_register(smbd_messaging_context(), NULL,
+                          MSG_SMB_STAT_CACHE_DELETE, smb_stat_cache_delete);
+       brl_register_msgs(smbd_messaging_context());
 
 #ifdef DEVELOPER
-       message_register(MSG_SMB_INJECT_FAULT, msg_inject_fault); 
+       messaging_register(smbd_messaging_context(), NULL,
+                          MSG_SMB_INJECT_FAULT, msg_inject_fault);
 #endif
 
        /* now accept incoming connections - forking a new process
           for each incoming connection */
        DEBUG(2,("waiting for a connection\n"));
        while (1) {
-               fd_set lfds;
+               struct timeval now, idle_timeout;
+               fd_set r_fds, w_fds;
                int num;
-               
-               /* Free up temporary memory from the main smbd. */
-               lp_TALLOC_FREE();
 
                /* Ensure we respond to PING and DEBUG messages from the main smbd. */
-               message_dispatch();
+               message_dispatch(smbd_messaging_context());
+
+               if (got_sig_cld) {
+                       pid_t pid;
+                       got_sig_cld = False;
 
-               memcpy((char *)&lfds, (char *)&listen_set, 
+                       while ((pid = sys_waitpid(-1, NULL, WNOHANG)) > 0) {
+                               remove_child_pid(pid);
+                       }
+               }
+
+               idle_timeout = timeval_zero();
+
+               memcpy((char *)&r_fds, (char *)&listen_set,
                       sizeof(listen_set));
-               
-               num = sys_select(maxfd+1,&lfds,NULL,NULL,NULL);
-               
+               FD_ZERO(&w_fds);
+               GetTimeOfDay(&now);
+
+               /* Kick off our mDNS registration. */
+               if (dns_port != 0) {
+                       dns_register_smbd(&dns_reg, dns_port, &maxfd,
+                                       &r_fds, &idle_timeout);
+               }
+
+               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 (num == -1 && errno == EINTR) {
                        if (got_sig_term) {
                                exit_server_cleanly(NULL);
@@ -410,7 +597,16 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
 
                        continue;
                }
-               
+
+               /* process pending nDNS responses */
+               if (dns_register_smbd_reply(dns_reg, &r_fds, &idle_timeout)) {
+                       --num;
+               }
+
+               if (run_events(smbd_event_context(), num, &r_fds, &w_fds)) {
+                       continue;
+               }
+
                /* check if we need to reload services */
                check_reload(time(NULL));
 
@@ -419,23 +615,24 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
                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],&lfds)) {
+                               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],&lfds);
+                                       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(0,("open_sockets_smbd: accept: %s\n",
                                         strerror(errno)));
@@ -447,42 +644,58 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
 
                        if (smbd_server_fd() != -1 && interactive)
                                return True;
-                       
-                       if (allowable_number_of_smbd_processes() && smbd_server_fd() != -1 && sys_fork()==0) {
+
+                       if (allowable_number_of_smbd_processes() &&
+                           smbd_server_fd() != -1 &&
+                           ((child = sys_fork())==0)) {
+                               char remaddr[INET6_ADDRSTRLEN];
+
                                /* Child code ... */
-                               
+
+                               /* 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 mDNS daemon handle */
+                               dns_register_close(&dns_reg);
+
                                /* close our standard file
                                   descriptors */
                                close_low_fds(False);
                                am_parent = 0;
-                               
+
                                set_socket_options(smbd_server_fd(),"SO_KEEPALIVE");
-                               set_socket_options(smbd_server_fd(),user_socket_options);
-                               
+                               set_socket_options(smbd_server_fd(),
+                                                  lp_socket_options());
+
                                /* this is needed so that we get decent entries
                                   in smbstatus for port 445 connects */
-                               set_remote_machine_name(get_peer_addr(smbd_server_fd()), False);
-                               
+                               set_remote_machine_name(get_peer_addr(smbd_server_fd(),
+                                                               remaddr,
+                                                               sizeof(remaddr)),
+                                                               false);
+
                                /* Reset the state of the random
                                 * number generation system, so
                                 * children do not get the same random
                                 * numbers as each other */
 
                                set_need_random_reseed();
-                               /* tdb needs special fork handling - remove CLEAR_IF_FIRST flags */
+                               /* tdb needs special fork handling - remove
+                                * CLEAR_IF_FIRST flags */
                                if (tdb_reopen_all(1) == -1) {
                                        DEBUG(0,("tdb_reopen_all failed.\n"));
-                                       smb_panic("tdb_reopen_all failed.");
+                                       smb_panic("tdb_reopen_all failed");
                                }
 
-                               return True; 
+                               return True;
                        }
                        /* The parent doesn't need this socket */
-                       close(smbd_server_fd()); 
+                       close(smbd_server_fd());
 
                        /* Sun May 6 18:56:14 2001 ackley@cs.unm.edu:
                                Clear the closed fd info out of server_fd --
@@ -494,6 +707,10 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
 
                        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
@@ -509,7 +726,7 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
                         * (ca. 100kb).
                         * */
                        force_check_log_size();
+
                } /* end for num */
        } /* end while 1 */
 
@@ -553,16 +770,15 @@ void reload_printers(void)
  Reload the services file.
 **************************************************************************/
 
-BOOL reload_services(BOOL test)
+bool reload_services(bool test)
 {
-       BOOL ret;
-       
+       bool ret;
+
        if (lp_loaded()) {
-               pstring fname;
-               pstrcpy(fname,lp_configfile());
+               char *fname = lp_configfile();
                if (file_exist(fname, NULL) &&
-                   !strcsequal(fname, dyn_CONFIGFILE)) {
-                       pstrcpy(dyn_CONFIGFILE, fname);
+                   !strcsequal(fname, get_dyn_CONFIGFILE())) {
+                       set_dyn_CONFIGFILE(fname);
                        test = False;
                }
        }
@@ -574,7 +790,7 @@ BOOL reload_services(BOOL test)
 
        lp_killunused(conn_snum_used);
 
-       ret = lp_load(dyn_CONFIGFILE, False, False, True, True);
+       ret = lp_load(get_dyn_CONFIGFILE(), False, False, True, True);
 
        reload_printers();
 
@@ -586,9 +802,9 @@ BOOL reload_services(BOOL test)
 
        load_interfaces();
 
-       if (smbd_server_fd() != -1) {      
+       if (smbd_server_fd() != -1) {
                set_socket_options(smbd_server_fd(),"SO_KEEPALIVE");
-               set_socket_options(smbd_server_fd(), user_socket_options);
+               set_socket_options(smbd_server_fd(), lp_socket_options());
        }
 
        mangle_reset_cache();
@@ -629,13 +845,13 @@ static void exit_server_common(enum server_exit_reason how,
 
        invalidate_all_vuids();
 
-       print_notify_send_messages(3); /* 3 second timeout. */
+       /* 3 second timeout. */
+       print_notify_send_messages(smbd_messaging_context(), 3);
 
        /* delete our entry in the connections database. */
        yield_connection(NULL,"");
 
        respond_to_all_remaining_local_messages();
-       decrement_smbd_process_count();
 
 #ifdef WITH_DFS
        if (dcelogin_atmost_once) {
@@ -648,7 +864,6 @@ static void exit_server_common(enum server_exit_reason how,
 
        if (how != SERVER_EXIT_NORMAL) {
                int oldlevel = DEBUGLEVEL;
-               char *last_inbuf = get_InBuffer();
 
                DEBUGLEVEL = 10;
 
@@ -658,15 +873,9 @@ static void exit_server_common(enum server_exit_reason how,
                DEBUGSEP(0);
 
                log_stack_trace();
-               if (last_inbuf) {
-                       DEBUG(0,("Last message was %s\n", LAST_MESSAGE()));
-                       show_msg(last_inbuf);
-               }
 
                DEBUGLEVEL = oldlevel;
-#if DUMP_CORE
                dump_core();
-#endif
 
        } else {    
                DEBUG(3,("Server exit (%s)\n",
@@ -695,7 +904,7 @@ void exit_server_fault(void)
  Initialise connect, service and file structs.
 ****************************************************************************/
 
-static BOOL init_structs(void )
+static bool init_structs(void )
 {
        /*
         * Set the machine NETBIOS name if not already
@@ -719,6 +928,35 @@ static BOOL init_structs(void )
        return True;
 }
 
+/*
+ * Send keepalive packets to our client
+ */
+static bool keepalive_fn(const struct timeval *now, void *private_data)
+{
+       if (!send_keepalive(smbd_server_fd())) {
+               DEBUG( 2, ( "Keepalive failed - exiting.\n" ) );
+               return False;
+       }
+       return True;
+}
+
+/*
+ * Do the recurring check if we're idle
+ */
+static bool deadtime_fn(const struct timeval *now, void *private_data)
+{
+       if ((conn_num_open() == 0)
+           || (conn_idle_all(now->tv_sec))) {
+               DEBUG( 2, ( "Closing idle connection\n" ) );
+               messaging_send(smbd_messaging_context(), procid_self(),
+                              MSG_SHUTDOWN, &data_blob_null);
+               return False;
+       }
+
+       return True;
+}
+
+
 /****************************************************************************
  main program.
 ****************************************************************************/
@@ -727,52 +965,94 @@ static BOOL init_structs(void )
    mkproto.h.  Mixing $(builddir) and $(srcdir) source files in the current
    prototype generation system is too complicated. */
 
-void build_options(BOOL screen);
+extern void build_options(bool screen);
 
  int main(int argc,const char *argv[])
 {
        /* shall I run as a daemon */
-       static BOOL is_daemon = False;
-       static BOOL interactive = False;
-       static BOOL Fork = True;
-       static BOOL no_process_group = False;
-       static BOOL log_stdout = False;
+       static bool is_daemon = False;
+       static bool interactive = False;
+       static bool Fork = True;
+       static bool no_process_group = False;
+       static bool log_stdout = False;
        static char *ports = NULL;
+       static char *profile_level = NULL;
        int opt;
        poptContext pc;
-
+       bool print_build_options = False;
+        enum {
+               OPT_DAEMON = 1000,
+               OPT_INTERACTIVE,
+               OPT_FORK,
+               OPT_NO_PROCESS_GROUP,
+               OPT_LOG_STDOUT
+       };
        struct poptOption long_options[] = {
-               POPT_AUTOHELP
-       {"daemon", 'D', POPT_ARG_VAL, &is_daemon, True, "Become a daemon (default)" },
-       {"interactive", 'i', POPT_ARG_VAL, &interactive, True, "Run interactive (not a daemon)"},
-       {"foreground", 'F', POPT_ARG_VAL, &Fork, False, "Run daemon in foreground (for daemontools & etc)" },
-       {"no-process-group", 0, POPT_ARG_VAL, &no_process_group, True, "Don't create a new process group" },
-       {"log-stdout", 'S', POPT_ARG_VAL, &log_stdout, True, "Log to stdout" },
+       POPT_AUTOHELP
+       {"daemon", 'D', POPT_ARG_NONE, NULL, OPT_DAEMON, "Become a daemon (default)" },
+       {"interactive", 'i', POPT_ARG_NONE, NULL, OPT_INTERACTIVE, "Run interactive (not a daemon)"},
+       {"foreground", 'F', POPT_ARG_NONE, NULL, OPT_FORK, "Run daemon in foreground (for daemontools, etc.)" },
+       {"no-process-group", '\0', POPT_ARG_NONE, NULL, OPT_NO_PROCESS_GROUP, "Don't create a new process group" },
+       {"log-stdout", 'S', POPT_ARG_NONE, NULL, OPT_LOG_STDOUT, "Log to stdout" },
        {"build-options", 'b', POPT_ARG_NONE, NULL, 'b', "Print build options" },
        {"port", 'p', POPT_ARG_STRING, &ports, 0, "Listen on the specified ports"},
+       {"profiling-level", 'P', POPT_ARG_STRING, &profile_level, 0, "Set profiling level","PROFILE_LEVEL"},
        POPT_COMMON_SAMBA
-       { NULL }
+       POPT_COMMON_DYNCONFIG
+       POPT_TABLEEND
        };
+       TALLOC_CTX *frame = talloc_stackframe(); /* Setup tos. */
 
-       load_case_tables();
+       TimeInit();
 
 #ifdef HAVE_SET_AUTH_PARAMETERS
        set_auth_parameters(argc,argv);
 #endif
 
        pc = poptGetContext("smbd", argc, argv, long_options, 0);
-       
        while((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt)  {
+               case OPT_DAEMON:
+                       is_daemon = true;
+                       break;
+               case OPT_INTERACTIVE:
+                       interactive = true;
+                       break;
+               case OPT_FORK:
+                       Fork = false;
+                       break;
+               case OPT_NO_PROCESS_GROUP:
+                       no_process_group = true;
+                       break;
+               case OPT_LOG_STDOUT:
+                       log_stdout = true;
+                       break;
                case 'b':
-                       build_options(True); /* Display output to screen as well as debug */ 
-                       exit(0);
+                       print_build_options = True;
                        break;
+               default:
+                       d_fprintf(stderr, "\nInvalid option %s: %s\n\n",
+                                 poptBadOption(pc, 0), poptStrerror(opt));
+                       poptPrintUsage(pc, stderr, 0);
+                       exit(1);
                }
        }
-
        poptFreeContext(pc);
 
+       if (interactive) {
+               Fork = False;
+               log_stdout = True;
+       }
+
+       setup_logging(argv[0],log_stdout);
+
+       if (print_build_options) {
+               build_options(True); /* Display output to screen as well as debug */
+               exit(0);
+       }
+
+       load_case_tables();
+
 #ifdef HAVE_SETLUID
        /* needed for SecureWare on SCO */
        setluid(0);
@@ -782,11 +1062,6 @@ void build_options(BOOL screen);
 
        set_remote_machine_name("smbd", False);
 
-       if (interactive) {
-               Fork = False;
-               log_stdout = True;
-       }
-
        if (interactive && (DEBUGLEVEL >= 9)) {
                talloc_enable_leak_report();
        }
@@ -796,8 +1071,6 @@ void build_options(BOOL screen);
                exit(1);
        }
 
-       setup_logging(argv[0],log_stdout);
-
        /* we want to re-seed early to prevent time delays causing
            client problems at a later date. (tridge) */
        generate_random_buffer(NULL, 0);
@@ -841,8 +1114,8 @@ void build_options(BOOL screen);
 
        reopen_logs();
 
-       DEBUG(0,( "smbd version %s started.\n", SAMBA_VERSION_STRING));
-       DEBUGADD( 0, ( "%s\n", COPYRIGHT_STARTUP_MESSAGE ) );
+       DEBUG(0,("smbd version %s started.\n", SAMBA_VERSION_STRING));
+       DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));
 
        DEBUG(2,("uid=%d gid=%d euid=%d egid=%d\n",
                 (int)getuid(),(int)getgid(),(int)geteuid(),(int)getegid()));
@@ -865,10 +1138,18 @@ void build_options(BOOL screen);
        init_structs();
 
 #ifdef WITH_PROFILE
-       if (!profile_setup(False)) {
+       if (!profile_setup(smbd_messaging_context(), False)) {
                DEBUG(0,("ERROR: failed to setup profiling\n"));
                return -1;
        }
+       if (profile_level != NULL) {
+               int pl = atoi(profile_level);
+               struct server_id src;
+
+               DEBUG(1, ("setting profiling level: %s\n",profile_level));
+               src.pid = getpid();
+               set_profile_level(pl, src);
+       }
 #endif
 
        DEBUG(3,( "loaded services\n"));
@@ -906,21 +1187,22 @@ void build_options(BOOL screen);
                pidfile_create("smbd");
 
        /* Setup all the TDB's - including CLEAR_IF_FIRST tdb's. */
-       if (!message_init())
+
+       if (smbd_messaging_context() == NULL)
                exit(1);
 
-       /* Initialize our global sam sid first -- quite a lot of the other
-        * initialization routines further down depend on it.
-        */
+       if (smbd_memcache() == NULL) {
+               exit(1);
+       }
+
+       memcache_set_global(smbd_memcache());
 
        /* Initialise the password backed before the global_sam_sid
           to ensure that we fetch from ldap before we make a domain sid up */
 
-       if(!initialize_password_db(False))
+       if(!initialize_password_db(False, smbd_event_context()))
                exit(1);
 
-       /* Fail gracefully if we can't open secrets.tdb */
-
        if (!secrets_init()) {
                DEBUG(0, ("ERROR: smbd can not open secrets.tdb\n"));
                exit(1);
@@ -934,10 +1216,10 @@ void build_options(BOOL screen);
        if (!session_init())
                exit(1);
 
-       if (conn_tdb_ctx() == NULL)
+       if (!connections_init(True))
                exit(1);
 
-       if (!locking_init(0))
+       if (!locking_init())
                exit(1);
 
        namecache_enable();
@@ -950,7 +1232,7 @@ void build_options(BOOL screen);
                 exit(1);
 #endif
 
-       if (!print_backend_init())
+       if (!print_backend_init(smbd_messaging_context()))
                exit(1);
 
        if (!init_guest_info()) {
@@ -958,11 +1240,6 @@ void build_options(BOOL screen);
                return -1;
        }
 
-       /* Setup the main smbd so that we can get messages. */
-       /* don't worry about general printing messages here */
-
-       claim_connection(NULL,"",0,True,FLAG_MSG_GENERAL|FLAG_MSG_SMBD);
-
        /* 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 
@@ -988,8 +1265,12 @@ void build_options(BOOL screen);
 
        init_modules();
 
-       /* possibly reload the services file. */
-       reload_services(True);
+       /* Possibly reload the services file. Only worth doing in
+        * daemon mode. In inetd mode, we know we only just loaded this.
+        */
+       if (is_daemon) {
+               reload_services(True);
+       }
 
        if (!init_account_policy()) {
                DEBUG(0,("Could not open account policy tdb.\n"));
@@ -1002,21 +1283,40 @@ void build_options(BOOL screen);
        }
 
        /* Setup oplocks */
-       if (!init_oplocks())
-               exit(1);
-       
-       /* Setup change notify */
-       if (!init_change_notify())
+       if (!init_oplocks(smbd_messaging_context()))
                exit(1);
 
        /* Setup aio signal handler. */
        initialize_async_io_handler();
 
-       /* re-initialise the timezone */
-       TimeInit();
+       /*
+        * For clustering, we need to re-init our ctdbd connection after the
+        * fork
+        */
+       if (!NT_STATUS_IS_OK(messaging_reinit(smbd_messaging_context())))
+               exit(1);
 
        /* register our message handlers */
-       message_register(MSG_SMB_FORCE_TDIS, msg_force_tdis);
+       messaging_register(smbd_messaging_context(), NULL,
+                          MSG_SMB_FORCE_TDIS, msg_force_tdis);
+
+       if ((lp_keepalive() != 0)
+           && !(event_add_idle(smbd_event_context(), NULL,
+                               timeval_set(lp_keepalive(), 0),
+                               "keepalive", keepalive_fn,
+                               NULL))) {
+               DEBUG(0, ("Could not add keepalive event\n"));
+               exit(1);
+       }
+
+       if (!(event_add_idle(smbd_event_context(), NULL,
+                            timeval_set(IDLE_CLOSED_TIMEOUT, 0),
+                            "deadtime", deadtime_fn, NULL))) {
+               DEBUG(0, ("Could not add deadtime event\n"));
+               exit(1);
+       }
+
+       TALLOC_FREE(frame);
 
        smbd_process();