add systemd integration

[sfrench/samba-autobuild/.git] / source4 / smbd / server.c

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 21560f981f801ec864179c8bdb568da9d82d1877..9051b485317cd0ec3dbad1ba3eb6788026006b66 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -34,7 +34,7 @@
 #include "libcli/auth/schannel.h"
 #include "smbd/process_model.h"
 #include "param/secrets.h"
-#include "smbd/pidfile.h"
+#include "lib/util/pidfile.h"
 #include "param/param.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/session.h"
@@ -43,6 +43,7 @@
 #include "cluster/cluster.h"
 #include "dynconfig/dynconfig.h"
 #include "lib/util/samba_modules.h"
+#include "nsswitch/winbind_client.h"
 
 /*
   recursively delete a directory tree
@@ -225,7 +226,10 @@ static NTSTATUS setup_parent_messaging(struct tevent_context *event_ctx,
                              cluster_id(0, SAMBA_PARENT_TASKID), event_ctx, false);
        NT_STATUS_HAVE_NO_MEMORY(msg);
 
-       irpc_add_name(msg, "samba");
+       status = irpc_add_name(msg, "samba");
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
        status = IRPC_REGISTER(msg, irpc, SAMBA_TERMINATE,
                               samba_terminate, NULL);
@@ -257,7 +261,6 @@ static void show_build(void)
                CONFIG_OPTION(CACHEDIR),
                CONFIG_OPTION(PIDDIR),
                CONFIG_OPTION(PRIVATE_DIR),
-               CONFIG_OPTION(SWATDIR),
                CONFIG_OPTION(CODEPAGEDIR),
                CONFIG_OPTION(SETUPDIR),
                CONFIG_OPTION(WINBINDD_SOCKET_DIR),
@@ -299,6 +302,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,
@@ -364,7 +368,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-2012\n"));
+       DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team 1992-2014\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"));
@@ -380,11 +384,11 @@ 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);
+       pidfile_create(lpcfg_pid_directory(cmdline_lp_ctx), binary_name);
 
        /* Set up a database to hold a random seed, in case we don't
         * have /dev/urandom */
@@ -399,6 +403,12 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
                }
        }
 
+       /* make sure we won't go through nss_winbind */
+       if (!winbind_off()) {
+               DEBUG(0,("Failed to disable recusive winbindd calls.  Exiting.\n"));
+               exit(1);
+       }
+
        gensec_init(); /* FIXME: */
 
        ntptr_init();   /* FIXME: maybe run this in the initialization function 
@@ -437,9 +447,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(1);
+       }
+
+       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",
@@ -450,6 +470,17 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
                                 discard_const(binary_name));
        }
 
+       if (lpcfg_server_role(cmdline_lp_ctx) != ROLE_ACTIVE_DIRECTORY_DC
+           && !lpcfg_parm_bool(cmdline_lp_ctx, NULL, "server role check", "inhibit", false)
+           && !str_list_check_ci(lpcfg_server_services(cmdline_lp_ctx), "smb") 
+           && !str_list_check_ci(lpcfg_dcerpc_endpoint_servers(cmdline_lp_ctx), "remote")
+           && !str_list_check_ci(lpcfg_dcerpc_endpoint_servers(cmdline_lp_ctx), "mapiproxy")) {
+               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);
+       };
+
        prime_ldb_databases(event_ctx);
 
        status = setup_parent_messaging(event_ctx, cmdline_lp_ctx);
@@ -467,6 +498,10 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
                return 1;
        }
 
+       if (opt_daemon) {
+               daemon_ready("samba");
+       }
+
        /* wait for events - this is where smbd sits for most of its
           life */
        tevent_loop_wait(event_ctx);