Changeset 740 for vendor/current/source4/smbd/server.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/smbd/server.c (modified) (18 diffs)

vendor/current/source4/smbd/server.c

@@ -32 +32 @@
 #include "ntptr/ntptr.h"
 #include "auth/gensec/gensec.h"
+#include "libcli/auth/schannel.h"
 #include "smbd/process_model.h"
 #include "param/secrets.h"
@@ -41 +42 @@
 #include "librpc/gen_ndr/ndr_irpc.h"
 #include "cluster/cluster.h"
+#include "dynconfig/dynconfig.h"
 
 /*
@@ -116 +118 @@
 #endif
         DEBUG(0,("Exiting pid %d on SIGTERM\n", (int)getpid()));
-        exit(0);
+        exit(127);
 }
 
@@ -141 +143 @@
 
         /* POSIX demands that signals are inherited. If the invoking process has
-         * these signals masked, we will have problems, as we won't recieve them. */
+         * these signals masked, we will have problems, as we won't receive them. */
         BlockSignals(false, SIGHUP);
         BlockSignals(false, SIGTERM);
@@ -177 +179 @@
 {
         const char *binary_name = (const char *)private_data;
-        DEBUG(0,("%s: maximum runtime exceeded - terminating\n", binary_name));
+        struct timeval tv;
+        struct timezone tz;
+        if (gettimeofday(&tv, &tz) == 0) {
+                DEBUG(0,("%s: maximum runtime exceeded - terminating, current ts: %d\n", binary_name, (int)tv.tv_sec));
+        } else {
+                DEBUG(0,("%s: maximum runtime exceeded - terminating\n", binary_name));
+        }
         exit(0);
 }
 
 /*
-  pre-open the sam ldb to ensure the schema has been loaded. This
-  saves a lot of time in child processes  
+  pre-open the key databases. This saves a lot of time in child
+  processes
  */
-static void prime_samdb_schema(struct tevent_context *event_ctx)
-{
-        TALLOC_CTX *samdb_context;
-        samdb_context = talloc_new(event_ctx);
-        samdb_connect(samdb_context, event_ctx, cmdline_lp_ctx, system_session(samdb_context, cmdline_lp_ctx));
-        talloc_free(samdb_context);
+static void prime_ldb_databases(struct tevent_context *event_ctx)
+{
+        TALLOC_CTX *db_context;
+        db_context = talloc_new(event_ctx);
+
+        samdb_connect(db_context, event_ctx, cmdline_lp_ctx, system_session(cmdline_lp_ctx), 0);
+        privilege_connect(db_context, cmdline_lp_ctx);
+
+        /* we deliberately leave these open, which allows them to be
+         * re-used in ldb_wrap_connect() */
 }
 
@@ -214 +226 @@
 
         msg = messaging_init(talloc_autofree_context(), 
-                             lp_messaging_path(event_ctx, lp_ctx),
-                             cluster_id(0, SAMBA_PARENT_TASKID),
-                             lp_iconv_convenience(lp_ctx),
-                             event_ctx);
+                             lpcfg_messaging_path(event_ctx, lp_ctx),
+                             cluster_id(0, SAMBA_PARENT_TASKID), event_ctx);
         NT_STATUS_HAVE_NO_MEMORY(msg);
 
@@ -229 +239 @@
 
 
+/*
+  show build info
+ */
+static void show_build(void)
+{
+#define CONFIG_OPTION(n) { #n, dyn_ ## n }
+        struct {
+                const char *name;
+                const char *value;
+        } config_options[] = {
+                CONFIG_OPTION(BINDIR),
+                CONFIG_OPTION(SBINDIR),
+                CONFIG_OPTION(CONFIGFILE),
+                CONFIG_OPTION(NCALRPCDIR),
+                CONFIG_OPTION(LOGFILEBASE),
+                CONFIG_OPTION(LMHOSTSFILE),
+                CONFIG_OPTION(DATADIR),
+                CONFIG_OPTION(MODULESDIR),
+                CONFIG_OPTION(LOCKDIR),
+                CONFIG_OPTION(PIDDIR),
+                CONFIG_OPTION(PRIVATE_DIR),
+                CONFIG_OPTION(SWATDIR),
+                CONFIG_OPTION(CODEPAGEDIR),
+                CONFIG_OPTION(SETUPDIR),
+                CONFIG_OPTION(WINBINDD_SOCKET_DIR),
+                CONFIG_OPTION(WINBINDD_PRIVILEGED_SOCKET_DIR),
+                CONFIG_OPTION(NTP_SIGND_SOCKET_DIR),
+                { NULL, NULL}
+        };
+        int i;
+
+        printf("Samba version: %s\n", SAMBA_VERSION_STRING);
+        printf("Build environment:\n");
+#ifdef BUILD_SYSTEM
+        printf("   Build host:  %s\n", BUILD_SYSTEM);
+#endif
+
+        printf("Paths:\n");
+        for (i=0; config_options[i].name; i++) {
+                printf("   %s: %s\n", config_options[i].name, config_options[i].value);
+        }
+
+        exit(0);
+}
 
 /*
@@ -239 +293 @@
         int opt;
         poptContext pc;
-        extern NTSTATUS server_service_wrepl_init(void);
-        extern NTSTATUS server_service_kdc_init(void);
-        extern NTSTATUS server_service_ldap_init(void);
-        extern NTSTATUS server_service_web_init(void);
-        extern NTSTATUS server_service_ldap_init(void);
-        extern NTSTATUS server_service_winbind_init(void);
-        extern NTSTATUS server_service_nbtd_init(void);
-        extern NTSTATUS server_service_auth_init(void);
-        extern NTSTATUS server_service_cldapd_init(void);
-        extern NTSTATUS server_service_smb_init(void);
-        extern NTSTATUS server_service_drepl_init(void);
-        extern NTSTATUS server_service_kcc_init(void);
-        extern NTSTATUS server_service_rpc_init(void);
-        extern NTSTATUS server_service_ntp_signd_init(void);
-        extern NTSTATUS server_service_samba3_smb_init(void);
+#define _MODULE_PROTO(init) extern NTSTATUS init(void);
+        STATIC_service_MODULES_PROTO;
         init_module_fn static_init[] = { STATIC_service_MODULES };
         init_module_fn *shared_init;
@@ -264 +305 @@
                 OPT_DAEMON = 1000,
                 OPT_INTERACTIVE,
-                OPT_PROCESS_MODEL
+                OPT_PROCESS_MODEL,
+                OPT_SHOW_BUILD
         };
         struct poptOption long_options[] = {
@@ -276 +318 @@
                 {"maximum-runtime",0, POPT_ARG_INT, &max_runtime, 0, 
                  "set maximum runtime of the server process, till autotermination", "seconds"},
+                {"show-build", 'b', POPT_ARG_NONE, NULL, OPT_SHOW_BUILD, "show build info", NULL },
                 POPT_COMMON_SAMBA
                 POPT_COMMON_VERSION
@@ -293 +336 @@
                         model = poptGetOptArg(pc);
                         break;
+                case OPT_SHOW_BUILD:
+                        show_build();
+                        break;
                 default:
                         fprintf(stderr, "\nInvalid option %s: %s\n\n",
                                   poptBadOption(pc, 0), poptStrerror(opt));
                         poptPrintUsage(pc, stderr, 0);
-                        exit(1);
+                        return 1;
                 }
         }
@@ -305 +351 @@
                           "Option -i|--interactive is not allowed together with -D|--daemon\n\n");
                 poptPrintUsage(pc, stderr, 0);
-                exit(1);
+                return 1;
         } else if (!opt_interactive) {
                 /* default is --daemon */
@@ -321 +367 @@
 
         DEBUG(0,("%s version %s started.\n", binary_name, SAMBA_VERSION_STRING));
-        DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team 1992-2009\n"));
+        DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team 1992-2011\n"));
 
         if (sizeof(uint16_t) < 2 || sizeof(uint32_t) < 4 || sizeof(uint64_t) < 8) {
@@ -327 +373 @@
                 DEBUGADD(0,("sizeof(uint16_t) = %u, sizeof(uint32_t) %u, sizeof(uint64_t) = %u\n",
                             (unsigned int)sizeof(uint16_t), (unsigned int)sizeof(uint32_t), (unsigned int)sizeof(uint64_t)));
-                exit(1);
+                return 1;
         }
 
         if (opt_daemon) {
                 DEBUG(3,("Becoming a daemon.\n"));
-                become_daemon(true, false);
+                become_daemon(true, false, false);
         }
 
         cleanup_tmp_files(cmdline_lp_ctx);
 
-        if (!directory_exist(lp_lockdir(cmdline_lp_ctx))) {
-                mkdir(lp_lockdir(cmdline_lp_ctx), 0755);
-        }
-
-        pidfile_create(lp_piddir(cmdline_lp_ctx), binary_name);
+        if (!directory_exist(lpcfg_lockdir(cmdline_lp_ctx))) {
+                mkdir(lpcfg_lockdir(cmdline_lp_ctx), 0755);
+        }
+
+        pidfile_create(lpcfg_piddir(cmdline_lp_ctx), binary_name);
 
         /* Do *not* remove this, until you have removed
@@ -347 +393 @@
         /* Setup the SECRETS subsystem */
         if (secrets_init(talloc_autofree_context(), cmdline_lp_ctx) == NULL) {
-                exit(1);
+                return 1;
+        }
+
+        if (lpcfg_server_role(cmdline_lp_ctx) == ROLE_DOMAIN_CONTROLLER) {
+                if (!open_schannel_session_store(talloc_autofree_context(), lpcfg_private_dir(cmdline_lp_ctx))) {
+                        DEBUG(0,("ERROR: Samba cannot open schannel store for secured NETLOGON operations.\n"));
+                        exit(1);
+                }
         }
 
@@ -393 +446 @@
 
         if (max_runtime) {
+                struct timeval tv;
+                struct timezone tz;
+
+                if (gettimeofday(&tv, &tz) == 0) {
+                        DEBUG(0,("Called with maxruntime %d - current ts %d\n", max_runtime, (int)tv.tv_sec));
+                } else {
+                        DEBUG(0,("Called with maxruntime %d\n", max_runtime));
+                }
                 tevent_add_timer(event_ctx, event_ctx,
                                  timeval_current_ofs(max_runtime, 0),
@@ -399 +460 @@
         }
 
-        prime_samdb_schema(event_ctx);
+        prime_ldb_databases(event_ctx);
 
         status = setup_parent_messaging(event_ctx, cmdline_lp_ctx);
@@ -410 +471 @@
 
         status = server_service_startup(event_ctx, cmdline_lp_ctx, model, 
-                                        lp_server_services(cmdline_lp_ctx));
+                                        lpcfg_server_services(cmdline_lp_ctx));
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0,("Starting Services failed - %s\n", nt_errstr(status)));