Changeset 745 for trunk/server/source3/smbd/server.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/server.c (modified) (39 diffs)

trunk/server/source3/smbd/server.c

@@ -23 +23 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "popt_common.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
-
-static_decl_rpc;
+#include "registry/reg_init_full.h"
+#include "libcli/auth/schannel.h"
+#include "secrets.h"
+#include "memcache.h"
+#include "ctdbd_conn.h"
+#include "printing/printer_list.h"
+#include "rpc_server/rpc_ep_setup.h"
+#include "printing/pcap.h"
+#include "printing.h"
+#include "serverid.h"
+#include "passdb.h"
+#include "auth.h"
+#include "messages.h"
+#include "smbprofile.h"
+
+extern void start_epmd(struct tevent_context *ev_ctx,
+                       struct messaging_context *msg_ctx);
+
+extern void start_spoolssd(struct event_context *ev_ctx,
+                           struct messaging_context *msg_ctx);
 
 #ifdef WITH_DFS
@@ -31 +52 @@
 #endif /* WITH_DFS */
 
-int smbd_server_fd(void)
-{
-        return server_fd;
-}
-
 static void smbd_set_server_fd(int fd)
 {
-        server_fd = fd;
-}
-
-int get_client_fd(void)
-{
-        return server_fd;
+        struct smbd_server_connection *sconn = smbd_server_conn;
+        char addr[INET6_ADDRSTRLEN];
+        const char *name;
+
+        sconn->sock = fd;
+
+        /*
+         * Initialize sconn->client_id: If we can't find the client's
+         * name, default to its address.
+         */
+
+        client_addr(fd, sconn->client_id.addr, sizeof(sconn->client_id.addr));
+
+        name = client_name(sconn->sock);
+        if (strcmp(name, "UNKNOWN") != 0) {
+                name = talloc_strdup(sconn, name);
+        } else {
+                name = NULL;
+        }
+        sconn->client_id.name =
+                (name != NULL) ? name : sconn->client_id.addr;
+
+        sub_set_socket_ids(sconn->client_id.addr, sconn->client_id.name,
+                           client_socket_addr(sconn->sock, addr,
+                                              sizeof(addr)));
 }
 
 struct event_context *smbd_event_context(void)
 {
-        if (!smbd_event_ctx) {
-                smbd_event_ctx = event_context_init(talloc_autofree_context());
-        }
-        if (!smbd_event_ctx) {
-                smb_panic("Could not init smbd event context");
-        }
-        return smbd_event_ctx;
-}
-
-struct messaging_context *smbd_messaging_context(void)
-{
-        if (smbd_msg_ctx == NULL) {
-                smbd_msg_ctx = messaging_init(talloc_autofree_context(),
-                                              server_id_self(),
-                                              smbd_event_context());
-        }
-        if (smbd_msg_ctx == NULL) {
-                DEBUG(0, ("Could not init smbd messaging context.\n"));
-        }
-        return smbd_msg_ctx;
-}
-
-struct memcache *smbd_memcache(void)
-{
-        if (!smbd_memcache_ctx) {
-                smbd_memcache_ctx = memcache_init(talloc_autofree_context(),
-                                                  lp_max_stat_cache_size()*1024);
-        }
-        if (!smbd_memcache_ctx) {
-                smb_panic("Could not init smbd memcache");
-        }
-
-        return smbd_memcache_ctx;
+        return server_event_context();
 }
 
@@ -93 +96 @@
                              DATA_BLOB *data)
 {
+        struct tevent_context *ev_ctx =
+                talloc_get_type_abort(private_data, struct tevent_context);
+
         DEBUG(10,("smb_conf_updated: Got message saying smb.conf was "
                   "updated. Reloading.\n"));
         change_to_root_user();
-        reload_services(False);
-}
-
+        reload_services(msg, smbd_server_conn->sock, False);
+        if (am_parent) {
+                pcap_cache_reload(ev_ctx, msg,
+                                  &reload_pcap_change_notify);
+        }
+}
+
+/*******************************************************************
+ What to do when printcap is updated.
+ ********************************************************************/
+
+static void smb_pcap_updated(struct messaging_context *msg,
+                             void *private_data,
+                             uint32_t msg_type,
+                             struct server_id server_id,
+                             DATA_BLOB *data)
+{
+        struct tevent_context *ev_ctx =
+                talloc_get_type_abort(private_data, struct tevent_context);
+
+        DEBUG(10,("Got message saying pcap was updated. Reloading.\n"));
+        change_to_root_user();
+        reload_printers(ev_ctx, msg);
+}
 
 /*******************************************************************
@@ -158 +185 @@
 
         if (data->length != sizeof(sig)) {
-                
                 DEBUG(0, ("Process %s sent bogus signal injection request\n",
                           procid_str_static(&src)));
@@ -240 +266 @@
         DEBUG(1,("Cleaning up brl and lock database after unclean shutdown\n"));
         message_send_all(smbd_messaging_context(), MSG_SMB_UNLOCK, NULL, 0, NULL);
-        messaging_send_buf(smbd_messaging_context(), procid_self(), 
+        messaging_send_buf(smbd_messaging_context(), procid_self(),
                                 MSG_SMB_BRL_VALIDATE, NULL, 0);
         /* mark the cleanup as having been done */
@@ -250 +276 @@
         struct child_pid *child;
         static struct timed_event *cleanup_te;
+        struct server_id child_id;
 
         if (unclean_shutdown) {
@@ -256 +283 @@
                    pending locks
                 */
-                DEBUG(3,(__location__ " Unclean shutdown of pid %u\n", 
+                DEBUG(3,(__location__ " Unclean shutdown of pid %u\n",
                         (unsigned int)pid));
                 if (!cleanup_te) {
@@ -263 +290 @@
                         cleanup_te = event_add_timed(smbd_event_context(), NULL,
                                                 timeval_current_ofs(cleanup_time, 0),
-                                                cleanup_timeout_fn, 
+                                                cleanup_timeout_fn,
                                                 &cleanup_te);
                         DEBUG(1,("Scheduled cleanup of brl and lock database after unclean shutdown\n"));
                 }
+        }
+
+        child_id = procid_self(); /* Just initialize pid and potentially vnn */
+        child_id.pid = pid;
+
+        if (!serverid_deregister(child_id)) {
+                DEBUG(1, ("Could not remove pid %d from serverid.tdb\n",
+                          (int)pid));
         }
 
@@ -375 +410 @@
         struct sockaddr_storage addr;
         socklen_t in_addrlen = sizeof(addr);
+        int fd;
         pid_t pid = 0;
-
-        smbd_set_server_fd(accept(s->fd,(struct sockaddr *)&addr,&in_addrlen));
-
-        if (smbd_server_fd() == -1 && errno == EINTR)
+        uint64_t unique_id;
+
+        fd = accept(s->fd, (struct sockaddr *)(void *)&addr,&in_addrlen);
+        smbd_set_server_fd(fd);
+
+        if (fd == -1 && errno == EINTR)
                 return;
 
-        if (smbd_server_fd() == -1) {
+        if (fd == -1) {
                 DEBUG(0,("open_sockets_smbd: accept: %s\n",
                          strerror(errno)));
@@ -389 +427 @@
 
         if (s->parent->interactive) {
-                smbd_process();
+                smbd_process(smbd_server_conn);
                 exit_server_cleanly("end of interactive mode");
                 return;
@@ -395 +433 @@
 
         if (!allowable_number_of_smbd_processes()) {
-                close(smbd_server_fd());
+                close(fd);
                 smbd_set_server_fd(-1);
                 return;
         }
+
+        /*
+         * Generate a unique id in the parent process so that we use
+         * the global random state in the parent.
+         */
+        generate_random_buffer((uint8_t *)&unique_id, sizeof(unique_id));
 
         pid = sys_fork();
         if (pid == 0) {
                 NTSTATUS status = NT_STATUS_OK;
+
                 /* Child code ... */
                 am_parent = 0;
+
+                set_my_unique_id(unique_id);
 
                 /* Stop zombies, the parent explicitly handles
@@ -422 +469 @@
 
                 status = reinit_after_fork(smbd_messaging_context(),
-                                           smbd_event_context(), true);
+                                           smbd_event_context(), procid_self(),
+                                           true);
                 if (!NT_STATUS_IS_OK(status)) {
                         if (NT_STATUS_EQUAL(status,
@@ -430 +478 @@
                                 goto exit;
                         }
+                        if (lp_clustering() &&
+                            NT_STATUS_EQUAL(status,
+                            NT_STATUS_INTERNAL_DB_ERROR)) {
+                                DEBUG(1,("child process cannot initialize "
+                                         "because connection to CTDB "
+                                         "has failed\n"));
+                                goto exit;
+                        }
+
                         DEBUG(0,("reinit_after_fork() failed\n"));
                         smb_panic("reinit_after_fork() failed");
@@ -435 +492 @@
 
                 smbd_setup_sig_term_handler();
-                smbd_setup_sig_hup_handler();
-
-                smbd_process();
+                smbd_setup_sig_hup_handler(server_event_context(),
+                                           server_messaging_context());
+
+                if (!serverid_register(procid_self(),
+                                       FLAG_MSG_GENERAL|FLAG_MSG_SMBD
+                                       |FLAG_MSG_DBWRAP
+                                       |FLAG_MSG_PRINT_GENERAL)) {
+                        exit_server_cleanly("Could not register myself in "
+                                            "serverid.tdb");
+                }
+
+                smbd_process(smbd_server_conn);
          exit:
                 exit_server_cleanly("end of child");
                 return;
-        } else if (pid < 0) {
+        }
+
+        if (pid < 0) {
                 DEBUG(0,("smbd_accept_connection: sys_fork() failed: %s\n",
                          strerror(errno)));
@@ -447 +515 @@
 
         /* The parent doesn't need this socket */
-        close(smbd_server_fd());
+        close(fd);
 
         /* Sun May 6 18:56:14 2001 ackley@cs.unm.edu:
@@ -543 +611 @@
 }
 
-static bool parent_housekeeping_fn(const struct timeval *now, void *private_data)
-{
-        DEBUG(5, ("houskeeping\n"));
-        /* check if we need to reload services */
-        check_reload(time(NULL));
+static bool smbd_parent_housekeeping(const struct timeval *now, void *private_data)
+{
+        time_t printcap_cache_time = (time_t)lp_printcap_cache_time();
+        time_t t = time_mono(NULL);
+
+        DEBUG(5, ("parent housekeeping\n"));
+
+        /* if periodic printcap rescan is enabled, see if it's time to reload */
+        if ((printcap_cache_time != 0)
+         && (t >= (last_printer_reload_time + printcap_cache_time))) {
+                DEBUG( 3,( "Printcap cache time expired.\n"));
+                pcap_cache_reload(server_event_context(),
+                                  smbd_messaging_context(),
+                                  &reload_pcap_change_notify);
+                last_printer_reload_time = t;
+        }
+
         return true;
 }
@@ -556 +636 @@
 
 static bool open_sockets_smbd(struct smbd_parent_context *parent,
+                              struct messaging_context *msg_ctx,
                               const char *smb_ports)
 {
@@ -682 +763 @@
            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|FLAG_MSG_DBWRAP);
+
+        if (!serverid_register(procid_self(),
+                               FLAG_MSG_GENERAL|FLAG_MSG_SMBD
+                               |FLAG_MSG_DBWRAP)) {
+                DEBUG(0, ("open_sockets_smbd: Failed to register "
+                          "myself in serverid.tdb\n"));
+                return false;
+        }
 
         if (!(event_add_idle(smbd_event_context(), NULL,
                              timeval_set(SMBD_HOUSEKEEPING_INTERVAL, 0),
-                             "parent_housekeeping", parent_housekeeping_fn,
-                             parent))) {
-                DEBUG(0, ("Could not add housekeeping event\n"));
-                exit(1);
+                             "parent_housekeeping", smbd_parent_housekeeping,
+                             NULL))) {
+                DEBUG(0, ("Could not add parent_housekeeping event\n"));
+                return false;
         }
 
         /* Listen to messages */
 
-        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);
-        messaging_register(smbd_messaging_context(), NULL,
-                           MSG_DEBUG, smbd_msg_debug);
-        brl_register_msgs(smbd_messaging_context());
+        messaging_register(msg_ctx, NULL, MSG_SMB_SAM_SYNC, msg_sam_sync);
+        messaging_register(msg_ctx, NULL, MSG_SHUTDOWN, msg_exit_server);
+        messaging_register(msg_ctx, NULL, MSG_SMB_FILE_RENAME,
+                           msg_file_was_renamed);
+        messaging_register(msg_ctx, server_event_context(), MSG_SMB_CONF_UPDATED,
+                           smb_conf_updated);
+        messaging_register(msg_ctx, NULL, MSG_SMB_STAT_CACHE_DELETE,
+                           smb_stat_cache_delete);
+        messaging_register(msg_ctx, NULL, MSG_DEBUG, smbd_msg_debug);
+        messaging_register(msg_ctx, server_event_context(), MSG_PRINTER_PCAP,
+                           smb_pcap_updated);
+        brl_register_msgs(msg_ctx);
+
+        msg_idmap_register_msgs(msg_ctx);
 
 #ifdef CLUSTER_SUPPORT
@@ -716 +804 @@
 
 #ifdef DEVELOPER
-        messaging_register(smbd_messaging_context(), NULL,
-                           MSG_SMB_INJECT_FAULT, msg_inject_fault);
-#endif
-
-        if (dns_port != 0) {
+        messaging_register(msg_ctx, NULL, MSG_SMB_INJECT_FAULT,
+                           msg_inject_fault);
+#endif
+
+        if (lp_multicast_dns_register() && (dns_port != 0)) {
 #ifdef WITH_DNSSD_SUPPORT
                 smbd_setup_mdns_registration(smbd_event_context(),
@@ -747 +835 @@
                 int ret;
                 TALLOC_CTX *frame = talloc_stackframe();
+
                 ret = tevent_loop_once(smbd_event_context());
                 if (ret != 0) {
@@ -758 +847 @@
 }
 
-/***************************************************************************
- purge stale printers and reload from pre-populated pcap cache
-***************************************************************************/
-void reload_printers(void)
-{
-        int snum;
-        int n_services = lp_numservices();
-        int pnum = lp_servicenumber(PRINTERS_NAME);
-        const char *pname;
-
-        DEBUG(10, ("reloading printer services from pcap cache\n"));
-        for (snum = 0; snum < n_services; snum++) {
-                /* avoid removing PRINTERS_NAME or non-autoloaded printers */
-                if (snum == pnum || !(lp_snum_ok(snum) && lp_print_ok(snum) &&
-                                      lp_autoloaded(snum)))
-                        continue;
-
-                pname = lp_printername(snum);
-                if (!pcap_printername_ok(pname)) {
-                        DEBUG(3, ("removing stale printer %s\n", pname));
-
-                        if (is_printer_published(NULL, snum, NULL))
-                                nt_printer_publish(NULL, snum, DSPRINT_UNPUBLISH);
-                        del_a_printer(pname);
-                        lp_killservice(snum);
-                }
-        }
-
-        load_printers();
-}
-
-/****************************************************************************
- Reload the services file.
-**************************************************************************/
-
-bool reload_services(bool test)
-{
-        bool ret;
-
-        if (lp_loaded()) {
-                char *fname = lp_configfile();
-                if (file_exist(fname) &&
-                    !strcsequal(fname, get_dyn_CONFIGFILE())) {
-                        set_dyn_CONFIGFILE(fname);
-                        test = False;
-                }
-        }
-
-        reopen_logs();
-
-        if (test && !lp_file_list_changed())
-                return(True);
-
-        lp_killunused(conn_snum_used);
-
-        ret = lp_load(get_dyn_CONFIGFILE(), False, False, True, True);
-
-        pcap_cache_reload(&reload_printers);
-
-        /* perhaps the config filename is now set */
-        if (!test)
-                reload_services(True);
-
-        reopen_logs();
-
-        load_interfaces();
-
-        if (smbd_server_fd() != -1) {
-                set_socket_options(smbd_server_fd(),"SO_KEEPALIVE");
-                set_socket_options(smbd_server_fd(), lp_socket_options());
-        }
-
-        mangle_reset_cache();
-        reset_stat_cache();
-
-        /* this forces service parameters to be flushed */
-        set_current_service(NULL,0,True);
-
-        return(ret);
-}
-
-/****************************************************************************
- Exit the server.
-****************************************************************************/
-
-/* 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_;
-
-static void exit_server_common(enum server_exit_reason how,
-        const char *const reason)
-{
-        bool had_open_conn = false;
-        struct smbd_server_connection *sconn = smbd_server_conn;
-
-        if (!exit_firsttime)
-                exit(0);
-        exit_firsttime = false;
-
-        change_to_root_user();
-
-        if (sconn && sconn->smb1.negprot.auth_context) {
-                struct auth_context *a = sconn->smb1.negprot.auth_context;
-                a->free(&sconn->smb1.negprot.auth_context);
-        }
-
-        if (sconn) {
-                had_open_conn = conn_close_all(sconn);
-                invalidate_all_vuids(sconn);
-        }
-
-        /* 3 second timeout. */
-        print_notify_send_messages(smbd_messaging_context(), 3);
-
-        /* delete our entry in the connections database. */
-        yield_connection(NULL,"");
-
-#ifdef WITH_DFS
-        if (dcelogin_atmost_once) {
-                dfs_unlogin();
-        }
-#endif
-
-#ifdef USE_DMAPI
-        /* Destroy Samba DMAPI session only if we are master smbd process */
-        if (am_parent) {
-                if (!dmapi_destroy_session()) {
-                        DEBUG(0,("Unable to close Samba DMAPI session\n"));
-                }
-        }
-#endif
-
-        locking_end();
-        printing_end();
-
-        /*
-         * we need to force the order of freeing the following,
-         * because smbd_msg_ctx is not a talloc child of smbd_server_conn.
-         */
-        sconn = NULL;
-        TALLOC_FREE(smbd_server_conn);
-        TALLOC_FREE(smbd_msg_ctx);
-        TALLOC_FREE(smbd_event_ctx);
-
-        if (how != SERVER_EXIT_NORMAL) {
-                int oldlevel = DEBUGLEVEL;
-
-                DEBUGLEVEL = 10;
-
-                DEBUGSEP(0);
-                DEBUG(0,("Abnormal server exit: %s\n",
-                        reason ? reason : "no explanation provided"));
-                DEBUGSEP(0);
-
-                log_stack_trace();
-
-                DEBUGLEVEL = oldlevel;
-                dump_core();
-
-        } else {    
-                DEBUG(3,("Server exit (%s)\n",
-                        (reason ? reason : "normal exit")));
-                if (am_parent) {
-                        pidfile_unlink();
-                }
-                gencache_stabilize();
-        }
-
-        /* if we had any open SMB connections when we exited then we
-           need to tell the parent smbd so that it can trigger a retry
-           of any locks we may have been holding or open files we were
-           blocking */
-        if (had_open_conn) {
-                exit(1);
-        } else {
-                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");
-}
 
 /****************************************************************************
@@ -967 +861 @@
         if (!init_names())
                 return False;
-
-        file_init();
 
         if (!secrets_init())
@@ -1021 +913 @@
         };
         struct smbd_parent_context *parent = NULL;
-        TALLOC_CTX *frame = talloc_stackframe(); /* Setup tos. */
+        TALLOC_CTX *frame;
+        NTSTATUS status;
+        uint64_t unique_id;
+
+        /*
+         * Do this before any other talloc operation
+         */
+        talloc_enable_null_tracking();
+        frame = talloc_stackframe();
+
+        load_case_tables();
+
+        /* Initialize the event context, it will panic on error */
+        smbd_event_context();
 
         smbd_init_globals();
@@ -1066 +971 @@
         }
 
-        setup_logging(argv[0],log_stdout);
+        if (log_stdout) {
+                setup_logging(argv[0], DEBUG_STDOUT);
+        } else {
+                setup_logging(argv[0], DEBUG_FILE);
+        }
 
         if (print_build_options) {
@@ -1073 +982 @@
         }
 
-        load_case_tables();
-
 #ifdef HAVE_SETLUID
         /* needed for SecureWare on SCO */
@@ -1080 +987 @@
 #endif
 
-        sec_init();
-
         set_remote_machine_name("smbd", False);
 
@@ -1097 +1002 @@
         generate_random_buffer(NULL, 0);
 
+        /* get initial effective uid and gid */
+        sec_init();
+
         /* make absolutely sure we run as root - to handle cases where people
            are crazy enough to have it setuid */
-
         gain_root_privilege();
         gain_root_group_privilege();
@@ -1133 +1040 @@
            so set our umask to 0 */
         umask(0);
-
-        init_sec_ctx();
 
         reopen_logs();
@@ -1168 +1073 @@
         }
 
+        /* Init the security context and global current_user */
+        init_sec_ctx();
+
         if (smbd_messaging_context() == NULL)
                 exit(1);
 
-        if (!reload_services(False))
-                return(-1);     
+        /*
+         * Reloading of the printers will not work here as we don't have a
+         * server info and rpc services set up. It will be called later.
+         */
+        if (!reload_services(smbd_messaging_context(), -1, False)) {
+                exit(1);
+        }
+
+        /* ...NOTE... Log files are working from this point! */
+
+        DEBUG(3,("loaded services\n"));
 
         init_structs();
@@ -1191 +1108 @@
 #endif
 
-        DEBUG(3,( "loaded services\n"));
-
         if (!is_daemon && !is_a_socket(0)) {
                 if (!interactive)
@@ -1207 +1122 @@
         if (is_daemon && !interactive) {
                 DEBUG( 3, ( "Becoming a daemon.\n" ) );
-                become_daemon(Fork, no_process_group);
-        }
+                become_daemon(Fork, no_process_group, log_stdout);
+        }
+
+        generate_random_buffer((uint8_t *)&unique_id, sizeof(unique_id));
+        set_my_unique_id(unique_id);
 
 #if HAVE_SETPGID
@@ -1225 +1143 @@
                 pidfile_create("smbd");
 
-        if (!NT_STATUS_IS_OK(reinit_after_fork(smbd_messaging_context(),
-                             smbd_event_context(), false))) {
+        status = reinit_after_fork(smbd_messaging_context(),
+                                   smbd_event_context(),
+                                   procid_self(), false);
+        if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0,("reinit_after_fork() failed\n"));
                 exit(1);
         }
 
+        smbd_server_conn->msg_ctx = smbd_messaging_context();
+
         smbd_setup_sig_term_handler();
-        smbd_setup_sig_hup_handler();
+        smbd_setup_sig_hup_handler(smbd_event_context(),
+                                   smbd_server_conn->msg_ctx);
 
         /* Setup all the TDB's - including CLEAR_IF_FIRST tdb's. */
@@ -1253 +1176 @@
         }
 
+        if (lp_server_role() == ROLE_DOMAIN_BDC || lp_server_role() == ROLE_DOMAIN_PDC) {
+                if (!open_schannel_session_store(NULL, lp_private_dir())) {
+                        DEBUG(0,("ERROR: Samba cannot open schannel store for secured NETLOGON operations.\n"));
+                        exit(1);
+                }
+        }
+
         if(!get_global_sam_sid()) {
                 DEBUG(0,("ERROR: Samba cannot create a SAM SID.\n"));
@@ -1258 +1188 @@
         }
 
-        if (!session_init())
-                exit(1);
+        if (!sessionid_init()) {
+                exit(1);
+        }
 
         if (!connections_init(True))
@@ -1267 +1198 @@
                 exit(1);
 
-        namecache_enable();
+        if (!messaging_tdb_parent_init(smbd_event_context())) {
+                exit(1);
+        }
+
+        if (!notify_internal_parent_init(smbd_event_context())) {
+                exit(1);
+        }
+
+        if (!serverid_parent_init(smbd_event_context())) {
+                exit(1);
+        }
+
+        if (!printer_list_parent_init()) {
+                exit(1);
+        }
 
         if (!W_ERROR_IS_OK(registry_init_full()))
                 exit(1);
 
-#if 0
-        if (!init_svcctl_db())
-                exit(1);
-#endif
-
         if (!print_backend_init(smbd_messaging_context()))
                 exit(1);
-
-        if (!init_guest_info()) {
-                DEBUG(0,("ERROR: failed to setup guest info.\n"));
-                return -1;
-        }
 
         /* Open the share_info.tdb here, so we don't have to open
@@ -1294 +1229 @@
         }
 
+        status = init_system_info();
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(1, ("ERROR: failed to setup system user info: %s.\n",
+                          nt_errstr(status)));
+                return -1;
+        }
+
+        if (!init_guest_info()) {
+                DEBUG(0,("ERROR: failed to setup guest info.\n"));
+                return -1;
+        }
+
+        if (!file_init(smbd_server_conn)) {
+                DEBUG(0, ("ERROR: file_init failed\n"));
+                return -1;
+        }
+
+        if (is_daemon && !interactive) {
+                const char *rpcsrv_type;
+
+                rpcsrv_type = lp_parm_const_string(GLOBAL_SECTION_SNUM,
+                                                   "rpc_server", "epmapper",
+                                                   "none");
+                if (StrCaseCmp(rpcsrv_type, "daemon") == 0) {
+                        start_epmd(smbd_event_context(),
+                                   smbd_server_conn->msg_ctx);
+                }
+        }
+
+        if (!dcesrv_ep_setup(smbd_event_context(), smbd_server_conn->msg_ctx)) {
+                exit(1);
+        }
+
+        /* Publish nt printers, this requires a working winreg pipe */
+        pcap_cache_reload(server_event_context(), smbd_messaging_context(),
+                          &reload_printers);
+
         /* only start the background queue daemon if we are 
            running as a daemon -- bad things will happen if
@@ -1301 +1273 @@
         if (is_daemon && !interactive
             && lp_parm_bool(-1, "smbd", "backgroundqueue", true)) {
-                start_background_queue();
+                start_background_queue(smbd_event_context(),
+                                       smbd_messaging_context());
+        }
+
+        if (is_daemon && !_lp_disable_spoolss()) {
+                const char *rpcsrv_type;
+
+                /* start spoolss daemon */
+                /* start as a separate daemon only if enabled */
+                rpcsrv_type = lp_parm_const_string(GLOBAL_SECTION_SNUM,
+                                                   "rpc_server", "spoolss",
+                                                   "embedded");
+                if (StrCaseCmp(rpcsrv_type, "daemon") == 0) {
+                        start_spoolssd(smbd_event_context(),
+                                       smbd_messaging_context());
+                }
         }
 
@@ -1323 +1310 @@
                 smbd_setup_sig_chld_handler();
 
-                smbd_process();
+                smbd_process(smbd_server_conn);
 
                 exit_server_cleanly(NULL);
@@ -1335 +1322 @@
         parent->interactive = interactive;
 
-        if (!open_sockets_smbd(parent, ports))
+        if (!open_sockets_smbd(parent, smbd_messaging_context(), ports))
                 exit_server("open_sockets_smbd() failed");