Avoid including libds/common/roles.h in public loadparm.h header.

[obnox/samba/samba-obnox.git] / source4 / smbd / server.c

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 5fb252e93d2df97e81ad734b0fedece78fe30f32..bd70ac658ad480896ed8df8f9f0f1dabf2a44e1d 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -43,6 +43,8 @@
 #include "cluster/cluster.h"
 #include "dynconfig/dynconfig.h"
 #include "lib/util/samba_modules.h"
+#include "nsswitch/winbind_client.h"
+#include "libds/common/roles.h"
 
 /*
   recursively delete a directory tree
@@ -301,6 +303,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
        NTSTATUS status;
        const char *model = "standard";
        int max_runtime = 0;
+       struct stat st;
        enum {
                OPT_DAEMON = 1000,
                OPT_INTERACTIVE,
@@ -358,6 +361,8 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 
        poptFreeContext(pc);
 
+       talloc_enable_null_tracking();
+
        setup_logging(binary_name, opt_interactive?DEBUG_STDOUT:DEBUG_FILE);
        setup_signals();
 
@@ -366,7 +371,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
        umask(0);
 
        DEBUG(0,("%s version %s started.\n", binary_name, SAMBA_VERSION_STRING));
-       DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team 1992-2013\n"));
+       DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team 1992-2016\n"));
 
        if (sizeof(uint16_t) < 2 || sizeof(uint32_t) < 4 || sizeof(uint64_t) < 8) {
                DEBUG(0,("ERROR: Samba is not configured correctly for the word size on your machine\n"));
@@ -382,25 +387,23 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 
        cleanup_tmp_files(cmdline_lp_ctx);
 
-       if (!directory_exist(lpcfg_lockdir(cmdline_lp_ctx))) {
-               mkdir(lpcfg_lockdir(cmdline_lp_ctx), 0755);
+       if (!directory_exist(lpcfg_lock_directory(cmdline_lp_ctx))) {
+               mkdir(lpcfg_lock_directory(cmdline_lp_ctx), 0755);
        }
 
-       pidfile_create(lpcfg_piddir(cmdline_lp_ctx), binary_name);
-
-       /* Set up a database to hold a random seed, in case we don't
-        * have /dev/urandom */
-       if (!randseed_init(talloc_autofree_context(), cmdline_lp_ctx)) {
-               return 1;
-       }
+       pidfile_create(lpcfg_pid_directory(cmdline_lp_ctx), binary_name);
 
        if (lpcfg_server_role(cmdline_lp_ctx) == ROLE_ACTIVE_DIRECTORY_DC) {
                if (!open_schannel_session_store(talloc_autofree_context(), cmdline_lp_ctx)) {
-                       DEBUG(0,("ERROR: Samba cannot open schannel store for secured NETLOGON operations.\n"));
-                       exit(1);
+                       exit_daemon("Samba cannot open schannel store for secured NETLOGON operations.", EACCES);
                }
        }
 
+       /* make sure we won't go through nss_winbind */
+       if (!winbind_off()) {
+               exit_daemon("Samba failed to disable recusive winbindd calls.", EACCES);
+       }
+
        gensec_init(); /* FIXME: */
 
        ntptr_init();   /* FIXME: maybe run this in the initialization function 
@@ -423,8 +426,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
        event_ctx = s4_event_context_init(talloc_autofree_context());
 
        if (event_ctx == NULL) {
-               DEBUG(0,("Initializing event context failed\n"));
-               return 1;
+               exit_daemon("Initializing event context failed", EACCES);
        }
 
        if (opt_interactive) {
@@ -439,9 +441,19 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 #ifdef SIGTTIN
        signal(SIGTTIN, SIG_IGN);
 #endif
-       tevent_add_fd(event_ctx, event_ctx, 0, stdin_event_flags,
-                     server_stdin_handler,
-                     discard_const(binary_name));
+
+       if (fstat(0, &st) != 0) {
+               exit_daemon("Samba failed to set standard input handler", ENOTTY);
+       }
+
+       if (S_ISFIFO(st.st_mode) || S_ISSOCK(st.st_mode)) {
+               tevent_add_fd(event_ctx,
+                               event_ctx,
+                               0,
+                               stdin_event_flags,
+                               server_stdin_handler,
+                               discard_const(binary_name));
+       }
 
        if (max_runtime) {
                DEBUG(0,("Called with maxruntime %d - current ts %llu\n",
@@ -460,15 +472,14 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
                DEBUG(0, ("At this time the 'samba' binary should only be used for either:\n"));
                DEBUGADD(0, ("'server role = active directory domain controller' or to access the ntvfs file server with 'server services = +smb' or the rpc proxy with 'dcerpc endpoint servers = remote'\n"));
                DEBUGADD(0, ("You should start smbd/nmbd/winbindd instead for domain member and standalone file server tasks\n"));
-               exit(1);
+               exit_daemon("Samba detected misconfigured 'server role' and exited. Check logs for details", EINVAL);
        };
 
        prime_ldb_databases(event_ctx);
 
        status = setup_parent_messaging(event_ctx, cmdline_lp_ctx);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("Failed to setup parent messaging - %s\n", nt_errstr(status)));
-               return 1;
+               exit_daemon("Samba failed to setup parent messaging", NT_STATUS_V(status));
        }
 
        DEBUG(0,("%s: using '%s' process model\n", binary_name, model));
@@ -476,8 +487,11 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
        status = server_service_startup(event_ctx, cmdline_lp_ctx, model, 
                                        lpcfg_server_services(cmdline_lp_ctx));
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("Starting Services failed - %s\n", nt_errstr(status)));
-               return 1;
+               exit_daemon("Samba failed to start services", NT_STATUS_V(status));
+       }
+
+       if (opt_daemon) {
+               daemon_ready("samba");
        }
 
        /* wait for events - this is where smbd sits for most of its