Changeset 745 for trunk/server/source3/param

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/param/loadparm.c (modified) (161 diffs)
• source3/param/loadparm_server_role.c (copied) (copied from vendor/current/source3/param/loadparm_server_role.c )
• source3/param/test_lp_load.c (modified) (4 diffs)

trunk/server/source3/param/loadparm.c

@@ -11 +11 @@
    Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2003
    Copyright (C) Michael Adam 2008
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -53 +53 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "util_tdb.h"
 #include "printing.h"
+#include "lib/smbconf/smbconf.h"
+#include "lib/smbconf/smbconf_init.h"
+
+#include "ads.h"
+#include "../librpc/gen_ndr/svcctl.h"
+#include "intl.h"
+#include "smb_signing.h"
+#include "dbwrap.h"
+#include "smbldap.h"
 
 #ifdef HAVE_SYS_SYSCTL_H
@@ -89 +100 @@
 static bool in_client = False;          /* Not in the client by default */
 static struct smbconf_csn conf_last_csn;
+
 #ifdef __OS2__
 static bool newLockDir = False;
@@ -112 +124 @@
         char *value;
         char **list;
+        unsigned flags;
 };
 
@@ -185 +198 @@
         char *szAbortShutdownScript;
         char *szUsernameMapScript;
+        int iUsernameMapCacheTime;
         char *szCheckPasswordScript;
         char *szWINSHook;
@@ -208 +222 @@
         bool bWinbindRpcOnly;
         bool bCreateKrb5Conf;
+        int winbindMaxDomainConnections;
         char *szIdmapBackend;
-        char *szIdmapAllocBackend;
+        bool bIdmapReadOnly;
         char *szAddShareCommand;
         char *szChangeShareCommand;
@@ -255 +270 @@
         int winbind_cache_time;
         int winbind_reconnect_delay;
-        int winbind_max_idle_children;
+        int winbind_max_clients;
         char **szWinbindNssInfo;
         int iLockSpinTime;
@@ -278 +293 @@
         bool clustering;
         int ctdb_timeout;
+        int ctdb_locktime_warn_threshold;
         int ldap_passwd_sync;
         int ldap_replication_sleep;
@@ -330 +346 @@
         bool bClientUseSpnego;
         bool client_use_spnego_principal;
+        bool send_spnego_principal;
         bool bDebugPrefixTimestamp;
         bool bDebugHiresTimestamp;
@@ -358 +375 @@
         int iIdmapNegativeCacheTime;
         bool bResetOnZeroVC;
+        bool bLogWriteableFilesOnExit;
         int iKeepalive;
         int iminreceivefile;
@@ -364 +382 @@
         char *szSMBPerfcountModule;
         bool bMapUntrustedToDomain;
+        bool bAsyncSMBEchoHandler;
+        bool bMulticastDnsRegister;
+        int ismb2_max_read;
+        int ismb2_max_write;
+        int ismb2_max_trans;
+        int ismb2_max_credits;
+        char *ncalrpc_dir;
 };
 
@@ -455 +480 @@
         bool bGuest_ok;
         bool bPrint_ok;
+        bool bPrintNotifyBackchannel;
         bool bMap_system;
         bool bMap_hidden;
@@ -599 +625 @@
         False,                  /* bGuest_ok */
         False,                  /* bPrint_ok */
+        True,                   /* bPrintNotifyBackchannel */
         False,                  /* bMap_system */
         False,                  /* bMap_hidden */
@@ -670 +697 @@
 static bool bInGlobalSection = True;
 static bool bGlobalOnly = False;
-static int server_role;
 static int default_server_announce;
 
@@ -679 +705 @@
 static bool handle_copy( int snum, const char *pszParmValue, char **ptr);
 static bool handle_netbios_name( int snum, const char *pszParmValue, char **ptr);
+static bool handle_idmap_backend(int snum, const char *pszParmValue, char **ptr);
 static bool handle_idmap_uid( int snum, const char *pszParmValue, char **ptr);
 static bool handle_idmap_gid( int snum, const char *pszParmValue, char **ptr);
@@ -686 +713 @@
 static bool handle_netbios_scope( int snum, const char *pszParmValue, char **ptr );
 static bool handle_charset( int snum, const char *pszParmValue, char **ptr );
+static bool handle_dos_charset( int snum, const char *pszParmValue, char **ptr );
 static bool handle_printing( int snum, const char *pszParmValue, char **ptr);
 static bool handle_ldap_debug_level( int snum, const char *pszParmValue, char **ptr);
 
-static void set_server_role(void);
 static void set_default_server_announce_type(void);
 static void set_allowed_client_auth(void);
@@ -696 +723 @@
 
 static void add_to_file_list(const char *fname, const char *subfname);
+static bool lp_set_cmdline_helper(const char *pszParmName, const char *pszParmValue, bool store_values);
 
 static const struct enum_list enum_protocol[] = {
@@ -731 +759 @@
         {PRINT_LPRNT, "nt"},
         {PRINT_LPROS2, "os2"},
-#ifdef DEVELOPER
+#if defined(DEVELOPER) || defined(ENABLE_BUILD_FARM_HACKS)
         {PRINT_TEST, "test"},
         {PRINT_VLP, "vlp"},
@@ -821 +849 @@
         {-1, NULL}
 };
-
-/* Client-side offline caching policy types */
-#define CSC_POLICY_MANUAL 0
-#define CSC_POLICY_DOCUMENTS 1
-#define CSC_POLICY_PROGRAMS 2
-#define CSC_POLICY_DISABLE 3
 
 static const struct enum_list enum_csc_policy[] = {
@@ -939 +961 @@
                 .p_class        = P_GLOBAL,
                 .ptr            = &Globals.dos_charset,
-                .special        = handle_charset,
+                .special        = handle_dos_charset,
                 .enum_list      = NULL,
                 .flags          = FLAG_ADVANCED
@@ -1102 +1124 @@
         },
         {
-                .label          = "update encrypted",
-                .type           = P_BOOL,
-                .p_class        = P_GLOBAL,
-                .ptr            = &Globals.bUpdateEncrypt,
-                .special        = NULL,
-                .enum_list      = NULL,
-                .flags          = FLAG_ADVANCED,
-        },
-        {
                 .label          = "client schannel",
                 .type           = P_ENUM,
@@ -1153 +1166 @@
                 .special        = NULL,
                 .enum_list      = NULL,
-                .flags          = FLAG_ADVANCED,
+                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
         },
         {
@@ -1252 +1265 @@
                 .special        = NULL,
                 .enum_list      = NULL,
-                .flags          = FLAG_ADVANCED,
+                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
         },
 
@@ -1325 +1338 @@
                 .special        = NULL,
                 .enum_list      = NULL,
-                .flags          = FLAG_ADVANCED,
+                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
         },
         {
@@ -1409 +1422 @@
         },
         {
+                .label          = "send spnego principal",
+                .type           = P_BOOL,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.send_spnego_principal,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED,
+        },
+        {
                 .label          = "username",
                 .type           = P_STRING,
@@ -1415 +1437 @@
                 .special        = NULL,
                 .enum_list      = NULL,
-                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
+                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE | FLAG_DEPRECATED,
         },
         {
@@ -2092 +2114 @@
         },
         {
+                .label          = "log writeable files on exit",
+                .type           = P_BOOL,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.bLogWriteableFilesOnExit,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED,
+        },
+        {
                 .label          = "acl compatibility",
                 .type           = P_ENUM,
@@ -2269 +2300 @@
                 .special        = NULL,
                 .enum_list      = NULL,
-                .flags          = FLAG_ADVANCED,
+                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
         },
         {
@@ -2580 +2611 @@
                 .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
         },
+        {
+                .label          = "ctdb locktime warn threshold",
+                .type           = P_INTEGER,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.ctdb_locktime_warn_threshold,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
+        },
+        {
+                .label          = "smb2 max read",
+                .type           = P_INTEGER,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.ismb2_max_read,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED,
+        },
+        {
+                .label          = "smb2 max write",
+                .type           = P_INTEGER,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.ismb2_max_write,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED,
+        },
+        {
+                .label          = "smb2 max trans",
+                .type           = P_INTEGER,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.ismb2_max_trans,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED,
+        },
+        {
+                .label          = "smb2 max credits",
+                .type           = P_INTEGER,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.ismb2_max_credits,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED,
+        },
 
         {N_("Printing Options"), P_SEP, P_SEPARATOR},
@@ -2645 +2721 @@
                 .enum_list      = NULL,
                 .flags          = FLAG_ADVANCED | FLAG_PRINT,
+        },
+        {
+                .label          = "print notify backchannel",
+                .type           = P_BOOL,
+                .p_class        = P_LOCAL,
+                .ptr            = &sDefault.bPrintNotifyBackchannel,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED,
         },
         {
@@ -3254 +3339 @@
         },
         {
+                .label          = "username map cache time",
+                .type           = P_INTEGER,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.iUsernameMapCacheTime,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED,
+        },
+        {
                 .label          = "logon script",
                 .type           = P_STRING,
@@ -4057 +4151 @@
                 .special        = NULL,
                 .enum_list      = NULL,
-                .flags          = FLAG_ADVANCED,
+                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
         },
         {
@@ -4357 +4451 @@
         },
         {
+                .label          = "async smb echo handler",
+                .type           = P_BOOL,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.bAsyncSMBEchoHandler,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
+        },
+        {
+                .label          = "multicast dns register",
+                .type           = P_BOOL,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.bMulticastDnsRegister,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
+        },
+        {
                 .label          = "panic action",
                 .type           = P_STRING,
@@ -4443 +4555 @@
                 .p_class        = P_GLOBAL,
                 .ptr            = &Globals.szIdmapBackend,
-                .special        = NULL,
-                .enum_list      = NULL,
-                .flags          = FLAG_ADVANCED,
-        },
-        {
-                .label          = "idmap alloc backend",
-                .type           = P_STRING,
-                .p_class        = P_GLOBAL,
-                .ptr            = &Globals.szIdmapAllocBackend,
-                .special        = NULL,
-                .enum_list      = NULL,
-                .flags          = FLAG_ADVANCED,
+                .special        = handle_idmap_backend,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
         },
         {
@@ -4481 +4584 @@
                 .special        = handle_idmap_uid,
                 .enum_list      = NULL,
-                .flags          = FLAG_ADVANCED,
+                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
         },
         {
@@ -4499 +4602 @@
                 .special        = handle_idmap_gid,
                 .enum_list      = NULL,
-                .flags          = FLAG_ADVANCED,
+                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
         },
         {
@@ -4556 +4659 @@
         },
         {
+                .label          = "winbind max clients",
+                .type           = P_INTEGER,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.winbind_max_clients,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED,
+        },
+        {
                 .label          = "winbind enum users",
                 .type           = P_BOOL,
@@ -4659 +4771 @@
                 .p_class        = P_GLOBAL,
                 .ptr            = &Globals.bCreateKrb5Conf,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED,
+        },
+        {
+                .label          = "ncalrpc dir",
+                .type           = P_STRING,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.ncalrpc_dir,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED,
+        },
+        {
+                .label          = "winbind max domain connections",
+                .type           = P_INTEGER,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.winbindMaxDomainConnections,
                 .special        = NULL,
                 .enum_list      = NULL,
@@ -4746 +4876 @@
                         break;
 
-#ifdef DEVELOPER
+#if defined(DEVELOPER) || defined(ENABLE_BUILD_FARM_HACKS)
+
         case PRINT_TEST:
-        case PRINT_VLP:
-                string_set(&pService->szPrintcommand, "vlp print %p %s");
-                string_set(&pService->szLpqcommand, "vlp lpq %p");
-                string_set(&pService->szLprmcommand, "vlp lprm %p %j");
-                string_set(&pService->szLppausecommand, "vlp lppause %p %j");
-                string_set(&pService->szLpresumecommand, "vlp lpresume %p %j");
-                string_set(&pService->szQueuepausecommand, "vlp queuepause %p");
-                string_set(&pService->szQueueresumecommand, "vlp queueresume %p");
+        case PRINT_VLP: {
+                const char *tdbfile;
+                char *tmp;
+
+                tdbfile = talloc_asprintf(
+                        talloc_tos(), "tdbfile=%s",
+                        lp_parm_const_string(-1, "vlp", "tdbfile",
+                                             "/tmp/vlp.tdb"));
+                if (tdbfile == NULL) {
+                        tdbfile="tdbfile=/tmp/vlp.tdb";
+                }
+
+                tmp = talloc_asprintf(talloc_tos(), "vlp %s print %%p %%s",
+                                      tdbfile);
+                string_set(&pService->szPrintcommand,
+                           tmp ? tmp : "vlp print %p %s");
+                TALLOC_FREE(tmp);
+
+                tmp = talloc_asprintf(talloc_tos(), "vlp %s lpq %%p",
+                                      tdbfile);
+                string_set(&pService->szLpqcommand,
+                           tmp ? tmp : "vlp lpq %p");
+                TALLOC_FREE(tmp);
+
+                tmp = talloc_asprintf(talloc_tos(), "vlp %s lprm %%p %%j",
+                                      tdbfile);
+                string_set(&pService->szLprmcommand,
+                           tmp ? tmp : "vlp lprm %p %j");
+                TALLOC_FREE(tmp);
+
+                tmp = talloc_asprintf(talloc_tos(), "vlp %s lppause %%p %%j",
+                                      tdbfile);
+                string_set(&pService->szLppausecommand,
+                           tmp ? tmp : "vlp lppause %p %j");
+                TALLOC_FREE(tmp);
+
+                tmp = talloc_asprintf(talloc_tos(), "vlp %s lpresume %%p %%j",
+                                      tdbfile);
+                string_set(&pService->szLpresumecommand,
+                           tmp ? tmp : "vlp lpresume %p %j");
+                TALLOC_FREE(tmp);
+
+                tmp = talloc_asprintf(talloc_tos(), "vlp %s queuepause %%p",
+                                      tdbfile);
+                string_set(&pService->szQueuepausecommand,
+                           tmp ? tmp : "vlp queuepause %p");
+                TALLOC_FREE(tmp);
+
+                tmp = talloc_asprintf(talloc_tos(), "vlp %s queueresume %%p",
+                                      tdbfile);
+                string_set(&pService->szQueueresumecommand,
+                           tmp ? tmp : "vlp queueresume %p");
+                TALLOC_FREE(tmp);
+
                 break;
+        }
 #endif /* DEVELOPER */
 
@@ -4792 +4970 @@
                 if(rl.rlim_cur == RLIM_INFINITY)
                         rlimit_max = MAX_OPEN_FILES;
-        }
 #endif
+        }
 #endif
 
@@ -4905 +5083 @@
 }
 
+static int map_parameter(const char *pszParmName);
+
+struct lp_stored_option {
+        struct lp_stored_option *prev, *next;
+        const char *label;
+        const char *value;
+};
+
+static struct lp_stored_option *stored_options;
+
+/*
+  save options set by lp_set_cmdline() into a list. This list is
+  re-applied when we do a globals reset, so that cmdline set options
+  are sticky across reloads of smb.conf
+ */
+static bool store_lp_set_cmdline(const char *pszParmName, const char *pszParmValue)
+{
+        struct lp_stored_option *entry, *entry_next;
+        for (entry = stored_options; entry != NULL; entry = entry_next) {
+                entry_next = entry->next;
+                if (strcmp(pszParmName, entry->label) == 0) {
+                        DLIST_REMOVE(stored_options, entry);
+                        talloc_free(entry);
+                        break;
+                }
+        }
+
+        entry = talloc(NULL, struct lp_stored_option);
+        if (!entry) {
+                return false;
+        }
+
+        entry->label = talloc_strdup(entry, pszParmName);
+        if (!entry->label) {
+                talloc_free(entry);
+                return false;
+        }
+
+        entry->value = talloc_strdup(entry, pszParmValue);
+        if (!entry->value) {
+                talloc_free(entry);
+                return false;
+        }
+
+        DLIST_ADD_END(stored_options, entry, struct lp_stored_option);
+
+        return true;
+}
+
+static bool apply_lp_set_cmdline(void)
+{
+        struct lp_stored_option *entry = NULL;
+        for (entry = stored_options; entry != NULL; entry = entry->next) {
+                if (!lp_set_cmdline_helper(entry->label, entry->value, false)) {
+                        DEBUG(0, ("Failed to re-apply cmdline parameter %s = %s\n",
+                                  entry->label, entry->value));
+                        return false;
+                }
+        }
+        return true;
+}
+
 /***************************************************************************
  Initialise the global parameter structure.
 ***************************************************************************/
 
-static void init_globals(bool first_time_only)
+static void init_globals(bool reinit_globals)
 {
         static bool done_init = False;
@@ -4916 +5156 @@
 
         /* If requested to initialize only once and we've already done it... */
-        if (first_time_only && done_init) {
+        if (!reinit_globals && done_init) {
                 /* ... then we have nothing more to do */
                 return;
@@ -4932 +5172 @@
         }
 
+        /* This memset and the free_global_parameters() above will
+         * wipe out smb.conf options set with lp_set_cmdline().  The
+         * apply_lp_set_cmdline() call puts these values back in the
+         * table once the defaults are set */
         memset((void *)&Globals, '\0', sizeof(Globals));
 
@@ -4960 +5204 @@
         string_set(&Globals.szGuestaccount, GUEST_ACCOUNT);
 
-#ifdef __OS2__
+#ifndef __OS2__
+        /* using UTF8 by default allows us to support all chars */
+        string_set(&Globals.unix_charset, DEFAULT_UNIX_CHARSET);
+#else
         /* search the system codepage and set OS2CodePageStr */
         unsigned long _System DosQueryCp (unsigned long ulLength, unsigned long *pCodePageList, unsigned long *pDataLength);
@@ -4970 +5217 @@
           else
            asprintf(&OS2CodePageStr, "IBM-%u", OS2CodePage[0]);
-#endif
-#ifndef __OS2__
-        /* using UTF8 by default allows us to support all chars */
-        string_set(&Globals.unix_charset, DEFAULT_UNIX_CHARSET);
-#else
+
         /* On OS/2, using UTF8 causes problems with display of foreign 
            characters - default to system codepage */
@@ -4990 +5233 @@
         string_set(&Globals.display_charset, OS2CodePageStr);
 #endif
-
 #else
         string_set(&Globals.display_charset, DEFAULT_DISPLAY_CHARSET);
@@ -5026 +5268 @@
         /*
          * By default support explicit binding to broadcast
-         * addresses.
-         */
+         * addresses.
+         */
         Globals.bNmbdBindExplicitBroadcast = true;
 
@@ -5129 +5371 @@
         Globals.bLanmanAuth = False;    /* Do NOT use the LanMan hash, even if it is supplied */
         Globals.bNTLMAuth = True;       /* Do use NTLMv1 if it is supplied by the client (otherwise NTLMv2) */
-        Globals.bClientNTLMv2Auth = False; /* Client should not use NTLMv2, as we can't tell that the server supports it. */
-        /* Note, that we will use NTLM2 session security (which is different), if it is available */
+        Globals.bClientNTLMv2Auth = True; /* Client should always use use NTLMv2, as we can't tell that the server supports it, but most modern servers do */
+        /* Note, that we will also use NTLM2 session security (which is different), if it is available */
 
         Globals.map_to_guest = 0;       /* By Default, "Never" */
@@ -5143 +5385 @@
         Globals.bUnixExtensions = True;
         Globals.bResetOnZeroVC = False;
+        Globals.bLogWriteableFilesOnExit = False;
         Globals.bCreateKrb5Conf = true;
+        Globals.winbindMaxDomainConnections = 1;
 
         /* hostname lookups can be very expensive and are broken on
@@ -5208 +5452 @@
         Globals.bAllowTrustedDomains = True;
         string_set(&Globals.szIdmapBackend, "tdb");
+        Globals.bIdmapReadOnly = false;
 
         string_set(&Globals.szTemplateShell, "/bin/false");
@@ -5220 +5465 @@
         Globals.clustering = False;
         Globals.ctdb_timeout = 0;
+        Globals.ctdb_locktime_warn_threshold = 0;
 
         Globals.winbind_cache_time = 300;       /* 5 minutes */
         Globals.winbind_reconnect_delay = 30;   /* 30 seconds */
+        Globals.winbind_max_clients = 200;
         Globals.bWinbindEnumUsers = False;
         Globals.bWinbindEnumGroups = False;
@@ -5229 +5476 @@
         Globals.bWinbindNestedGroups = True;
         Globals.winbind_expand_groups = 1;
-        Globals.szWinbindNssInfo = str_list_make_v3(talloc_autofree_context(), "template", NULL);
+        Globals.szWinbindNssInfo = str_list_make_v3(NULL, "template", NULL);
         Globals.bWinbindRefreshTickets = False;
         Globals.bWinbindOfflineLogon = False;
@@ -5274 +5521 @@
 
         Globals.bMapUntrustedToDomain = false;
+        Globals.bMulticastDnsRegister = true;
+
+        Globals.ismb2_max_read = DEFAULT_SMB2_MAX_READ;
+        Globals.ismb2_max_write = DEFAULT_SMB2_MAX_WRITE;
+        Globals.ismb2_max_trans = DEFAULT_SMB2_MAX_TRANSACT;
+        Globals.ismb2_max_credits = DEFAULT_SMB2_MAX_CREDITS;
+
+        string_set(&Globals.ncalrpc_dir, get_dyn_NCALRPCDIR());
+
+        /* Now put back the settings that were set with lp_set_cmdline() */
+        apply_lp_set_cmdline();
 }
 
@@ -5348 +5606 @@
 #define FN_LOCAL_PARM_INTEGER(fn_name,val) \
  int fn_name(const struct share_params *p) {return(LP_SNUM_OK(p->service)? ServicePtrs[(p->service)]->val : sDefault.val);}
-#define FN_LOCAL_PARM_STRING(fn_name,val) \
- char *fn_name(const struct share_params *p) {return(lp_string((LP_SNUM_OK(p->service) && ServicePtrs[(p->service)]->val) ? ServicePtrs[(p->service)]->val : sDefault.val));}
 #define FN_LOCAL_CHAR(fn_name,val) \
  char fn_name(const struct share_params *p) {return(LP_SNUM_OK(p->service)? ServicePtrs[(p->service)]->val : sDefault.val);}
@@ -5484 +5740 @@
 FN_GLOBAL_STRING(lp_abort_shutdown_script, &Globals.szAbortShutdownScript)
 FN_GLOBAL_STRING(lp_username_map_script, &Globals.szUsernameMapScript)
+FN_GLOBAL_INTEGER(lp_username_map_cache_time, &Globals.iUsernameMapCacheTime)
 
 FN_GLOBAL_STRING(lp_check_password_script, &Globals.szCheckPasswordScript)
@@ -5503 +5760 @@
 FN_GLOBAL_BOOL(lp_winbind_rpc_only, &Globals.bWinbindRpcOnly)
 FN_GLOBAL_BOOL(lp_create_krb5_conf, &Globals.bCreateKrb5Conf)
+static FN_GLOBAL_INTEGER(lp_winbind_max_domain_connections_int,
+                  &Globals.winbindMaxDomainConnections)
+
+int lp_winbind_max_domain_connections(void)
+{
+        if (lp_winbind_offline_logon() &&
+            lp_winbind_max_domain_connections_int() > 1) {
+                DEBUG(1, ("offline logons active, restricting max domain "
+                          "connections to 1\n"));
+                return 1;
+        }
+        return MAX(1, lp_winbind_max_domain_connections_int());
+}
 
 FN_GLOBAL_CONST_STRING(lp_idmap_backend, &Globals.szIdmapBackend)
-FN_GLOBAL_STRING(lp_idmap_alloc_backend, &Globals.szIdmapAllocBackend)
 FN_GLOBAL_INTEGER(lp_idmap_cache_time, &Globals.iIdmapCacheTime)
 FN_GLOBAL_INTEGER(lp_idmap_negative_cache_time, &Globals.iIdmapNegativeCacheTime)
@@ -5539 +5808 @@
 FN_GLOBAL_BOOL(lp_disable_netbios, &Globals.bDisableNetbios)
 FN_GLOBAL_BOOL(lp_reset_on_zero_vc, &Globals.bResetOnZeroVC)
+FN_GLOBAL_BOOL(lp_log_writeable_files_on_exit,
+               &Globals.bLogWriteableFilesOnExit)
 FN_GLOBAL_BOOL(lp_ms_add_printer_wizard, &Globals.bMsAddPrinterWizard)
 FN_GLOBAL_BOOL(lp_dns_proxy, &Globals.bDNSproxy)
@@ -5549 +5820 @@
 FN_GLOBAL_INTEGER(lp_init_logon_delay, &Globals.InitLogonDelay)
 FN_GLOBAL_BOOL(lp_load_printers, &Globals.bLoadPrinters)
-FN_GLOBAL_BOOL(lp_readraw, &Globals.bReadRaw)
+FN_GLOBAL_BOOL(_lp_readraw, &Globals.bReadRaw)
 FN_GLOBAL_BOOL(lp_large_readwrite, &Globals.bLargeReadwrite)
-FN_GLOBAL_BOOL(lp_writeraw, &Globals.bWriteRaw)
+FN_GLOBAL_BOOL(_lp_writeraw, &Globals.bWriteRaw)
 FN_GLOBAL_BOOL(lp_null_passwords, &Globals.bNullPasswords)
 FN_GLOBAL_BOOL(lp_obey_pam_restrictions, &Globals.bObeyPamRestrictions)
 FN_GLOBAL_BOOL(lp_encrypted_passwords, &Globals.bEncryptPasswords)
-FN_GLOBAL_BOOL(lp_update_encrypted, &Globals.bUpdateEncrypt)
 FN_GLOBAL_INTEGER(lp_client_schannel, &Globals.clientSchannel)
 FN_GLOBAL_INTEGER(lp_server_schannel, &Globals.serverSchannel)
@@ -5594 +5864 @@
 FN_GLOBAL_BOOL(lp_client_use_spnego, &Globals.bClientUseSpnego)
 FN_GLOBAL_BOOL(lp_client_use_spnego_principal, &Globals.client_use_spnego_principal)
+FN_GLOBAL_BOOL(lp_send_spnego_principal, &Globals.send_spnego_principal)
 FN_GLOBAL_BOOL(lp_hostname_lookups, &Globals.bHostnameLookups)
 FN_LOCAL_PARM_BOOL(lp_change_notify, bChangeNotify)
@@ -5615 +5886 @@
 FN_GLOBAL_INTEGER(lp_deadtime, &Globals.deadtime)
 FN_GLOBAL_BOOL(lp_getwd_cache, &Globals.getwd_cache)
-FN_GLOBAL_INTEGER(lp_maxprotocol, &Globals.maxprotocol)
+static FN_GLOBAL_INTEGER(_lp_maxprotocol, &Globals.maxprotocol)
+int lp_maxprotocol(void)
+{
+        int ret = _lp_maxprotocol();
+        if ((ret == PROTOCOL_SMB2) && (lp_security() == SEC_SHARE)) {
+                DEBUG(2,("WARNING!!: \"security = share\" is incompatible "
+                        "with the SMB2 protocol. Resetting to SMB1.\n" ));
+                        lp_do_parameter(-1, "max protocol", "NT1");
+                return PROTOCOL_NT1;
+        }
+        return ret;
+}
 FN_GLOBAL_INTEGER(lp_minprotocol, &Globals.minprotocol)
 FN_GLOBAL_INTEGER(lp_security, &Globals.security)
@@ -5635 +5917 @@
 FN_GLOBAL_CONST_STRING(lp_socket_options, &Globals.szSocketOptions)
 FN_GLOBAL_INTEGER(lp_config_backend, &Globals.ConfigBackend)
-
+FN_GLOBAL_INTEGER(lp_smb2_max_read, &Globals.ismb2_max_read)
+FN_GLOBAL_INTEGER(lp_smb2_max_write, &Globals.ismb2_max_write)
+FN_GLOBAL_INTEGER(lp_smb2_max_trans, &Globals.ismb2_max_trans)
+int lp_smb2_max_credits(void)
+{
+        if (Globals.ismb2_max_credits == 0) {
+                Globals.ismb2_max_credits = DEFAULT_SMB2_MAX_CREDITS;
+        }
+        return Globals.ismb2_max_credits;
+}
 FN_LOCAL_STRING(lp_preexec, szPreExec)
 FN_LOCAL_STRING(lp_postexec, szPostExec)
@@ -5675 +5966 @@
 FN_GLOBAL_BOOL(lp_clustering, &Globals.clustering)
 FN_GLOBAL_INTEGER(lp_ctdb_timeout, &Globals.ctdb_timeout)
+FN_GLOBAL_INTEGER(lp_ctdb_locktime_warn_threshold, &Globals.ctdb_locktime_warn_threshold)
 FN_LOCAL_STRING(lp_printcommand, szPrintcommand)
 FN_LOCAL_STRING(lp_lpqcommand, szLpqcommand)
@@ -5722 +6014 @@
 FN_LOCAL_BOOL(lp_administrative_share, bAdministrative_share)
 FN_LOCAL_BOOL(lp_print_ok, bPrint_ok)
+FN_LOCAL_BOOL(lp_print_notify_backchannel, bPrintNotifyBackchannel)
 FN_LOCAL_BOOL(lp_map_hidden, bMap_hidden)
 FN_LOCAL_BOOL(lp_map_archive, bMap_archive)
@@ -5746 +6039 @@
 FN_LOCAL_BOOL(lp_dos_filetime_resolution, bDosFiletimeResolution)
 FN_LOCAL_BOOL(lp_fake_dir_create_times, bFakeDirCreateTimes)
+FN_GLOBAL_BOOL(lp_async_smb_echo_handler, &Globals.bAsyncSMBEchoHandler)
+FN_GLOBAL_BOOL(lp_multicast_dns_register, &Globals.bMulticastDnsRegister)
 FN_LOCAL_BOOL(lp_blocking_locks, bBlockingLocks)
 FN_LOCAL_BOOL(lp_inherit_perms, bInheritPerms)
@@ -5790 +6085 @@
 FN_GLOBAL_INTEGER(lp_winbind_cache_time, &Globals.winbind_cache_time)
 FN_GLOBAL_INTEGER(lp_winbind_reconnect_delay, &Globals.winbind_reconnect_delay)
+FN_GLOBAL_INTEGER(lp_winbind_max_clients, &Globals.winbind_max_clients)
 FN_GLOBAL_LIST(lp_winbind_nss_info, &Globals.szWinbindNssInfo)
 FN_GLOBAL_INTEGER(lp_algorithmic_rid_base, &Globals.AlgorithmicRidBase)
@@ -5797 +6093 @@
 FN_GLOBAL_INTEGER(lp_client_ldap_sasl_wrapping, &Globals.client_ldap_sasl_wrapping)
 
+FN_GLOBAL_STRING(lp_ncalrpc_dir, &Globals.ncalrpc_dir)
+
 /* local prototypes */
 
-static int map_parameter(const char *pszParmName);
 static int map_parameter_canonical(const char *pszParmName, bool *inverse);
 static const char *get_boolean(bool bool_value);
@@ -5814 +6111 @@
 static void free_service_byindex(int iService);
 static void free_param_opts(struct param_opt_struct **popts);
-static char * canonicalize_servicename(const char *name);
 static void show_parameter(int parmIndex);
 static bool is_synonym_of(int parm1, int parm2, bool *inverse);
@@ -5829 +6125 @@
         char* param_key;
         struct param_opt_struct *data;
-        
+
         if (snum >= iNumServices) return NULL;
-        
+
         if (snum < 0) { 
                 data = Globals.param_opt;
@@ -5838 +6134 @@
                 data = ServicePtrs[snum]->param_opt;
         }
-    
+
         if (asprintf(&param_key, "%s:%s", type, option) == -1) {
                 DEBUG(0,("asprintf failed!\n"));
@@ -5866 +6162 @@
 
         string_free(&param_key);
-        
+
         return NULL;
 }
@@ -5913 +6209 @@
                 return False;
         }
-        
+
         if (!set_boolean(s, &ret)) {
                 DEBUG(0,("lp_bool(%s): value is not boolean!\n",s));
@@ -5933 +6229 @@
                 return (-1);
         }
-        
+
         for (i=0; _enum[i].name; i++) {
                 if (strequal(_enum[i].name,s))
@@ -5963 +6259 @@
 {
         struct param_opt_struct *data = get_parametrics(snum, type, option);
-        
+
         if (data == NULL||data->value==NULL) {
                 if (def) {
@@ -5980 +6276 @@
 {
         struct param_opt_struct *data = get_parametrics(snum, type, option);
-        
+
         if (data == NULL||data->value==NULL)
                 return def;
-                
+
         return data->value;
 }
@@ -5996 +6292 @@
         if (data == NULL||data->value==NULL)
                 return (const char **)def;
-                
+
         if (data->list==NULL) {
-                data->list = str_list_make_v3(talloc_autofree_context(), data->value, NULL);
+                data->list = str_list_make_v3(NULL, data->value, NULL);
         }
 
@@ -6010 +6306 @@
 {
         struct param_opt_struct *data = get_parametrics(snum, type, option);
-        
+
         if (data && data->value && *data->value)
                 return lp_int(data->value);
@@ -6023 +6319 @@
 {
         struct param_opt_struct *data = get_parametrics(snum, type, option);
-        
+
         if (data && data->value && *data->value)
                 return lp_ulong(data->value);
@@ -6036 +6332 @@
 {
         struct param_opt_struct *data = get_parametrics(snum, type, option);
-        
+
         if (data && data->value && *data->value)
                 return lp_bool(data->value);
@@ -6050 +6346 @@
 {
         struct param_opt_struct *data = get_parametrics(snum, type, option);
-        
+
         if (data && data->value && *data->value && _enum)
                 return lp_enum(data->value, _enum);
@@ -6114 +6410 @@
 
         string_free(&pservice->szService);
-        bitmap_free(pservice->copymap);
+        TALLOC_FREE(pservice->copymap);
 
         free_param_opts(&pservice->param_opt);
@@ -6139 +6435 @@
         if (ServicePtrs[idx]->szService) {
                 char *canon_name = canonicalize_servicename(
+                        talloc_tos(),
                         ServicePtrs[idx]->szService );
-                
+
                 dbwrap_delete_bystring(ServiceHash, canon_name );
                 TALLOC_FREE(canon_name);
@@ -6165 +6462 @@
                 i = getservicebyname(name, NULL);
                 if (i >= 0) {
-                        /* Clean all parametric options for service */
-                        /* They will be added during parsing again */
-                        free_param_opts(&ServicePtrs[i]->param_opt);
                         return (i);
                 }
@@ -6182 +6476 @@
                 struct service **tsp;
                 int *tinvalid;
-                
+
                 tsp = SMB_REALLOC_ARRAY_KEEP_OLD_ON_ERROR(ServicePtrs, struct service *, num_to_alloc);
                 if (tsp == NULL) {
@@ -6215 +6509 @@
         if (name)
                 string_set(&ServicePtrs[i]->szService, name);
-                
+
         DEBUG(8,("add_a_service: Creating snum = %d for %s\n", 
                 i, ServicePtrs[i]->szService));
@@ -6222 +6516 @@
                 return (-1);
         }
-                
+
         return (i);
 }
@@ -6230 +6524 @@
 ***************************************************************************/
 
-static char *canonicalize_servicename(const char *src)
+char *canonicalize_servicename(TALLOC_CTX *ctx, const char *src)
 {
         char *result;
@@ -6239 +6533 @@
         }
 
-        result = talloc_strdup(talloc_tos(), src);
+        result = talloc_strdup(ctx, src);
         SMB_ASSERT(result != NULL);
 
@@ -6266 +6560 @@
                 idx, name));
 
-        canon_name = canonicalize_servicename( name );
+        canon_name = canonicalize_servicename(talloc_tos(), name );
 
         dbwrap_store_bystring(ServiceHash, canon_name,
@@ -6405 +6699 @@
         /* Printer services must be printable. */
         ServicePtrs[i]->bPrint_ok = True;
-        
+
         DEBUG(3, ("adding printer service %s\n", pszPrintername));
 
@@ -6773 +7067 @@
         }
 
-        canon_name = canonicalize_servicename(pszServiceName);
+        canon_name = canonicalize_servicename(talloc_tos(), pszServiceName);
 
         data = dbwrap_fetch_bystring(ServiceHash, canon_name, canon_name);
@@ -6802 +7096 @@
 static void set_param_opt(struct param_opt_struct **opt_list,
                           const char *opt_name,
-                          const char *opt_value)
+                          const char *opt_value,
+                          unsigned flags)
 {
         struct param_opt_struct *new_opt, *opt;
@@ -6818 +7113 @@
                 /* If we already have same option, override it */
                 if (strwicmp(opt->key, opt_name) == 0) {
+                        if ((opt->flags & FLAG_CMDLINE) &&
+                            !(flags & FLAG_CMDLINE)) {
+                                /* it's been marked as not to be
+                                   overridden */
+                                return;
+                        }
                         string_free(&opt->value);
                         TALLOC_FREE(opt->list);
                         opt->value = SMB_STRDUP(opt_value);
+                        opt->flags = flags;
                         not_added = false;
                         break;
@@ -6831 +7133 @@
             new_opt->value = SMB_STRDUP(opt_value);
             new_opt->list = NULL;
+            new_opt->flags = flags;
             DLIST_ADD(*opt_list, new_opt);
         }
@@ -6895 +7198 @@
                                     pserviceSource->copymap);
         }
-        
+
         data = pserviceSource->param_opt;
         while (data) {
-                set_param_opt(&pserviceDest->param_opt, data->key, data->value);
+                set_param_opt(&pserviceDest->param_opt, data->key, data->value, data->flags);
                 data = data->next;
         }
@@ -6951 +7254 @@
 static struct smbconf_ctx *lp_smbconf_ctx(void)
 {
-        WERROR werr;
+        sbcErr err;
         static struct smbconf_ctx *conf_ctx = NULL;
 
         if (conf_ctx == NULL) {
-                werr = smbconf_init(NULL, &conf_ctx, "registry:");
-                if (!W_ERROR_IS_OK(werr)) {
+                err = smbconf_init(NULL, &conf_ctx, "registry:");
+                if (!SBC_ERROR_IS_OK(err)) {
                         DEBUG(1, ("error initializing registry configuration: "
-                                  "%s\n", win_errstr(werr)));
+                                  "%s\n", sbcErrorString(err)));
                         conf_ctx = NULL;
                 }
@@ -6998 +7301 @@
 bool process_registry_service(const char *service_name)
 {
-        WERROR werr;
+        sbcErr err;
         struct smbconf_service *service = NULL;
         TALLOC_CTX *mem_ctx = talloc_stackframe();
@@ -7019 +7322 @@
         }
 
-        werr = smbconf_get_share(conf_ctx, mem_ctx, service_name, &service);
-        if (!W_ERROR_IS_OK(werr)) {
+        err = smbconf_get_share(conf_ctx, mem_ctx, service_name, &service);
+        if (!SBC_ERROR_IS_OK(err)) {
                 goto done;
         }
@@ -7056 +7359 @@
 bool process_registry_shares(void)
 {
-        WERROR werr;
+        sbcErr err;
         uint32_t count;
         struct smbconf_service **service = NULL;
@@ -7068 +7371 @@
         }
 
-        werr = smbconf_get_config(conf_ctx, mem_ctx, &num_shares, &service);
-        if (!W_ERROR_IS_OK(werr)) {
+        err = smbconf_get_config(conf_ctx, mem_ctx, &num_shares, &service);
+        if (!SBC_ERROR_IS_OK(err)) {
                 goto done;
         }
@@ -7092 +7395 @@
         return ret;
 }
+
+/**
+ * reload those shares from registry that are already
+ * activated in the services array.
+ */
+static bool reload_registry_shares(void)
+{
+        int i;
+        bool ret = true;
+
+        for (i = 0; i < iNumServices; i++) {
+                if (!VALID(i)) {
+                        continue;
+                }
+
+                if (ServicePtrs[i]->usershare == USERSHARE_VALID) {
+                        continue;
+                }
+
+                ret = process_registry_service(ServicePtrs[i]->szService);
+                if (!ret) {
+                        goto done;
+                }
+        }
+
+done:
+        return ret;
+}
+
 
 #define MAX_INCLUDE_DEPTH 100
@@ -7131 +7463 @@
                 f->subfname = SMB_STRDUP(subfname);
                 if (!f->subfname) {
+                        SAFE_FREE(f->name);
                         SAFE_FREE(f);
                         return;
@@ -7141 +7474 @@
                         f->modtime = t;
         }
+        return;
 }
 
@@ -7190 +7524 @@
 
         while (f) {
-                char *n2 = NULL;
                 time_t mod_time;
 
@@ -7206 +7539 @@
                         }
                 } else {
-                        n2 = alloc_sub_basic(get_current_username(),
-                                            current_user_info.domain,
-                                            f->name);
+                        char *n2 = NULL;
+                        n2 = talloc_sub_basic(talloc_tos(),
+                                              get_current_username(),
+                                              current_user_info.domain,
+                                              f->name);
                         if (!n2) {
                                 return false;
@@ -7227 +7562 @@
                                 f->modtime = mod_time;
                                 SAFE_FREE(f->subfname);
-                                f->subfname = n2; /* Passing ownership of
-                                                     return from alloc_sub_basic
-                                                     above. */
+                                f->subfname = SMB_STRDUP(n2);
+                                TALLOC_FREE(n2);
                                 return true;
                         }
-                        SAFE_FREE(n2);
+                        TALLOC_FREE(n2);
                 }
                 f = f->next;
@@ -7249 +7583 @@
 {
         bool ret;
-        char *netbios_name = alloc_sub_basic(get_current_username(),
-                                        current_user_info.domain,
-                                        pszParmValue);
+        char *netbios_name = talloc_sub_basic(
+                talloc_tos(), get_current_username(), current_user_info.domain,
+                pszParmValue);
 
         ret = set_global_myname(netbios_name);
-        SAFE_FREE(netbios_name);
+        TALLOC_FREE(netbios_name);
         string_set(&Globals.szNetbiosName,global_myname());
 
@@ -7272 +7606 @@
 }
 
+static bool handle_dos_charset(int snum, const char *pszParmValue, char **ptr)
+{
+        bool is_utf8 = false;
+        size_t len = strlen(pszParmValue);
+
+        if (len == 4 || len == 5) {
+                /* Don't use StrCaseCmp here as we don't want to
+                   initialize iconv. */
+                if ((toupper_m(pszParmValue[0]) == 'U') &&
+                    (toupper_m(pszParmValue[1]) == 'T') &&
+                    (toupper_m(pszParmValue[2]) == 'F')) {
+                        if (len == 4) {
+                                if (pszParmValue[3] == '8') {
+                                        is_utf8 = true;
+                                }
+                        } else {
+                                if (pszParmValue[3] == '-' &&
+                                    pszParmValue[4] == '8') {
+                                        is_utf8 = true;
+                                }
+                        }
+                }
+        }
+
+        if (strcmp(*ptr, pszParmValue) != 0) {
+                if (is_utf8) {
+                        DEBUG(0,("ERROR: invalid DOS charset: 'dos charset' must not "
+                                "be UTF8, using (default value) %s instead.\n",
+                                DEFAULT_DOS_CHARSET));
+                        pszParmValue = DEFAULT_DOS_CHARSET;
+                }
+                string_set(ptr, pszParmValue);
+                init_iconv();
+        }
+        return True;
+}
+
 
 
@@ -7277 +7648 @@
 {
         bool ret;
-        
+
         ret = set_global_myworkgroup(pszParmValue);
         string_set(&Globals.szWorkgroup,lp_workgroup());
-        
+
         return ret;
 }
@@ -7287 +7658 @@
 {
         bool ret;
-        
+
         ret = set_global_scope(pszParmValue);
         string_set(&Globals.szNetbiosScope,global_scope());
@@ -7297 +7668 @@
 {
         TALLOC_FREE(Globals.szNetbiosAliases);
-        Globals.szNetbiosAliases = str_list_make_v3(talloc_autofree_context(), pszParmValue, NULL);
+        Globals.szNetbiosAliases = str_list_make_v3(NULL, pszParmValue, NULL);
         return set_netbios_aliases((const char **)Globals.szNetbiosAliases);
 }
@@ -7333 +7704 @@
         }
 
-        fname = alloc_sub_basic(get_current_username(),
-                                current_user_info.domain,
-                                pszParmValue);
+        fname = talloc_sub_basic(talloc_tos(), get_current_username(),
+                                 current_user_info.domain,
+                                 pszParmValue);
 
         add_to_file_list(pszParmValue, fname);
@@ -7346 +7717 @@
                 ret = pm_process(fname, do_section, do_parameter, NULL);
                 include_depth--;
-                SAFE_FREE(fname);
+                TALLOC_FREE(fname);
                 return ret;
         }
 
         DEBUG(2, ("Can't find include file %s\n", fname));
-        SAFE_FREE(fname);
+        TALLOC_FREE(fname);
         return true;
 }
@@ -7445 +7816 @@
 }
 
+static bool handle_idmap_backend(int snum, const char *pszParmValue, char **ptr)
+{
+        lp_do_parameter(snum, "idmap config * : backend", pszParmValue);
+
+        return true;
+}
+
 /* Do some simple checks on "idmap [ug]id" parameter values */
 
 static bool handle_idmap_uid(int snum, const char *pszParmValue, char **ptr)
 {
-        uint32 low, high;
-
-        if (sscanf(pszParmValue, "%u - %u", &low, &high) != 2 || high < low)
-                return False;
-
-        /* Parse OK */
-
-        string_set(ptr, pszParmValue);
-
-        idmap_uid_low = low;
-        idmap_uid_high = high;
+        lp_do_parameter(snum, "idmap config * : range", pszParmValue);
 
         return True;
@@ -7466 +7834 @@
 static bool handle_idmap_gid(int snum, const char *pszParmValue, char **ptr)
 {
-        uint32 low, high;
-
-        if (sscanf(pszParmValue, "%u - %u", &low, &high) != 2 || high < low)
-                return False;
-
-        /* Parse OK */
-
-        string_set(ptr, pszParmValue);
-
-        idmap_gid_low = low;
-        idmap_gid_high = high;
+        lp_do_parameter(snum, "idmap config * : range", pszParmValue);
 
         return True;
@@ -7592 +7950 @@
 {
         int i;
-        if (pservice->copymap) {
-                bitmap_free(pservice->copymap);
-        }
-        pservice->copymap = bitmap_allocate(NUMPARAMETERS);
+
+        TALLOC_FREE(pservice->copymap);
+
+        pservice->copymap = bitmap_talloc(NULL, NUMPARAMETERS);
         if (!pservice->copymap)
                 DEBUG(0,
@@ -7652 +8010 @@
                 opt_list = (snum < 0)
                         ? &Globals.param_opt : &ServicePtrs[snum]->param_opt;
-                set_param_opt(opt_list, pszParmName, pszParmValue);
+                set_param_opt(opt_list, pszParmName, pszParmValue, 0);
 
                 return (True);
+        }
+
+        /* if it's already been set by the command line, then we don't
+           override here */
+        if (parm_table[parmnum].flags & FLAG_CMDLINE) {
+                return true;
         }
 
@@ -7723 +8087 @@
                         TALLOC_FREE(*((char ***)parm_ptr));
                         *(char ***)parm_ptr = str_list_make_v3(
-                                talloc_autofree_context(), pszParmValue, NULL);
+                                NULL, pszParmValue, NULL);
                         break;
 
@@ -7746 +8110 @@
 
 /***************************************************************************
+set a parameter, marking it with FLAG_CMDLINE. Parameters marked as
+FLAG_CMDLINE won't be overridden by loads from smb.conf.
+***************************************************************************/
+
+static bool lp_set_cmdline_helper(const char *pszParmName, const char *pszParmValue, bool store_values)
+{
+        int parmnum, i;
+        parmnum = map_parameter(pszParmName);
+        if (parmnum >= 0) {
+                parm_table[parmnum].flags &= ~FLAG_CMDLINE;
+                if (!lp_do_parameter(-1, pszParmName, pszParmValue)) {
+                        return false;
+                }
+                parm_table[parmnum].flags |= FLAG_CMDLINE;
+
+                /* we have to also set FLAG_CMDLINE on aliases.  Aliases must
+                 * be grouped in the table, so we don't have to search the
+                 * whole table */
+                for (i=parmnum-1;i>=0 && parm_table[i].ptr == parm_table[parmnum].ptr;i--) {
+                        parm_table[i].flags |= FLAG_CMDLINE;
+                }
+                for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].ptr == parm_table[parmnum].ptr;i++) {
+                        parm_table[i].flags |= FLAG_CMDLINE;
+                }
+
+                if (store_values) {
+                        store_lp_set_cmdline(pszParmName, pszParmValue);
+                }
+                return true;
+        }
+
+        /* it might be parametric */
+        if (strchr(pszParmName, ':') != NULL) {
+                set_param_opt(&Globals.param_opt, pszParmName, pszParmValue, FLAG_CMDLINE);
+                if (store_values) {
+                        store_lp_set_cmdline(pszParmName, pszParmValue);
+                }
+                return true;
+        }
+
+        DEBUG(0, ("Ignoring unknown parameter \"%s\"\n",  pszParmName));
+        return true;
+}
+
+bool lp_set_cmdline(const char *pszParmName, const char *pszParmValue)
+{
+        return lp_set_cmdline_helper(pszParmName, pszParmValue, true);
+}
+
+/***************************************************************************
  Process a parameter.
 ***************************************************************************/
@@ -7761 +8175 @@
 }
 
-/***************************************************************************
+/*
+  set a option from the commandline in 'a=b' format. Use to support --option
+*/
+bool lp_set_option(const char *option)
+{
+        char *p, *s;
+        bool ret;
+
+        s = talloc_strdup(NULL, option);
+        if (!s) {
+                return false;
+        }
+
+        p = strchr(s, '=');
+        if (!p) {
+                talloc_free(s);
+                return false;
+        }
+
+        *p = 0;
+
+        /* skip white spaces after the = sign */
+        do {
+                p++;
+        } while (*p == ' ');
+
+        ret = lp_set_cmdline(s, p);
+        talloc_free(s);
+        return ret;
+}
+
+/**************************************************************************
  Print a parameter of the specified type.
 ***************************************************************************/
@@ -7920 +8365 @@
                         return (False);
                 }
+                /* Clean all parametric options for service */
+                /* They will be added during parsing again */
+                free_param_opts(&ServicePtrs[iServiceIndex]->param_opt);
         }
 
@@ -7968 +8416 @@
         int i;
         struct param_opt_struct *data;
-        
+
         fprintf(f, "[global]\n");
 
@@ -8013 +8461 @@
         int i;
         struct param_opt_struct *data;
-        
+
         if (pService != &sDefault)
                 fprintf(f, "[%s]\n", pService->szService);
@@ -8025 +8473 @@
                     (i == 0 || (parm_table[i].ptr != parm_table[i - 1].ptr))) 
                 {
-                
                         int pdiff = PTR_DIFF(parm_table[i].ptr, &sDefault);
 
@@ -8162 +8609 @@
                                 parm_table[(*i) - 1].ptr))
                                 continue;
-                        
+
                         if (is_default(*i) && !allparameters)
                                 continue;
@@ -8275 +8722 @@
 ***************************************************************************/
 
-void lp_add_one_printer(const char *name, const char *comment, void *pdata)
+void lp_add_one_printer(const char *name, const char *comment,
+                        const char *location, void *pdata)
 {
         int printers = lp_servicenumber(PRINTERS_NAME);
@@ -8387 +8835 @@
 }
 
-/*******************************************************************
- Set the server type we will announce as via nmbd.
-********************************************************************/
-
-static const struct srv_role_tab {
-        uint32 role;
-        const char *role_str;
-} srv_role_tab [] = {
-        { ROLE_STANDALONE, "ROLE_STANDALONE" },
-        { ROLE_DOMAIN_MEMBER, "ROLE_DOMAIN_MEMBER" },
-        { ROLE_DOMAIN_BDC, "ROLE_DOMAIN_BDC" },
-        { ROLE_DOMAIN_PDC, "ROLE_DOMAIN_PDC" },
-        { 0, NULL }
-};
-
-const char* server_role_str(uint32 role)
-{
-        int i = 0;
-        for (i=0; srv_role_tab[i].role_str; i++) {
-                if (role == srv_role_tab[i].role) {
-                        return srv_role_tab[i].role_str;
-                }
-        }
-        return NULL;
-}
-
-static void set_server_role(void)
-{
-        server_role = ROLE_STANDALONE;
-
-        switch (lp_security()) {
-                case SEC_SHARE:
-                        if (lp_domain_logons())
-                                DEBUG(0, ("Server's Role (logon server) conflicts with share-level security\n"));
-                        break;
-                case SEC_SERVER:
-                        if (lp_domain_logons())
-                                DEBUG(0, ("Server's Role (logon server) conflicts with server-level security\n"));
-                        /* this used to be considered ROLE_DOMAIN_MEMBER but that's just wrong */
-                        server_role = ROLE_STANDALONE;
-                        break;
-                case SEC_DOMAIN:
-                        if (lp_domain_logons()) {
-                                DEBUG(1, ("Server's Role (logon server) NOT ADVISED with domain-level security\n"));
-                                server_role = ROLE_DOMAIN_BDC;
-                                break;
-                        }
-                        server_role = ROLE_DOMAIN_MEMBER;
-                        break;
-                case SEC_ADS:
-                        if (lp_domain_logons()) {
-                                server_role = ROLE_DOMAIN_PDC;
-                                break;
-                        }
-                        server_role = ROLE_DOMAIN_MEMBER;
-                        break;
-                case SEC_USER:
-                        if (lp_domain_logons()) {
-
-                                if (Globals.iDomainMaster) /* auto or yes */ 
-                                        server_role = ROLE_DOMAIN_PDC;
-                                else
-                                        server_role = ROLE_DOMAIN_BDC;
-                        }
-                        break;
-                default:
-                        DEBUG(0, ("Server's Role undefined due to unknown security mode\n"));
-                        break;
-        }
-
-        DEBUG(10, ("set_server_role: role = %s\n", server_role_str(server_role)));
-}
-
 /***********************************************************
  If we should send plaintext/LANMAN passwords in the clinet
@@ -8535 +8910 @@
                         char **pp_sharepath,
                         char **pp_comment,
-                        SEC_DESC **ppsd,
+                        char **pp_cp_servicename,
+                        struct security_descriptor **ppsd,
                         bool *pallow_guest)
 {
@@ -8601 +8977 @@
                 if (lines[4][9] == 'y') {
                         *pallow_guest = True;
+                }
+
+                /* Backwards compatible extension to file version #2. */
+                if (numlines > 5) {
+                        if (strncmp(lines[5], "sharename=", 10) != 0) {
+                                return USERSHARE_MALFORMED_SHARENAME_DEF;
+                        }
+                        if (!strequal(&lines[5][10], servicename)) {
+                                return USERSHARE_BAD_SHARENAME;
+                        }
+                        *pp_cp_servicename = talloc_strdup(ctx, &lines[5][10]);
+                        if (!*pp_cp_servicename) {
+                                return USERSHARE_POSIX_ERR;
+                        }
+                }
+        }
+
+        if (*pp_cp_servicename == NULL) {
+                *pp_cp_servicename = talloc_strdup(ctx, servicename);
+                if (!*pp_cp_servicename) {
+                        return USERSHARE_POSIX_ERR;
                 }
         }
@@ -8713 +9110 @@
         char *sharepath = NULL;
         char *comment = NULL;
-        fstring service_name;
+        char *cp_service_name = NULL;
         char **lines = NULL;
         int numlines = 0;
         int fd = -1;
         int iService = -1;
-        TALLOC_CTX *ctx = NULL;
-        SEC_DESC *psd = NULL;
+        TALLOC_CTX *ctx = talloc_stackframe();
+        struct security_descriptor *psd = NULL;
         bool guest_ok = False;
+        char *canon_name = NULL;
+        bool added_service = false;
+        int ret = -1;
 
         /* Ensure share name doesn't contain invalid characters. */
@@ -8727 +9127 @@
                         "invalid characters (any of %s)\n",
                         file_name, INVALID_SHARENAME_CHARS ));
-                return -1;
-        }
-
-        fstrcpy(service_name, file_name);
-
-        if (asprintf(&fname, "%s/%s", dir_name, file_name) < 0) {
+                goto out;
+        }
+
+        canon_name = canonicalize_servicename(ctx, file_name);
+        if (!canon_name) {
+                goto out;
+        }
+
+        fname = talloc_asprintf(ctx, "%s/%s", dir_name, file_name);
+        if (!fname) {
+                goto out;
         }
 
@@ -8741 +9146 @@
                 DEBUG(0,("process_usershare_file: stat of %s failed. %s\n",
                         fname, strerror(errno) ));
-                SAFE_FREE(fname);
-                return -1;
+                goto out;
         }
 
@@ -8748 +9152 @@
            other strange filetype. */
         if (!check_usershare_stat(fname, &lsbuf)) {
-                SAFE_FREE(fname);
-                return -1;
-        }
-
-        {
-                char *canon_name = canonicalize_servicename(service_name);
+                goto out;
+        }
+
+        {
                 TDB_DATA data = dbwrap_fetch_bystring(
                         ServiceHash, canon_name, canon_name);
@@ -8762 +9164 @@
                         iService = *(int *)data.dptr;
                 }
-                TALLOC_FREE(canon_name);
         }
 
@@ -8770 +9171 @@
                 /* Nothing changed - Mark valid and return. */
                 DEBUG(10,("process_usershare_file: service %s not changed.\n",
-                        service_name ));
+                        canon_name ));
                 ServicePtrs[iService]->usershare = USERSHARE_VALID;
-                SAFE_FREE(fname);
-                return iService;
+                ret = iService;
+                goto out;
         }
 
@@ -8786 +9187 @@
                 DEBUG(0,("process_usershare_file: unable to open %s. %s\n",
                         fname, strerror(errno) ));
-                SAFE_FREE(fname);
-                return -1;
+                goto out;
         }
 
@@ -8795 +9195 @@
                 DEBUG(0,("process_usershare_file: fstat of %s failed. %s\n",
                         fname, strerror(errno) ));
-                SAFE_FREE(fname);
-                return -1;
+                goto out;
         }
 
@@ -8804 +9203 @@
                 DEBUG(0,("process_usershare_file: fstat of %s is a different file from lstat. "
                         "Symlink spoofing going on ?\n", fname ));
-                SAFE_FREE(fname);
-                return -1;
+                goto out;
         }
 
@@ -8811 +9209 @@
            other strange filetype. */
         if (!check_usershare_stat(fname, &sbuf)) {
-                SAFE_FREE(fname);
-                return -1;
+                goto out;
         }
 
@@ -8821 +9218 @@
                 DEBUG(0,("process_usershare_file: loading file %s owned by %u failed.\n",
                         fname, (unsigned int)sbuf.st_ex_uid ));
-                SAFE_FREE(fname);
-                return -1;
-        }
-
-        SAFE_FREE(fname);
-
-        /* Should we allow printers to be shared... ? */
-        ctx = talloc_init("usershare_sd_xctx");
-        if (!ctx) {
-                TALLOC_FREE(lines);
-                return 1;
-        }
-
-        if (parse_usershare_file(ctx, &sbuf, service_name,
+                goto out;
+        }
+
+        if (parse_usershare_file(ctx, &sbuf, file_name,
                         iService, lines, numlines, &sharepath,
-                        &comment, &psd, &guest_ok) != USERSHARE_OK) {
-                talloc_destroy(ctx);
-                TALLOC_FREE(lines);
-                return -1;
-        }
-
-        TALLOC_FREE(lines);
+                        &comment, &cp_service_name,
+                        &psd, &guest_ok) != USERSHARE_OK) {
+                goto out;
+        }
 
         /* Everything ok - add the service possibly using a template. */
@@ -8851 +9235 @@
                 }
 
-                if ((iService = add_a_service(sp, service_name)) < 0) {
+                if ((iService = add_a_service(sp, cp_service_name)) < 0) {
                         DEBUG(0, ("process_usershare_file: Failed to add "
-                                "new service %s\n", service_name));
-                        talloc_destroy(ctx);
-                        return -1;
+                                "new service %s\n", cp_service_name));
+                        goto out;
                 }
+
+                added_service = true;
 
                 /* Read only is controlled by usershare ACL below. */
@@ -8863 +9248 @@
 
         /* Write the ACL of the new/modified share. */
-        if (!set_share_security(service_name, psd)) {
+        if (!set_share_security(canon_name, psd)) {
                  DEBUG(0, ("process_usershare_file: Failed to set share "
                         "security for user share %s\n",
-                        service_name ));
-                lp_remove_service(iService);
-                talloc_destroy(ctx);
-                return -1;
+                        canon_name ));
+                goto out;
         }
 
@@ -8888 +9271 @@
         string_set(&ServicePtrs[iService]->comment, comment);
 
-        talloc_destroy(ctx);
-
-        return iService;
+        ret = iService;
+
+  out:
+
+        if (ret == -1 && iService != -1 && added_service) {
+                lp_remove_service(iService);
+        }
+
+        TALLOC_FREE(lines);
+        TALLOC_FREE(ctx);
+        return ret;
 }
 
@@ -9199 +9590 @@
 ***************************************************************************/
 
-bool lp_load_ex(const char *pszFname,
-                bool global_only,
-                bool save_defaults,
-                bool add_ipc,
-                bool initialize_globals,
-                bool allow_include_registry,
-                bool allow_registry_shares)
+static bool lp_load_ex(const char *pszFname,
+                       bool global_only,
+                       bool save_defaults,
+                       bool add_ipc,
+                       bool initialize_globals,
+                       bool allow_include_registry,
+                       bool allow_registry_shares)
 {
         char *n2 = NULL;
@@ -9218 +9609 @@
         bAllowIncludeRegistry = allow_include_registry;
 
-        init_globals(! initialize_globals);
-        debug_init();
+        init_globals(initialize_globals);
 
         free_file_list();
@@ -9230 +9620 @@
         free_param_opts(&Globals.param_opt);
 
+        lp_do_parameter(-1, "idmap config * : backend", Globals.szIdmapBackend);
+
         /* We get sections first, so have to start 'behind' to make up */
         iServiceIndex = -1;
 
         if (lp_config_backend_is_file()) {
-                n2 = alloc_sub_basic(get_current_username(),
+                n2 = talloc_sub_basic(talloc_tos(), get_current_username(),
                                         current_user_info.domain,
                                         pszFname);
@@ -9244 +9636 @@
 
                 bRetval = pm_process(n2, do_section, do_parameter, NULL);
-                SAFE_FREE(n2);
+                TALLOC_FREE(n2);
 
                 /* finish up the last section */
@@ -9266 +9658 @@
                         DEBUG(1, ("lp_load_ex: changing to config backend "
                                   "registry\n"));
-                        init_globals(false);
+                        init_globals(true);
                         lp_kill_all_services();
                         return lp_load_ex(pszFname, global_only, save_defaults,
@@ -9281 +9673 @@
         }
 
-        if (bRetval && lp_registry_shares() && allow_registry_shares) {
-                bRetval = process_registry_shares();
+        if (bRetval && lp_registry_shares()) {
+                if (allow_registry_shares) {
+                        bRetval = process_registry_shares();
+                } else {
+                        bRetval = reload_registry_shares();
+                }
         }
 
@@ -9300 +9696 @@
         set_allowed_client_auth();
 
+        if (lp_security() == SEC_SHARE) {
+                DEBUG(1, ("WARNING: The security=share option is deprecated\n"));
+        } else if (lp_security() == SEC_SERVER) {
+                DEBUG(1, ("WARNING: The security=server option is deprecated\n"));
+        }
+
+        if (lp_security() == SEC_ADS && strchr(lp_passwordserver(), ':')) {
+                DEBUG(1, ("WARNING: The optional ':port' in password server = %s is deprecated\n",
+                          lp_passwordserver()));
+        }
+
         bLoaded = True;
 
@@ -9307 +9714 @@
                 lp_do_parameter(GLOBAL_SECTION_SNUM, "wins server", "127.0.0.1");
         }
+
 #ifdef __OS2__
         if (lp_is_in_client() && newLockDir) {
@@ -9314 +9722 @@
            }
            lp_do_parameter(GLOBAL_SECTION_SNUM, "lock directory", s);
+// @todo what do these directories do
+           lp_do_parameter(GLOBAL_SECTION_SNUM, "state directory", s);
+           lp_do_parameter(GLOBAL_SECTION_SNUM, "cache directory", s);
            SAFE_FREE(s);
            newLockDir = False;
         }
 #endif
-
         init_iconv();
 
@@ -9337 +9747 @@
                           add_ipc,
                           initialize_globals,
-                          true, false);
+                          true,   /* allow_include_registry */
+                          false); /* allow_registry_shares*/
 }
 
@@ -9343 +9754 @@
 {
         return lp_load_ex(pszFname,
-                          true,
-                          false,
-                          false,
-                          true,
-                          false,
-                          false);
+                          true,   /* global only */
+                          false,  /* save_defaults */
+                          false,  /* add_ipc */
+                          true,   /* initialize_globals */
+                          false,  /* allow_include_registry */
+                          false); /* allow_registry_shares*/
 }
 
@@ -9362 +9773 @@
                           add_ipc,
                           initialize_globals,
-                          true,
-                          true);
+                          true,  /* allow_include_registry */
+                          true); /* allow_registry_shares*/
 }
 
@@ -9420 +9831 @@
         int iService;
         fstring serviceName;
-        
+
         if (!pszServiceName) {
                 return GLOBAL_SECTION_SNUM;
         }
-        
+
         for (iService = iNumServices - 1; iService >= 0; iService--) {
                 if (VALID(iService) && ServicePtrs[iService]->szService) {
@@ -9480 +9891 @@
 {
         struct share_params *result;
-        char *sname;
+        char *sname = NULL;
         int snum;
 
-        if (!(sname = SMB_STRDUP(sharename))) {
-                return NULL;
-        }
-
-        snum = find_service(sname);
-        SAFE_FREE(sname);
-
-        if (snum < 0) {
+        snum = find_service(mem_ctx, sharename, &sname);
+        if (snum < 0 || sname == NULL) {
                 return NULL;
         }
@@ -9574 +9979 @@
                 label = lp_servicename(snum);
         }
-                
+
         /* This returns a 33 byte guarenteed null terminated string. */
         ret = talloc_strndup(talloc_tos(), label, 32);
@@ -9639 +10044 @@
 
 /***********************************************************
- returns role of Samba server
+ If we are PDC then prefer us as DMB
 ************************************************************/
 
-int lp_server_role(void)
-{
-        return server_role;
+bool lp_domain_master(void)
+{
+        if (Globals.iDomainMaster == Auto)
+                return (lp_server_role() == ROLE_DOMAIN_PDC);
+
+        return (bool)Globals.iDomainMaster;
 }
 
@@ -9651 +10059 @@
 ************************************************************/
 
-bool lp_domain_master(void)
-{
-        if (Globals.iDomainMaster == Auto)
-                return (lp_server_role() == ROLE_DOMAIN_PDC);
-
-        return (bool)Globals.iDomainMaster;
+bool lp_domain_master_true_or_auto(void)
+{
+        if (Globals.iDomainMaster) /* auto or yes */
+                return true;
+
+        return false;
 }
 
@@ -9947 +10355 @@
 {
         char *sock_addr = Globals.szSocketAddress;
-        
+
         if (sock_addr[0] == '\0'){
                 string_set(&Globals.szSocketAddress, "0.0.0.0");
@@ -9990 +10398 @@
         return lp_widelinks_internal(snum);
 }
+
+bool lp_writeraw(void)
+{
+        if (lp_async_smb_echo_handler()) {
+                return false;
+        }
+        return _lp_writeraw();
+}
+
+bool lp_readraw(void)
+{
+        if (lp_async_smb_echo_handler()) {
+                return false;
+        }
+        return _lp_readraw();
+}

trunk/server/source3/param/test_lp_load.c

@@ -19 +19 @@
 
 #include "includes.h"
-
-extern bool AllowDebugChange;
+#include "popt_common.h"
 
 int main(int argc, const char **argv)
@@ -41 +40 @@
 
         load_case_tables();
-        DEBUGLEVEL_CLASS[DBGC_ALL] = 0;
+        lp_set_cmdline("log level", "0");
 
         pc = poptGetContext(NULL, argc, argv, long_options,
@@ -49 +48 @@
         while(poptGetNextOpt(pc) != -1);
 
-        setup_logging(poptGetArg(pc), True);
+        setup_logging(poptGetArg(pc), DEBUG_STDERR);
 
         if (poptPeekArg(pc)) {
@@ -60 +59 @@
                 count = atoi(count_str);
         }
-
-        dbf = x_stderr;
-        /* Don't let the debuglevel be changed by smb.conf. */
-        AllowDebugChange = False;
 
         for (i=0; i < count; i++) {