source4 smbd prefork: Add backoff to process restart

[gd/samba-autobuild/.git] / source3 / param / loadparm.c

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5853c8f70c0393242959a46a2ed7ed9468c2d93b..994f9b0ce4314cd89ae2ae6e3486f079e968e15b 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -193,7 +193,7 @@ static const struct loadparm_service _sDefault =
        .map_system = false,
        .map_hidden = false,
        .map_archive = true,
-       .store_dos_attributes = false,
+       .store_dos_attributes = true,
        .dmapi_support = false,
        .locking = true,
        .strict_locking = Auto,
@@ -229,10 +229,9 @@ static const struct loadparm_service _sDefault =
        .nt_acl_support = true,
        .force_unknown_acl_user = false,
        ._use_sendfile = false,
-       .profile_acls = false,
        .map_acl_inherit = false,
        .afs_share = false,
-       .ea_support = false,
+       .ea_support = true,
        .acl_check_permissions = true,
        .acl_map_full_control = true,
        .acl_group_control = false,
@@ -240,11 +239,12 @@ static const struct loadparm_service _sDefault =
        .allocation_roundup_size = SMB_ROUNDUP_ALLOCATION_SIZE,
        .aio_read_size = 1,
        .aio_write_size = 1,
-       .map_readonly = MAP_READONLY_YES,
+       .map_readonly = MAP_READONLY_NO,
        .directory_name_cache_size = 100,
        .smb_encrypt = SMB_SIGNING_DEFAULT,
        .kernel_share_modes = true,
        .durable_handles = true,
+       .check_parent_directory_delete_on_close = false,
        .param_opt = NULL,
        .dummy = ""
 };
@@ -652,10 +652,10 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        Globals._client_ipc_min_protocol = PROTOCOL_DEFAULT;
        Globals._security = SEC_AUTO;
        Globals.encrypt_passwords = true;
-       Globals.client_schannel = Auto;
+       Globals.client_schannel = true;
        Globals.winbind_sealed_pipes = true;
        Globals.require_strong_key = true;
-       Globals.server_schannel = Auto;
+       Globals.server_schannel = true;
        Globals.read_raw = true;
        Globals.write_raw = true;
        Globals.null_passwords = false;
@@ -818,12 +818,12 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        Globals.winbind_enum_users = false;
        Globals.winbind_enum_groups = false;
        Globals.winbind_use_default_domain = false;
-       Globals.winbind_trusted_domains_only = false;
        Globals.winbind_nested_groups = true;
        Globals.winbind_expand_groups = 0;
        Globals.winbind_nss_info = str_list_make_v3_const(NULL, "template", NULL);
        Globals.winbind_refresh_tickets = false;
        Globals.winbind_offline_logon = false;
+       Globals.winbind_scan_trusted_domains = true;
 
        Globals.idmap_cache_time = 86400 * 7; /* a week by default */
        Globals.idmap_negative_cache_time = 120; /* 2 minutes by default */
@@ -832,7 +832,6 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
 
        Globals.name_cache_timeout = 660; /* In seconds */
 
-       Globals.use_spnego = true;
        Globals.client_use_spnego = true;
 
        Globals.client_signing = SMB_SIGNING_DEFAULT;
@@ -896,6 +895,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        Globals._preferred_master = Auto;
 
        Globals.allow_dns_updates = DNS_UPDATE_SIGNED;
+       Globals.dns_zone_scavenging = false;
 
        lpcfg_string_set(Globals.ctx, &Globals.ntp_signd_socket_directory,
                         get_dyn_NTP_SIGND_SOCKET_DIR());
@@ -918,13 +918,15 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        Globals.dns_update_command = str_list_make_v3_const(NULL, s, NULL);
        TALLOC_FREE(s);
 
-       s = talloc_asprintf(talloc_tos(), "%s/samba_gpoupdate", get_dyn_SCRIPTSBINDIR());
+       s = talloc_asprintf(talloc_tos(), "%s/samba-gpupdate", get_dyn_SCRIPTSBINDIR());
        if (s == NULL) {
                smb_panic("init_globals: ENOMEM");
        }
        Globals.gpo_update_command = str_list_make_v3_const(NULL, s, NULL);
        TALLOC_FREE(s);
 
+       Globals.apply_group_policies = false;
+
        s = talloc_asprintf(talloc_tos(), "%s/samba_spnupdate", get_dyn_SCRIPTSBINDIR());
        if (s == NULL) {
                smb_panic("init_globals: ENOMEM");
@@ -955,7 +957,9 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
                         "49152-65535");
        Globals.rpc_low_port = SERVER_TCP_LOW_PORT;
        Globals.rpc_high_port = SERVER_TCP_HIGH_PORT;
-       Globals.prefork_children = 1;
+       Globals.prefork_children = 4;
+       Globals.prefork_backoff_increment = 10;
+       Globals.prefork_maximum_backoff = 120;
 
        /* Now put back the settings that were set with lp_set_cmdline() */
        apply_lp_set_cmdline();
@@ -1529,6 +1533,7 @@ bool lp_add_home(const char *pszHomename, int iDefaultService,
                 const char *user, const char *pszHomedir)
 {
        int i;
+       char *global_path;
 
        if (pszHomename == NULL || user == NULL || pszHomedir == NULL ||
                        pszHomedir[0] == '\0') {
@@ -1540,12 +1545,13 @@ bool lp_add_home(const char *pszHomename, int iDefaultService,
        if (i < 0)
                return false;
 
+       global_path = lp_path(talloc_tos(), GLOBAL_SECTION_SNUM);
        if (!(*(ServicePtrs[iDefaultService]->path))
-           || strequal(ServicePtrs[iDefaultService]->path,
-                       lp_path(talloc_tos(), GLOBAL_SECTION_SNUM))) {
+           || strequal(ServicePtrs[iDefaultService]->path, global_path)) {
                lpcfg_string_set(ServicePtrs[i], &ServicePtrs[i]->path,
                                 pszHomedir);
        }
+       TALLOC_FREE(global_path);
 
        if (!(*(ServicePtrs[i]->comment))) {
                char *comment = talloc_asprintf(talloc_tos(), "Home directory of %s", user);
@@ -1832,8 +1838,8 @@ static bool is_synonym_of(int parm1, int parm2, bool *inverse)
 
 static void show_parameter(int parmIndex)
 {
-       int enumIndex, flagIndex;
-       int parmIndex2;
+       size_t enumIndex, flagIndex;
+       size_t parmIndex2;
        bool hadFlag;
        bool hadSyn;
        bool inverse;
@@ -4116,7 +4122,7 @@ bool lp_load_with_registry_shares(const char *pszFname)
                          false, /* global_only */
                          true,  /* save_defaults */
                          false, /* add_ipc */
-                         false, /* reinit_globals */
+                         true, /* reinit_globals */
                          true,  /* allow_include_registry */
                          true); /* load_all_shares*/
 }
@@ -4155,6 +4161,7 @@ void lp_dump(FILE *f, bool show_defaults, int maxtoprint)
                fprintf(f,"\n");
                lp_dump_one(f, show_defaults, iService);
        }
+       TALLOC_FREE(lp_ctx);
 }
 
 /***************************************************************************
@@ -4208,7 +4215,7 @@ int lp_servicenumber(const char *pszServiceName)
 
                if (!usershare_exists(iService, &last_mod)) {
                        /* Remove the share security tdb entry for it. */
-                       delete_share_security(lp_servicename(talloc_tos(), iService));
+                       delete_share_security(lp_const_servicename(iService));
                        /* Remove it from the array. */
                        free_service_byindex(iService);
                        /* Doesn't exist anymore. */
@@ -4525,10 +4532,10 @@ void widelinks_warning(int snum)
        }
 
        if (lp_unix_extensions() && lp_wide_links(snum)) {
-               DEBUG(0,("Share '%s' has wide links and unix extensions enabled. "
+               DBG_ERR("Share '%s' has wide links and unix extensions enabled. "
                        "These parameters are incompatible. "
                        "Wide links will be disabled for this share.\n",
-                        lp_servicename(talloc_tos(), snum) ));
+                        lp_const_servicename(snum));
        }
 }