r23272: Fix main event loop - reviewed by Volker.
[sfrench/samba-autobuild/.git] / source / smbd / server.c
index 5ee9320fb3607a8477237b78681f3adc8ac30c68..e95f3cf4a2b803c8a30fd5c1a77cb0d91b32a754 100644 (file)
@@ -4,6 +4,7 @@
    Copyright (C) Andrew Tridgell               1992-1998
    Copyright (C) Martin Pool                   2002
    Copyright (C) Jelmer Vernooij               2002-2003
+   Copyright (C) James Peach                   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
@@ -61,18 +62,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\n");
+       }
+       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\n");
+       }
+       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.
 ****************************************************************************/
@@ -116,8 +157,11 @@ 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"));
 }
@@ -127,15 +171,18 @@ static void msg_sam_sync(int UNUSED(msg_type), struct process_id UNUSED(pid),
  somewhere else.
 ****************************************************************************/
 
-static void msg_sam_repl(int msg_type, struct process_id pid,
-                        void *buf, size_t len)
+static void msg_sam_repl(struct messaging_context *msg,
+                        void *private_data,
+                        uint32_t msg_type,
+                        struct server_id server_id,
+                        DATA_BLOB *data)
 {
         uint32 low_serial;
 
-        if (len != sizeof(uint32))
+        if (data->length != sizeof(low_serial))
                 return;
 
-        low_serial = *((uint32 *)buf);
+        low_serial = *((uint32 *)data->data);
 
         DEBUG(3, ("received sam replication message, serial = 0x%04x\n",
                   low_serial));
@@ -161,38 +208,44 @@ 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)
 {
        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);
@@ -266,22 +319,20 @@ static BOOL allowable_number_of_smbd_processes(void)
  Open the socket communication.
 ****************************************************************************/
 
-static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_ports)
+static BOOL open_sockets_smbd(enum smb_server_mode server_mode, 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;
+       struct timeval idle_timeout = timeval_zero();
 
-       if (!is_daemon) {
+       if (server_mode == SERVER_MODE_INETD) {
                return open_sockets_inetd();
        }
 
-               
 #ifdef HAVE_ATEXIT
        {
                static int atexit_set;
@@ -294,141 +345,56 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
 
        /* Stop zombies */
        CatchSignal(SIGCLD, sig_cld);
-                               
+
        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);
-               } else {
-                       ports = smb_xstrdup(ports);
-               }
-       } else {
-               ports = smb_xstrdup(smb_ports);
+       /* At this point, it doesn't matter what daemon mode we are in, we
+        * need some sockets to listen on.
+        */
+       num_sockets = smbd_sockinit(smb_ports, fd_listenset, &idle_timeout);
+       if (num_sockets == 0) {
+               return False;
        }
 
-       if (lp_interfaces() && lp_bind_interfaces_only()) {
-               /* 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;
-                       const char *ptr;
-
-                       if(ifip == 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)); ) {
-                               unsigned port = atoi(tok);
-                               if (port == 0) {
-                                       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); 
-                               if (listen(s, SMBD_LISTEN_BACKLOG) == -1) {
-                                       DEBUG(0,("listen: %s\n",strerror(errno)));
-                                       close(s);
-                                       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"));
-                                       return False;
-                               }
-                       }
-               }
-       } else {
-               /* Just bind to 0.0.0.0 - accept connections
-                  from anywhere. */
-
-               fstring tok;
-               const char *ptr;
-
-               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;
-                       }
-
-                       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"));
-                               return False;
-                       }
-               }
-       } 
-
-       SAFE_FREE(ports);
+       for (i = 0; i < num_sockets; ++i) {
+               FD_SET(fd_listenset[i], &listen_set);
+               maxfd = MAX(maxfd, fd_listenset[i]);
+       }
 
         /* 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_SMB_SAM_REPL, msg_sam_repl);
+       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;
+               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;
@@ -439,10 +405,18 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
                        }
                }
 
-               memcpy((char *)&lfds, (char *)&listen_set, 
+               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) {
@@ -459,7 +433,24 @@ 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;
+               }
+
+#if 0
+               Deactivated for now, this needs to become a timed event
+               vl
+
+               /* 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");
+               }
+#endif
+
                /* check if we need to reload services */
                check_reload(time(NULL));
 
@@ -472,11 +463,11 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
 
                        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;
                                }
                        }
@@ -495,8 +486,13 @@ static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_
                        /* Ensure child is set to blocking mode */
                        set_blocking(smbd_server_fd(),True);
 
-                       if (smbd_server_fd() != -1 && interactive)
+                       /* In interactive mode, return with a connected socket.
+                        * Foreground and daemon modes should fork worker
+                        * processes.
+                        */
+                       if (server_mode == SERVER_MODE_INTERACTIVE) {
                                return True;
+                       }
                        
                        if (allowable_number_of_smbd_processes() &&
                            smbd_server_fd() != -1 &&
@@ -691,7 +687,8 @@ 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,"");
@@ -707,6 +704,8 @@ static void exit_server_common(enum server_exit_reason how,
        locking_end();
        printing_end();
 
+       server_encryption_shutdown();
+
        if (how != SERVER_EXIT_NORMAL) {
                int oldlevel = DEBUGLEVEL;
                char *last_inbuf = get_InBuffer();
@@ -778,6 +777,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.
 ****************************************************************************/
@@ -791,24 +819,29 @@ 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 char *ports = NULL;
+       BOOL no_process_group = False;
+       BOOL log_stdout = False;
+       const char *ports = NULL;
+       const char *profile_level = NULL;
        int opt;
        poptContext pc;
 
+       enum smb_server_mode server_mode = SERVER_MODE_DAEMON;
+
        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" },
+       {"daemon", 'D', POPT_ARG_VAL, &server_mode, SERVER_MODE_DAEMON,
+               "Become a daemon (default)" },
+       {"interactive", 'i', POPT_ARG_VAL, &server_mode, SERVER_MODE_INTERACTIVE,
+               "Run interactive (not a daemon)"},
+       {"foreground", 'F', POPT_ARG_VAL, &server_mode, SERVER_MODE_FOREGROUND,
+               "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
        POPT_COMMON_DYNCONFIG
        POPT_TABLEEND
@@ -816,6 +849,8 @@ extern void build_options(BOOL screen);
 
        load_case_tables();
 
+       TimeInit();
+
 #ifdef HAVE_SET_AUTH_PARAMETERS
        set_auth_parameters(argc,argv);
 #endif
@@ -842,16 +877,14 @@ extern void build_options(BOOL screen);
 
        set_remote_machine_name("smbd", False);
 
-       if (interactive) {
-               Fork = False;
+       if (server_mode == SERVER_MODE_INTERACTIVE) {
                log_stdout = True;
+               if (DEBUGLEVEL >= 9) {
+                       talloc_enable_leak_report();
+               }
        }
 
-       if (interactive && (DEBUGLEVEL >= 9)) {
-               talloc_enable_leak_report();
-       }
-
-       if (log_stdout && Fork) {
+       if (log_stdout && server_mode == SERVER_MODE_DAEMON) {
                DEBUG(0,("ERROR: Can't log to stdout (-S) unless daemon is in foreground (-F) or interactive (-i)\n"));
                exit(1);
        }
@@ -925,29 +958,35 @@ extern 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"));
 
-       if (!is_daemon && !is_a_socket(0)) {
-               if (!interactive)
-                       DEBUG(0,("standard input is not a socket, assuming -D option\n"));
-
-               /*
-                * Setting is_daemon here prevents us from eventually calling
-                * the open_sockets_inetd()
-                */
-
-               is_daemon = True;
+       if (is_a_socket(0)) {
+               if (server_mode == SERVER_MODE_DAEMON) {
+                       DEBUG(0,("standard input is a socket, "
+                                   "assuming -F option\n"));
+               }
+               server_mode = SERVER_MODE_INETD;
        }
 
-       if (is_daemon && !interactive) {
+       if (server_mode == SERVER_MODE_DAEMON) {
                DEBUG( 3, ( "Becoming a daemon.\n" ) );
-               become_daemon(Fork, no_process_group);
+               become_daemon(True, no_process_group);
+       } else if (server_mode == SERVER_MODE_FOREGROUND) {
+               become_daemon(False, no_process_group);
        }
 
 #if HAVE_SETPGID
@@ -955,24 +994,28 @@ extern void build_options(BOOL screen);
         * If we're interactive we want to set our own process group for
         * signal management.
         */
-       if (interactive && !no_process_group)
+       if (server_mode == SERVER_MODE_INTERACTIVE && !no_process_group) {
                setpgid( (pid_t)0, (pid_t)0);
+       }
 #endif
 
        if (!directory_exist(lp_lockdir(), NULL))
                mkdir(lp_lockdir(), 0755);
 
-       if (is_daemon)
+       if (server_mode != SERVER_MODE_INETD &&
+           server_mode != SERVER_MODE_INTERACTIVE) {
                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))
+       if(!initialize_password_db(False, smbd_event_context()))
                exit(1);
 
        if (!secrets_init()) {
@@ -988,7 +1031,7 @@ extern 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))
@@ -1004,7 +1047,7 @@ extern 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()) {
@@ -1015,15 +1058,16 @@ extern void build_options(BOOL screen);
        /* 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);
+       claim_connection(NULL,"",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 
           ourselves here */
-
-       if ( is_daemon && !interactive )
+       if (server_mode != SERVER_MODE_INETD &&
+           server_mode != SERVER_MODE_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
@@ -1031,8 +1075,9 @@ extern void build_options(BOOL screen);
         */
        dmapi_init_session();
 
-       if (!open_sockets_smbd(is_daemon, interactive, ports))
+       if (!open_sockets_smbd(server_mode, ports)) {
                exit(1);
+       }
 
        /*
         * everything after this point is run after the fork()
@@ -1042,8 +1087,13 @@ extern 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 (server_mode != SERVER_MODE_INETD &&
+           server_mode != SERVER_MODE_INTERACTIVE) {
+               reload_services(True);
+       }
 
        if (!init_account_policy()) {
                DEBUG(0,("Could not open account policy tdb.\n"));
@@ -1056,21 +1106,31 @@ extern 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();
-
        /* 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();