RIP BOOL. Convert BOOL -> bool. I found a few interesting
[sfrench/samba-autobuild/.git] / source / smbd / server.c
index 6c2034988a7f9bab7b851cedcf270626c61a669d..05bb3504c76805e4a81b0e662af7981903b4ced5 100644 (file)
@@ -7,7 +7,7 @@
    
    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,
    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"
 
-#ifdef HAVE_SYS_PRCTL_H
-#include <sys/prctl.h>
-#endif
+static_decl_rpc;
 
 static int am_parent = 1;
 
@@ -38,6 +35,7 @@ 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;
@@ -62,18 +60,58 @@ static void smbd_set_server_fd(int fd)
        client_setfd(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;
+}
+
 /*******************************************************************
  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.
 ****************************************************************************/
@@ -94,6 +132,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.
 *****************************************************************************/
@@ -108,36 +155,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 
@@ -153,52 +185,118 @@ static BOOL open_sockets_inetd(void)
        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)
 {
-       exit_server("Got a SHUTDOWN message");
+       DEBUG(3, ("got a SHUTDOWN message\n"));
+       exit_server_cleanly(NULL);
+}
+
+#ifdef DEVELOPER
+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 (data->length != sizeof(sig)) {
+               
+               DEBUG(0, ("Process %s sent bogus signal injection request\n",
+                         procid_str_static(&src)));
+               return;
+       }
+
+       sig = *(int *)data->data;
+       if (sig == -1) {
+               exit_server("internal error injected");
+               return;
+       }
+
+#if HAVE_STRSIGNAL
+       DEBUG(0, ("Process %s requested injection of signal %d (%s)\n",
+                 procid_str_static(&src), sig, strsignal(sig)));
+#else
+       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;
@@ -225,7 +323,7 @@ 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);
 
@@ -250,18 +348,27 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
                /* 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);
+                       const struct sockaddr_storage *ifss =
+                                       iface_n_sockaddr_storage(i);
+                       const struct in_addr *ifip;
                        fstring tok;
                        const char *ptr;
 
-                       if(ifip == NULL) {
+                       if (ifss == NULL) {
                                DEBUG(0,("open_sockets_smbd: interface %d has NULL IP address !\n", i));
                                continue;
                        }
 
+                       /* For now only deal with IPv4. */
+                       if (ifss->ss_family != AF_INET) {
+                               continue;
+                       }
+
+                       ifip = &((const struct sockaddr_in *)ifss)->sin_addr;
+
                        for (ptr=ports; next_token(&ptr, tok, " \t,", sizeof(tok)); ) {
                                unsigned port = atoi(tok);
-                               if (port == 0) {
+                               if (port == 0 || port > 0xffff) {
                                        continue;
                                }
                                s = fd_listenset[num_sockets] = open_socket_in(SOCK_STREAM, port, 0, ifip->s_addr, True);
@@ -301,7 +408,7 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
                
                for (ptr=ports; next_token(&ptr, tok, " \t,", sizeof(tok)); ) {
                        unsigned port = atoi(tok);
-                       if (port == 0) continue;
+                       if (port == 0 || port > 0xffff) continue;
                        /* open an incoming socket */
                        s = open_socket_in(SOCK_STREAM, port, 0,
                                           interpret_addr(lp_socket_address()),True);
@@ -337,35 +444,71 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
 
        SAFE_FREE(ports);
 
+
+       /* 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
+       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);
+
+               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("Caught TERM signal");
+                               exit_server_cleanly(NULL);
                        }
 
                        /* check for sighup processing */
@@ -379,6 +522,10 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
                        continue;
                }
                
+               if (run_events(smbd_event_context(), num, &r_fds, &w_fds)) {
+                       continue;
+               }
+
                /* check if we need to reload services */
                check_reload(time(NULL));
 
@@ -387,14 +534,15 @@ 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;
                                }
                        }
@@ -416,8 +564,14 @@ 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)) {
                                /* 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++)
@@ -433,7 +587,8 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
                                
                                /* 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()),
+                                                       False);
                                
                                /* Reset the state of the random
                                 * number generation system, so
@@ -441,10 +596,11 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
                                 * numbers as each other */
 
                                set_need_random_reseed();
-                               /* tdb needs special fork handling - remove CLEAR_IF_FIRST flags */
-                               if (tdb_reopen_all() == -1) {
+                               /* 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; 
@@ -462,6 +618,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
@@ -521,9 +681,9 @@ 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;
@@ -568,55 +728,18 @@ BOOL reload_services(BOOL test)
        return(ret);
 }
 
-
-#if DUMP_CORE
-/*******************************************************************
-prepare to dump a core file - carefully!
-********************************************************************/
-static BOOL dump_core(void)
-{
-       char *p;
-       pstring dname;
-       
-       pstrcpy(dname,lp_logfile());
-       if ((p=strrchr_m(dname,'/'))) *p=0;
-       pstrcat(dname,"/corefiles");
-       mkdir(dname,0700);
-       sys_chown(dname,getuid(),getgid());
-       chmod(dname,0700);
-       if (chdir(dname)) return(False);
-       umask(~(0700));
-
-#ifdef HAVE_GETRLIMIT
-#ifdef RLIMIT_CORE
-       {
-               struct rlimit rlp;
-               getrlimit(RLIMIT_CORE, &rlp);
-               rlp.rlim_cur = MAX(4*1024*1024,rlp.rlim_cur);
-               setrlimit(RLIMIT_CORE, &rlp);
-               getrlimit(RLIMIT_CORE, &rlp);
-               DEBUG(3,("Core limits now %d %d\n",
-                        (int)rlp.rlim_cur,(int)rlp.rlim_max));
-       }
-#endif
-#endif
-
-
-       DEBUG(0,("Dumping core in %s\n", dname));
-       /* Ensure we don't have a signal handler for abort. */
-#ifdef SIGABRT
-       CatchSignal(SIGABRT,SIGNAL_CAST SIG_DFL);
-#endif
-       abort();
-       return(True);
-}
-#endif
-
 /****************************************************************************
  Exit the server.
 ****************************************************************************/
 
-void exit_server(const char *reason)
+/* Reasons for shutting down a server process. */
+enum server_exit_reason { SERVER_EXIT_NORMAL, SERVER_EXIT_ABNORMAL };
+
+static void exit_server_common(enum server_exit_reason how,
+       const char *const reason) NORETURN_ATTRIBUTE;
+
+static void exit_server_common(enum server_exit_reason how,
+       const char *const reason)
 {
        static int firsttime=1;
 
@@ -625,7 +748,6 @@ void exit_server(const char *reason)
        firsttime = 0;
 
        change_to_root_user();
-       DEBUG(2,("Closing connections\n"));
 
        if (negprot_global_auth_context) {
                (negprot_global_auth_context->free)(&negprot_global_auth_context);
@@ -635,13 +757,13 @@ void exit_server(const char *reason)
 
        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) {
@@ -649,32 +771,52 @@ void exit_server(const char *reason)
        }
 #endif
 
-       if (!reason) {   
+       locking_end();
+       printing_end();
+
+       if (how != SERVER_EXIT_NORMAL) {
                int oldlevel = DEBUGLEVEL;
-               char *last_inbuf = get_InBuffer();
+
                DEBUGLEVEL = 10;
-               DEBUG(0,("Last message was %s\n",smb_fn_name(last_message)));
-               if (last_inbuf)
-                       show_msg(last_inbuf);
+
+               DEBUGSEP(0);
+               DEBUG(0,("Abnormal server exit: %s\n",
+                       reason ? reason : "no explanation provided"));
+               DEBUGSEP(0);
+
+               log_stack_trace();
+
                DEBUGLEVEL = oldlevel;
-               DEBUG(0,("===============================================================\n"));
-#if DUMP_CORE
-               if (dump_core()) return;
-#endif
-       }    
+               dump_core();
 
-       locking_end();
-       printing_end();
+       } else {    
+               DEBUG(3,("Server exit (%s)\n",
+                       (reason ? reason : "normal exit")));
+       }
 
-       DEBUG(3,("Server exit (%s)\n", (reason ? reason : "")));
        exit(0);
 }
 
+void exit_server(const char *const explanation)
+{
+       exit_server_common(SERVER_EXIT_ABNORMAL, explanation);
+}
+
+void exit_server_cleanly(const char *const explanation)
+{
+       exit_server_common(SERVER_EXIT_NORMAL, explanation);
+}
+
+void exit_server_fault(void)
+{
+       exit_server("critical server fault");
+}
+
 /****************************************************************************
  Initialise connect, service and file structs.
 ****************************************************************************/
 
-static BOOL init_structs(void )
+static bool init_structs(void )
 {
        /*
         * Set the machine NETBIOS name if not already
@@ -698,6 +840,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.
 ****************************************************************************/
@@ -706,53 +877,65 @@ 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[])
 {
-       extern BOOL in_server;
        /* shall I run as a daemon */
-       static BOOL is_daemon = False;
-       static BOOL interactive = False;
-       static BOOL Fork = True;
-       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;
 
        struct poptOption long_options[] = {
-               POPT_AUTOHELP
+       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)" },
+       {"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" },
        {"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
        };
 
-       in_server = True;
-
        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 '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 (print_build_options) {
+               build_options(True); /* Display output to screen as well as debug */
+               exit(0);
+       }
+
 #ifdef HAVE_SETLUID
        /* needed for SecureWare on SCO */
        setluid(0);
@@ -788,7 +971,9 @@ void build_options(BOOL screen);
        gain_root_privilege();
        gain_root_group_privilege();
 
-       fault_setup((void (*)(void *))exit_server);
+       fault_setup((void (*)(void *))exit_server_fault);
+       dump_core_setup("smbd");
+
        CatchSignal(SIGTERM , SIGNAL_CAST sig_term);
        CatchSignal(SIGHUP,SIGNAL_CAST sig_hup);
        
@@ -843,10 +1028,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"));
@@ -865,7 +1058,7 @@ void build_options(BOOL screen);
 
        if (is_daemon && !interactive) {
                DEBUG( 3, ( "Becoming a daemon.\n" ) );
-               become_daemon(Fork);
+               become_daemon(Fork, no_process_group);
        }
 
 #if HAVE_SETPGID
@@ -873,7 +1066,7 @@ void build_options(BOOL screen);
         * If we're interactive we want to set our own process group for
         * signal management.
         */
-       if (interactive)
+       if (interactive && !no_process_group)
                setpgid( (pid_t)0, (pid_t)0);
 #endif
 
@@ -884,13 +1077,30 @@ 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);
 
+       /* 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, smbd_event_context()))
+               exit(1);
+
+       if (!secrets_init()) {
+               DEBUG(0, ("ERROR: smbd can not open secrets.tdb\n"));
+               exit(1);
+       }
+
+       if(!get_global_sam_sid()) {
+               DEBUG(0,("ERROR: Samba cannot create a SAM SID.\n"));
+               exit(1);
+       }
+
        if (!session_init())
                exit(1);
 
-       if (conn_tdb_ctx() == NULL)
+       if (!connections_init(True))
                exit(1);
 
        if (!locking_init(0))
@@ -906,7 +1116,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()) {
@@ -914,11 +1124,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 
@@ -927,6 +1132,12 @@ void build_options(BOOL screen);
        if ( is_daemon && !interactive )
                start_background_queue(); 
 
+       /* Always attempt to initialize DMAPI. We will only use it later if
+        * lp_dmapi_support is set on the share, but we need a single global
+        * session to work with.
+        */
+       dmapi_init_session();
+
        if (!open_sockets_smbd(is_daemon, interactive, ports))
                exit(1);
 
@@ -934,31 +1145,16 @@ void build_options(BOOL screen);
         * everything after this point is run after the fork()
         */ 
 
-#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
-       /* On Linux we lose the ability to dump core when we change our user
-        * ID. We know how to dump core safely, so let's make sure we have our
-        * dumpable flag set.
-        */
-       prctl(PR_SET_DUMPABLE, 1);
-#endif
-
-       /* 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))
-               exit(1);
-
-       if(!get_global_sam_sid()) {
-               DEBUG(0,("ERROR: Samba cannot create a SAM SID.\n"));
-               exit(1);
-       }
-
        static_init_rpc;
 
        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"));
@@ -971,26 +1167,43 @@ void build_options(BOOL screen);
        }
 
        /* Setup oplocks */
-       if (!init_oplocks())
+       if (!init_oplocks(smbd_messaging_context()))
                exit(1);
        
-       /* Setup change notify */
-       if (!init_change_notify())
-               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);
+       }
 
        smbd_process();
-       
+
        namecache_shutdown();
 
-       exit_server("normal exit");
+       exit_server_cleanly(NULL);
        return(0);
 }