Fix include paths to new location of libutil.
[kai/samba-autobuild/.git] / source4 / param / loadparm.c
index b83d66dfb4a8c91291ad2ab365ef2ee833a0728a..dbc4776bd8c3cdf73f674843885e5dcb0f61a196 100644 (file)
    Copyright (C) Jim McDonough (jmcd@us.ibm.com)  2003.
    Copyright (C) James Myers 2003 <myersjj@samba.org>
    Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
-   
+
    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/>.
 */
@@ -40,7 +40,7 @@
  * 3) add it to the list of available functions (eg: using FN_GLOBAL_STRING())
  * 4) If it's a global then initialise it in init_globals. If a local
  *    (ie. service) parameter then initialise it in the sDefault structure
- *  
+ *
  *
  * Notes:
  *   The configuration file is processed sequentially for speed. It is NOT
 
 #include "includes.h"
 #include "version.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 #include "system/time.h"
 #include "system/locale.h"
 #include "system/network.h" /* needed for TCP_NODELAY */
 #include "smb_server/smb_server.h"
 #include "libcli/raw/signing.h"
-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"
 #include "param/param.h"
 #include "param/loadparm.h"
-#include "pstring.h"
-
-static bool bLoaded = false;
+#include "libcli/raw/libcliraw.h"
 
 #define standard_sub_basic talloc_strdup
 
 static bool do_parameter(const char *, const char *, void *);
 static bool defaults_saved = false;
 
-struct param_opt {
-       struct param_opt *prev, *next;
-       char *key;
-       char *value;
-       int flags;
-};
-
-/* 
+/**
  * This structure describes global (ie., server-wide) parameters.
  */
-struct global
+struct loadparm_global
 {
        enum server_role server_role;
 
-       char **smb_ports;
+       const char **smb_ports;
        char *ncalrpc_dir;
+       char *dos_charset;
+       char *unix_charset;
+       char *display_charset;
        char *szLockDir;
        char *szModulesDir;
        char *szPidDir;
@@ -95,37 +89,37 @@ struct global
        char *szServerString;
        char *szAutoServices;
        char *szPasswdChat;
-       char *szConfigFile;
        char *szShareBackend;
        char *szSAM_URL;
+       char *szIDMAP_URL;
        char *szSECRETS_URL;
        char *szSPOOLSS_URL;
        char *szWINS_CONFIG_URL;
        char *szWINS_URL;
        char *szPrivateDir;
-       char **jsInclude;
-       char *jsonrpcServicesDir;
-       char **szPasswordServers;
+       const char **szPasswordServers;
        char *szSocketOptions;
        char *szRealm;
-       char **szWINSservers;
-       char **szInterfaces;
+       const char **szWINSservers;
+       const char **szInterfaces;
        char *szSocketAddress;
        char *szAnnounceVersion;        /* This is initialised in init_globals */
        char *szWorkgroup;
        char *szNetbiosName;
-       char **szNetbiosAliases;
+       const char **szNetbiosAliases;
        char *szNetbiosScope;
        char *szDomainOtherSIDs;
-       char **szNameResolveOrder;
-       char **dcerpc_ep_servers;
-       char **server_services;
+       const char **szNameResolveOrder;
+       const char **dcerpc_ep_servers;
+       const char **server_services;
        char *ntptr_providor;
        char *szWinbindSeparator;
+       char *szWinbinddPrivilegedSocketDirectory;
        char *szWinbinddSocketDirectory;
        char *szTemplateShell;
        char *szTemplateHomedir;
        int bWinbindSealedPipes;
+       int bIdmapTrustedOnly;
        char *swat_directory;
        int tls_enabled;
        char *tls_keyfile;
@@ -133,7 +127,10 @@ struct global
        char *tls_cafile;
        char *tls_crlfile;
        char *tls_dhpfile;
+       char *logfile;
+       char *panic_action;
        int max_mux;
+       int debuglevel;
        int max_xmit;
        int pwordlevel;
        int srv_maxprotocol;
@@ -154,7 +151,7 @@ struct global
        char *socket_options;
        int bWINSsupport;
        int bWINSdnsProxy;
-       char *szWINSHook; 
+       char *szWINSHook;
        int bLocalMaster;
        int bPreferredMaster;
        int bEncryptPasswords;
@@ -181,12 +178,13 @@ struct global
        int bUnixExtensions;
        int bDisableNetbios;
        int bRpcBigEndian;
+       char *szNTPSignDSocketDirectory;
        struct param_opt *param_opt;
 };
 
 
-/* 
- * This structure describes a single service. 
+/**
+ * This structure describes a single service.
  */
 struct loadparm_service
 {
@@ -212,6 +210,7 @@ struct loadparm_service
        int bMap_hidden;
        int bMap_archive;
        int bStrictLocking;
+       int bOplocks;
        int iCreate_mask;
        int iCreate_force_mode;
        int iDir_mask;
@@ -226,71 +225,20 @@ struct loadparm_service
 };
 
 
-/* This is a default service used to prime a services structure */
-static struct loadparm_service sDefault = {
-       NULL,                   /* szService */
-       NULL,                   /* szPath */
-       NULL,                   /* szCopy */
-       NULL,                   /* szInclude */
-       NULL,                   /* szPrintername */
-       NULL,                   /* szHostsallow */
-       NULL,                   /* szHostsdeny */
-       NULL,                   /* comment */
-       NULL,                   /* volume */
-       NULL,                   /* fstype */
-       NULL,                   /* ntvfs_handler */
-       1000,                   /* iMaxPrintJobs */
-       0,                      /* iMaxConnections */
-       0,                      /* iCSCPolicy */
-       true,                   /* bAvailable */
-       true,                   /* bBrowseable */
-       true,                   /* bRead_only */
-       false,                  /* bPrint_ok */
-       false,                  /* bMap_system */
-       false,                  /* bMap_hidden */
-       true,                   /* bMap_archive */
-       true,                   /* bStrictLocking */
-       0744,                   /* iCreate_mask */
-       0000,                   /* iCreate_force_mode */
-       0755,                   /* iDir_mask */
-       0000,                   /* iDir_force_mode */   
-       NULL,                   /* copymap */
-       false,                  /* bMSDfsRoot */
-       false,                  /* bStrictSync */
-       false,                  /* bCIFileSystem */
-       NULL,                   /* Parametric options */
-
-       ""                      /* dummy */
-};
-
-/* local variables */
-static struct loadparm_context {
-       struct global Globals;
-       struct loadparm_service **ServicePtrs;
-       int iNumServices;
-       struct loadparm_service *currentService;
-       bool bInGlobalSection;
-       struct file_lists {
-               struct file_lists *next;
-               char *name;
-               char *subfname;
-               time_t modtime;
-       } *file_lists;
-} loadparm = {
-       .iNumServices = 0,
-       .currentService = NULL,
-       .bInGlobalSection = true,
-       .ServicePtrs = NULL,
-       .file_lists = NULL,
-};
+struct loadparm_context *global_loadparm = NULL;
 
 #define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct))
 
+
 /* prototypes for the special type handlers */
-static bool handle_include(struct loadparm_context *lp_ctx, 
+static bool handle_include(struct loadparm_context *lp_ctx,
                           const char *pszParmValue, char **ptr);
-static bool handle_copy(struct loadparm_context *lp_ctx, 
+static bool handle_copy(struct loadparm_context *lp_ctx,
                        const char *pszParmValue, char **ptr);
+static bool handle_debuglevel(struct loadparm_context *lp_ctx,
+                             const char *pszParmValue, char **ptr);
+static bool handle_logfile(struct loadparm_context *lp_ctx,
+                          const char *pszParmValue, char **ptr);
 
 static const struct enum_list enum_protocol[] = {
        {PROTOCOL_SMB2, "SMB2"},
@@ -330,10 +278,12 @@ static const struct enum_list enum_bool_auto[] = {
 };
 
 /* 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
+enum csc_policy {
+       CSC_POLICY_MANUAL=0,
+       CSC_POLICY_DOCUMENTS=1,
+       CSC_POLICY_PROGRAMS=2,
+       CSC_POLICY_DISABLE=3
+};
 
 static const struct enum_list enum_csc_policy[] = {
        {CSC_POLICY_MANUAL, "manual"},
@@ -367,212 +317,209 @@ static const struct enum_list enum_smb_signing_vals[] = {
 static const struct enum_list enum_server_role[] = {
        {ROLE_STANDALONE, "standalone"},
        {ROLE_DOMAIN_MEMBER, "member server"},
+       {ROLE_DOMAIN_MEMBER, "member"},
        {ROLE_DOMAIN_CONTROLLER, "domain controller"},
+       {ROLE_DOMAIN_CONTROLLER, "dc"},
        {-1, NULL}
 };
 
 
-/* Note: We do not initialise the defaults union - it is not allowed in ANSI C
- *
- * Note: We have a flag called FLAG_DEVELOPER but is not used at this time, it
- * is implied in current control logic. This may change at some later time. A
- * flag value of 0 means - show as development option only.
- *
- * The FLAG_HIDE is explicit. Paramters set this way do NOT appear in any edit
- * screen in SWAT. This is used to exclude parameters as well as to squash all
- * parameters that have been duplicated by pseudonyms.
- */
+#define GLOBAL_VAR(name) offsetof(struct loadparm_global, name)
+#define LOCAL_VAR(name) offsetof(struct loadparm_service, name)
+
 static struct parm_struct parm_table[] = {
-       {"Base Options", P_SEP, P_SEPARATOR},
-
-       {"server role", P_ENUM, P_GLOBAL, &loadparm.Globals.server_role, NULL, enum_server_role, FLAG_BASIC},
-
-       {"dos charset", P_STRING, P_GLOBAL, &dos_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"unix charset", P_STRING, P_GLOBAL, &unix_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"ncalrpc dir", P_STRING, P_GLOBAL, &loadparm.Globals.ncalrpc_dir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"display charset", P_STRING, P_GLOBAL, &display_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
-       {"path", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
-       {"directory", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_HIDE},
-       {"workgroup", P_USTRING, P_GLOBAL, &loadparm.Globals.szWorkgroup, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"realm", P_STRING, P_GLOBAL, &loadparm.Globals.szRealm, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"netbios name", P_USTRING, P_GLOBAL, &loadparm.Globals.szNetbiosName, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"netbios aliases", P_LIST, P_GLOBAL, &loadparm.Globals.szNetbiosAliases, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"netbios scope", P_USTRING, P_GLOBAL, &loadparm.Globals.szNetbiosScope, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"server string", P_STRING, P_GLOBAL, &loadparm.Globals.szServerString, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED  | FLAG_DEVELOPER},
-       {"interfaces", P_LIST, P_GLOBAL, &loadparm.Globals.szInterfaces, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"bind interfaces only", P_BOOL, P_GLOBAL, &loadparm.Globals.bBindInterfacesOnly, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"ntvfs handler", P_LIST, P_LOCAL, &sDefault.ntvfs_handler, NULL, NULL, FLAG_ADVANCED},
-       {"ntptr providor", P_STRING, P_GLOBAL, &loadparm.Globals.ntptr_providor, NULL, NULL, FLAG_ADVANCED},
-       {"dcerpc endpoint servers", P_LIST, P_GLOBAL, &loadparm.Globals.dcerpc_ep_servers, NULL, NULL, FLAG_ADVANCED},
-       {"server services", P_LIST, P_GLOBAL, &loadparm.Globals.server_services, NULL, NULL, FLAG_ADVANCED},
-
-       {"Security Options", P_SEP, P_SEPARATOR},
-       
-       {"security", P_ENUM, P_GLOBAL, &loadparm.Globals.security, NULL, enum_security, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"encrypt passwords", P_BOOL, P_GLOBAL, &loadparm.Globals.bEncryptPasswords, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"null passwords", P_BOOL, P_GLOBAL, &loadparm.Globals.bNullPasswords, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"obey pam restrictions", P_BOOL, P_GLOBAL, &loadparm.Globals.bObeyPamRestrictions, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"password server", P_LIST, P_GLOBAL, &loadparm.Globals.szPasswordServers, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"sam database", P_STRING, P_GLOBAL, &loadparm.Globals.szSAM_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"secrets database", P_STRING, P_GLOBAL, &loadparm.Globals.szSECRETS_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"spoolss database", P_STRING, P_GLOBAL, &loadparm.Globals.szSPOOLSS_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"wins config database", P_STRING, P_GLOBAL, &loadparm.Globals.szWINS_CONFIG_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"wins database", P_STRING, P_GLOBAL, &loadparm.Globals.szWINS_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"private dir", P_STRING, P_GLOBAL, &loadparm.Globals.szPrivateDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"passwd chat", P_STRING, P_GLOBAL, &loadparm.Globals.szPasswdChat, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"password level", P_INTEGER, P_GLOBAL, &loadparm.Globals.pwordlevel, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"lanman auth", P_BOOL, P_GLOBAL, &loadparm.Globals.bLanmanAuth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"ntlm auth", P_BOOL, P_GLOBAL, &loadparm.Globals.bNTLMAuth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"client NTLMv2 auth", P_BOOL, P_GLOBAL, &loadparm.Globals.bClientNTLMv2Auth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"client lanman auth", P_BOOL, P_GLOBAL, &loadparm.Globals.bClientLanManAuth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"client plaintext auth", P_BOOL, P_GLOBAL, &loadparm.Globals.bClientPlaintextAuth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"client use spnego principal", P_BOOL, P_GLOBAL, &loadparm.Globals.client_use_spnego_principal, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       
-       {"read only", P_BOOL, P_LOCAL, &sDefault.bRead_only, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE},
-
-       {"create mask", P_OCTAL, P_LOCAL, &sDefault.iCreate_mask, NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE}, 
-       {"force create mode", P_OCTAL, P_LOCAL, &sDefault.iCreate_force_mode, NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE}, 
-       {"directory mask", P_OCTAL, P_LOCAL, &sDefault.iDir_mask, NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE}, 
-       {"force directory mode", P_OCTAL, P_LOCAL, &sDefault.iDir_force_mode, NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE}, 
-
-       {"hosts allow", P_LIST, P_LOCAL, &sDefault.szHostsallow, NULL, NULL, FLAG_GLOBAL | FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
-       {"hosts deny", P_LIST, P_LOCAL, &sDefault.szHostsdeny, NULL, NULL, FLAG_GLOBAL | FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
-
-       {"Logging Options", P_SEP, P_SEPARATOR},
-
-       {"log level", P_INTEGER, P_GLOBAL, &DEBUGLEVEL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"debuglevel", P_INTEGER, P_GLOBAL, &DEBUGLEVEL, NULL, NULL, FLAG_HIDE},
-       {"log file", P_STRING, P_GLOBAL, &logfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       
-       {"Protocol Options", P_SEP, P_SEPARATOR},
-       
-       {"smb ports", P_LIST, P_GLOBAL, &loadparm.Globals.smb_ports, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"nbt port", P_INTEGER, P_GLOBAL, &loadparm.Globals.nbt_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"dgram port", P_INTEGER, P_GLOBAL, &loadparm.Globals.dgram_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"cldap port", P_INTEGER, P_GLOBAL, &loadparm.Globals.cldap_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"krb5 port", P_INTEGER, P_GLOBAL, &loadparm.Globals.krb5_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"kpasswd port", P_INTEGER, P_GLOBAL, &loadparm.Globals.kpasswd_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"web port", P_INTEGER, P_GLOBAL, &loadparm.Globals.web_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"tls enabled", P_BOOL, P_GLOBAL, &loadparm.Globals.tls_enabled, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"tls keyfile", P_STRING, P_GLOBAL, &loadparm.Globals.tls_keyfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"tls certfile", P_STRING, P_GLOBAL, &loadparm.Globals.tls_certfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"tls cafile", P_STRING, P_GLOBAL, &loadparm.Globals.tls_cafile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"tls crlfile", P_STRING, P_GLOBAL, &loadparm.Globals.tls_crlfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"tls dh params file", P_STRING, P_GLOBAL, &loadparm.Globals.tls_dhpfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"swat directory", P_STRING, P_GLOBAL, &loadparm.Globals.swat_directory, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"large readwrite", P_BOOL, P_GLOBAL, &loadparm.Globals.bLargeReadwrite, NULL, NULL, FLAG_DEVELOPER},
-       {"server max protocol", P_ENUM, P_GLOBAL, &loadparm.Globals.srv_maxprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
-       {"server min protocol", P_ENUM, P_GLOBAL, &loadparm.Globals.srv_minprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
-       {"client max protocol", P_ENUM, P_GLOBAL, &loadparm.Globals.cli_maxprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
-       {"client min protocol", P_ENUM, P_GLOBAL, &loadparm.Globals.cli_minprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
-       {"unicode", P_BOOL, P_GLOBAL, &loadparm.Globals.bUnicode, NULL, NULL, FLAG_DEVELOPER},
-       {"read raw", P_BOOL, P_GLOBAL, &loadparm.Globals.bReadRaw, NULL, NULL, FLAG_DEVELOPER},
-       {"write raw", P_BOOL, P_GLOBAL, &loadparm.Globals.bWriteRaw, NULL, NULL, FLAG_DEVELOPER},
-       {"disable netbios", P_BOOL, P_GLOBAL, &loadparm.Globals.bDisableNetbios, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       
-       {"nt status support", P_BOOL, P_GLOBAL, &loadparm.Globals.bNTStatusSupport, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-
-       {"announce version", P_STRING, P_GLOBAL, &loadparm.Globals.szAnnounceVersion, NULL, NULL, FLAG_DEVELOPER},
-       {"announce as", P_ENUM, P_GLOBAL, &loadparm.Globals.announce_as, NULL, enum_announce_as, FLAG_DEVELOPER},
-       {"max mux", P_INTEGER, P_GLOBAL, &loadparm.Globals.max_mux, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"max xmit", P_BYTES, P_GLOBAL, &loadparm.Globals.max_xmit, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-
-       {"name resolve order", P_LIST, P_GLOBAL, &loadparm.Globals.szNameResolveOrder, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"max wins ttl", P_INTEGER, P_GLOBAL, &loadparm.Globals.max_wins_ttl, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"min wins ttl", P_INTEGER, P_GLOBAL, &loadparm.Globals.min_wins_ttl, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"time server", P_BOOL, P_GLOBAL, &loadparm.Globals.bTimeServer, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"unix extensions", P_BOOL, P_GLOBAL, &loadparm.Globals.bUnixExtensions, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"use spnego", P_BOOL, P_GLOBAL, &loadparm.Globals.bUseSpnego, NULL, NULL, FLAG_DEVELOPER},
-       {"server signing", P_ENUM, P_GLOBAL, &loadparm.Globals.server_signing, NULL, enum_smb_signing_vals, FLAG_ADVANCED}, 
-       {"client signing", P_ENUM, P_GLOBAL, &loadparm.Globals.client_signing, NULL, enum_smb_signing_vals, FLAG_ADVANCED}, 
-       {"rpc big endian", P_BOOL, P_GLOBAL, &loadparm.Globals.bRpcBigEndian, NULL, NULL, FLAG_DEVELOPER},
-
-       {"Tuning Options", P_SEP, P_SEPARATOR},
-               
-       {"max connections", P_INTEGER, P_LOCAL, &sDefault.iMaxConnections, NULL, NULL, FLAG_SHARE},
-       {"paranoid server security", P_BOOL, P_GLOBAL, &loadparm.Globals.paranoid_server_security, NULL, NULL, FLAG_DEVELOPER},
-       {"socket options", P_STRING, P_GLOBAL, &loadparm.Globals.socket_options, NULL, NULL, FLAG_DEVELOPER},
-
-       {"strict sync", P_BOOL, P_LOCAL, &sDefault.bStrictSync, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE}, 
-       {"case insensitive filesystem", P_BOOL, P_LOCAL, &sDefault.bCIFileSystem, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE}, 
-
-       {"Printing Options", P_SEP, P_SEPARATOR},
-       
-       {"max print jobs", P_INTEGER, P_LOCAL, &sDefault.iMaxPrintJobs, NULL, NULL, FLAG_PRINT},
-       {"printable", P_BOOL, P_LOCAL, &sDefault.bPrint_ok, NULL, NULL, FLAG_PRINT},
-       {"print ok", P_BOOL, P_LOCAL, &sDefault.bPrint_ok, NULL, NULL, FLAG_HIDE},
-       
-       {"printer name", P_STRING, P_LOCAL, &sDefault.szPrintername, NULL, NULL, FLAG_PRINT},
-       {"printer", P_STRING, P_LOCAL, &sDefault.szPrintername, NULL, NULL, FLAG_HIDE},
-
-       {"Filename Handling", P_SEP, P_SEPARATOR},
-       
-       {"map system", P_BOOL, P_LOCAL, &sDefault.bMap_system, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"map hidden", P_BOOL, P_LOCAL, &sDefault.bMap_hidden, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"map archive", P_BOOL, P_LOCAL, &sDefault.bMap_archive, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-
-       {"Domain Options", P_SEP, P_SEPARATOR},
-       
-       {"Logon Options", P_SEP, P_SEPARATOR},
-
-
-       {"Browse Options", P_SEP, P_SEPARATOR},
-       
-       {"preferred master", P_ENUM, P_GLOBAL, &loadparm.Globals.bPreferredMaster, NULL, enum_bool_auto, FLAG_BASIC | FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"prefered master", P_ENUM, P_GLOBAL, &loadparm.Globals.bPreferredMaster, NULL, enum_bool_auto, FLAG_HIDE},
-       {"local master", P_BOOL, P_GLOBAL, &loadparm.Globals.bLocalMaster, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"browseable", P_BOOL, P_LOCAL, &sDefault.bBrowseable, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
-       {"browsable", P_BOOL, P_LOCAL, &sDefault.bBrowseable, NULL, NULL, FLAG_HIDE},
-
-       {"WINS Options", P_SEP, P_SEPARATOR},
-       
-       {"wins server", P_LIST, P_GLOBAL, &loadparm.Globals.szWINSservers, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"wins support", P_BOOL, P_GLOBAL, &loadparm.Globals.bWINSsupport, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"dns proxy", P_BOOL, P_GLOBAL, &loadparm.Globals.bWINSdnsProxy, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"wins hook", P_STRING, P_GLOBAL, &loadparm.Globals.szWINSHook, NULL, NULL, FLAG_ADVANCED}, 
-
-       {"Locking Options", P_SEP, P_SEPARATOR},
-       
-       {"csc policy", P_ENUM, P_LOCAL, &sDefault.iCSCPolicy, NULL, enum_csc_policy, FLAG_SHARE | FLAG_GLOBAL},
-       
-       {"strict locking", P_BOOL, P_LOCAL, &sDefault.bStrictLocking, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-
-       {"Miscellaneous Options", P_SEP, P_SEPARATOR},
-       
-       {"config file", P_STRING, P_GLOBAL, &loadparm.Globals.szConfigFile, NULL, NULL, FLAG_HIDE},
-       {"share backend", P_STRING, P_GLOBAL, &loadparm.Globals.szShareBackend, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"preload", P_STRING, P_GLOBAL, &loadparm.Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"auto services", P_STRING, P_GLOBAL, &loadparm.Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"lock dir", P_STRING, P_GLOBAL, &loadparm.Globals.szLockDir, NULL, NULL, FLAG_HIDE}, 
-       {"lock directory", P_STRING, P_GLOBAL, &loadparm.Globals.szLockDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"modules dir", P_STRING, P_GLOBAL, &loadparm.Globals.szModulesDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"pid directory", P_STRING, P_GLOBAL, &loadparm.Globals.szPidDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, 
-       {"js include", P_LIST, P_GLOBAL, &loadparm.Globals.jsInclude, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"setup directory", P_STRING, P_GLOBAL, &loadparm.Globals.szSetupDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       
-       {"socket address", P_STRING, P_GLOBAL, &loadparm.Globals.szSocketAddress, NULL, NULL, FLAG_DEVELOPER},
-       {"copy", P_STRING, P_LOCAL, &sDefault.szCopy, handle_copy, NULL, FLAG_HIDE},
-       {"include", P_STRING, P_LOCAL, &sDefault.szInclude, handle_include, NULL, FLAG_HIDE},
-       
-       {"available", P_BOOL, P_LOCAL, &sDefault.bAvailable, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT},
-       {"volume", P_STRING, P_LOCAL, &sDefault.volume, NULL, NULL, FLAG_SHARE },
-       {"fstype", P_STRING, P_LOCAL, &sDefault.fstype, NULL, NULL, FLAG_SHARE},
-
-       {"panic action", P_STRING, P_GLOBAL, &panic_action, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-
-       {"msdfs root", P_BOOL, P_LOCAL, &sDefault.bMSDfsRoot, NULL, NULL, FLAG_SHARE},
-       {"host msdfs", P_BOOL, P_GLOBAL, &loadparm.Globals.bHostMSDfs, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"winbind separator", P_STRING, P_GLOBAL, &loadparm.Globals.szWinbindSeparator, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER },
-       {"winbindd socket directory", P_STRING, P_GLOBAL, &loadparm.Globals.szWinbinddSocketDirectory, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER },
-       {"winbind sealed pipes", P_BOOL, P_GLOBAL, &loadparm.Globals.bWinbindSealedPipes, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER },
-       {"template shell", P_STRING, P_GLOBAL, &loadparm.Globals.szTemplateShell, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER },
-       {"template homedir", P_STRING, P_GLOBAL, &loadparm.Globals.szTemplateHomedir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER },
-
-       {NULL, P_BOOL, P_NONE, NULL, NULL, NULL, 0}
+       {"server role", P_ENUM, P_GLOBAL, GLOBAL_VAR(server_role), NULL, enum_server_role},
+
+       {"dos charset", P_STRING, P_GLOBAL, GLOBAL_VAR(dos_charset), NULL, NULL},
+       {"unix charset", P_STRING, P_GLOBAL, GLOBAL_VAR(unix_charset), NULL, NULL},
+       {"ncalrpc dir", P_STRING, P_GLOBAL, GLOBAL_VAR(ncalrpc_dir), NULL, NULL},
+       {"display charset", P_STRING, P_GLOBAL, GLOBAL_VAR(display_charset), NULL, NULL},
+       {"comment", P_STRING, P_LOCAL, LOCAL_VAR(comment), NULL, NULL},
+       {"path", P_STRING, P_LOCAL, LOCAL_VAR(szPath), NULL, NULL},
+       {"directory", P_STRING, P_LOCAL, LOCAL_VAR(szPath), NULL, NULL},
+       {"workgroup", P_USTRING, P_GLOBAL, GLOBAL_VAR(szWorkgroup), NULL, NULL},
+       {"realm", P_STRING, P_GLOBAL, GLOBAL_VAR(szRealm), NULL, NULL},
+       {"netbios name", P_USTRING, P_GLOBAL, GLOBAL_VAR(szNetbiosName), NULL, NULL},
+       {"netbios aliases", P_LIST, P_GLOBAL, GLOBAL_VAR(szNetbiosAliases), NULL, NULL},
+       {"netbios scope", P_USTRING, P_GLOBAL, GLOBAL_VAR(szNetbiosScope), NULL, NULL},
+       {"server string", P_STRING, P_GLOBAL, GLOBAL_VAR(szServerString), NULL, NULL},
+       {"interfaces", P_LIST, P_GLOBAL, GLOBAL_VAR(szInterfaces), NULL, NULL},
+       {"bind interfaces only", P_BOOL, P_GLOBAL, GLOBAL_VAR(bBindInterfacesOnly), NULL, NULL},
+       {"ntvfs handler", P_LIST, P_LOCAL, LOCAL_VAR(ntvfs_handler), NULL, NULL},
+       {"ntptr providor", P_STRING, P_GLOBAL, GLOBAL_VAR(ntptr_providor), NULL, NULL},
+       {"dcerpc endpoint servers", P_LIST, P_GLOBAL, GLOBAL_VAR(dcerpc_ep_servers), NULL, NULL},
+       {"server services", P_LIST, P_GLOBAL, GLOBAL_VAR(server_services), NULL, NULL},
+
+       {"security", P_ENUM, P_GLOBAL, GLOBAL_VAR(security), NULL, enum_security},
+       {"encrypt passwords", P_BOOL, P_GLOBAL, GLOBAL_VAR(bEncryptPasswords), NULL, NULL},
+       {"null passwords", P_BOOL, P_GLOBAL, GLOBAL_VAR(bNullPasswords), NULL, NULL},
+       {"obey pam restrictions", P_BOOL, P_GLOBAL, GLOBAL_VAR(bObeyPamRestrictions), NULL, NULL},
+       {"password server", P_LIST, P_GLOBAL, GLOBAL_VAR(szPasswordServers), NULL, NULL},
+       {"sam database", P_STRING, P_GLOBAL, GLOBAL_VAR(szSAM_URL), NULL, NULL},
+       {"idmap database", P_STRING, P_GLOBAL, GLOBAL_VAR(szIDMAP_URL), NULL, NULL},
+       {"secrets database", P_STRING, P_GLOBAL, GLOBAL_VAR(szSECRETS_URL), NULL, NULL},
+       {"spoolss database", P_STRING, P_GLOBAL, GLOBAL_VAR(szSPOOLSS_URL), NULL, NULL},
+       {"wins config database", P_STRING, P_GLOBAL, GLOBAL_VAR(szWINS_CONFIG_URL), NULL, NULL},
+       {"wins database", P_STRING, P_GLOBAL, GLOBAL_VAR(szWINS_URL), NULL, NULL},
+       {"private dir", P_STRING, P_GLOBAL, GLOBAL_VAR(szPrivateDir), NULL, NULL},
+       {"passwd chat", P_STRING, P_GLOBAL, GLOBAL_VAR(szPasswdChat), NULL, NULL},
+       {"password level", P_INTEGER, P_GLOBAL, GLOBAL_VAR(pwordlevel), NULL, NULL},
+       {"lanman auth", P_BOOL, P_GLOBAL, GLOBAL_VAR(bLanmanAuth), NULL, NULL},
+       {"ntlm auth", P_BOOL, P_GLOBAL, GLOBAL_VAR(bNTLMAuth), NULL, NULL},
+       {"client NTLMv2 auth", P_BOOL, P_GLOBAL, GLOBAL_VAR(bClientNTLMv2Auth), NULL, NULL},
+       {"client lanman auth", P_BOOL, P_GLOBAL, GLOBAL_VAR(bClientLanManAuth), NULL, NULL},
+       {"client plaintext auth", P_BOOL, P_GLOBAL, GLOBAL_VAR(bClientPlaintextAuth), NULL, NULL},
+       {"client use spnego principal", P_BOOL, P_GLOBAL, GLOBAL_VAR(client_use_spnego_principal), NULL, NULL},
+
+       {"read only", P_BOOL, P_LOCAL, LOCAL_VAR(bRead_only), NULL, NULL},
+
+       {"create mask", P_OCTAL, P_LOCAL, LOCAL_VAR(iCreate_mask), NULL, NULL},
+       {"force create mode", P_OCTAL, P_LOCAL, LOCAL_VAR(iCreate_force_mode), NULL, NULL}, 
+       {"directory mask", P_OCTAL, P_LOCAL, LOCAL_VAR(iDir_mask), NULL, NULL},
+       {"force directory mode", P_OCTAL, P_LOCAL, LOCAL_VAR(iDir_force_mode), NULL, NULL}, 
+
+       {"hosts allow", P_LIST, P_LOCAL, LOCAL_VAR(szHostsallow), NULL, NULL},
+       {"hosts deny", P_LIST, P_LOCAL, LOCAL_VAR(szHostsdeny), NULL, NULL},
+
+       {"log level", P_INTEGER, P_GLOBAL, GLOBAL_VAR(debuglevel), handle_debuglevel, NULL},
+       {"debuglevel", P_INTEGER, P_GLOBAL, GLOBAL_VAR(debuglevel), handle_debuglevel, NULL},
+       {"log file", P_STRING, P_GLOBAL, GLOBAL_VAR(logfile), handle_logfile, NULL},
+
+       {"smb ports", P_LIST, P_GLOBAL, GLOBAL_VAR(smb_ports), NULL, NULL},
+       {"nbt port", P_INTEGER, P_GLOBAL, GLOBAL_VAR(nbt_port), NULL, NULL},
+       {"dgram port", P_INTEGER, P_GLOBAL, GLOBAL_VAR(dgram_port), NULL, NULL},
+       {"cldap port", P_INTEGER, P_GLOBAL, GLOBAL_VAR(cldap_port), NULL, NULL},
+       {"krb5 port", P_INTEGER, P_GLOBAL, GLOBAL_VAR(krb5_port), NULL, NULL},
+       {"kpasswd port", P_INTEGER, P_GLOBAL, GLOBAL_VAR(kpasswd_port), NULL, NULL},
+       {"web port", P_INTEGER, P_GLOBAL, GLOBAL_VAR(web_port), NULL, NULL},
+       {"tls enabled", P_BOOL, P_GLOBAL, GLOBAL_VAR(tls_enabled), NULL, NULL},
+       {"tls keyfile", P_STRING, P_GLOBAL, GLOBAL_VAR(tls_keyfile), NULL, NULL},
+       {"tls certfile", P_STRING, P_GLOBAL, GLOBAL_VAR(tls_certfile), NULL, NULL},
+       {"tls cafile", P_STRING, P_GLOBAL, GLOBAL_VAR(tls_cafile), NULL, NULL},
+       {"tls crlfile", P_STRING, P_GLOBAL, GLOBAL_VAR(tls_crlfile), NULL, NULL},
+       {"tls dh params file", P_STRING, P_GLOBAL, GLOBAL_VAR(tls_dhpfile), NULL, NULL},
+       {"swat directory", P_STRING, P_GLOBAL, GLOBAL_VAR(swat_directory), NULL, NULL},
+       {"large readwrite", P_BOOL, P_GLOBAL, GLOBAL_VAR(bLargeReadwrite), NULL, NULL},
+       {"server max protocol", P_ENUM, P_GLOBAL, GLOBAL_VAR(srv_maxprotocol), NULL, enum_protocol},
+       {"server min protocol", P_ENUM, P_GLOBAL, GLOBAL_VAR(srv_minprotocol), NULL, enum_protocol},
+       {"client max protocol", P_ENUM, P_GLOBAL, GLOBAL_VAR(cli_maxprotocol), NULL, enum_protocol},
+       {"client min protocol", P_ENUM, P_GLOBAL, GLOBAL_VAR(cli_minprotocol), NULL, enum_protocol},
+       {"unicode", P_BOOL, P_GLOBAL, GLOBAL_VAR(bUnicode), NULL, NULL},
+       {"read raw", P_BOOL, P_GLOBAL, GLOBAL_VAR(bReadRaw), NULL, NULL},
+       {"write raw", P_BOOL, P_GLOBAL, GLOBAL_VAR(bWriteRaw), NULL, NULL},
+       {"disable netbios", P_BOOL, P_GLOBAL, GLOBAL_VAR(bDisableNetbios), NULL, NULL},
+
+       {"nt status support", P_BOOL, P_GLOBAL, GLOBAL_VAR(bNTStatusSupport), NULL, NULL},
+
+       {"announce version", P_STRING, P_GLOBAL, GLOBAL_VAR(szAnnounceVersion), NULL, NULL},
+       {"announce as", P_ENUM, P_GLOBAL, GLOBAL_VAR(announce_as), NULL, enum_announce_as},
+       {"max mux", P_INTEGER, P_GLOBAL, GLOBAL_VAR(max_mux), NULL, NULL},
+       {"max xmit", P_BYTES, P_GLOBAL, GLOBAL_VAR(max_xmit), NULL, NULL},
+
+       {"name resolve order", P_LIST, P_GLOBAL, GLOBAL_VAR(szNameResolveOrder), NULL, NULL},
+       {"max wins ttl", P_INTEGER, P_GLOBAL, GLOBAL_VAR(max_wins_ttl), NULL, NULL},
+       {"min wins ttl", P_INTEGER, P_GLOBAL, GLOBAL_VAR(min_wins_ttl), NULL, NULL},
+       {"time server", P_BOOL, P_GLOBAL, GLOBAL_VAR(bTimeServer), NULL, NULL},
+       {"unix extensions", P_BOOL, P_GLOBAL, GLOBAL_VAR(bUnixExtensions), NULL, NULL},
+       {"use spnego", P_BOOL, P_GLOBAL, GLOBAL_VAR(bUseSpnego), NULL, NULL},
+       {"server signing", P_ENUM, P_GLOBAL, GLOBAL_VAR(server_signing), NULL, enum_smb_signing_vals}, 
+       {"client signing", P_ENUM, P_GLOBAL, GLOBAL_VAR(client_signing), NULL, enum_smb_signing_vals}, 
+       {"rpc big endian", P_BOOL, P_GLOBAL, GLOBAL_VAR(bRpcBigEndian), NULL, NULL},
+
+       {"max connections", P_INTEGER, P_LOCAL, LOCAL_VAR(iMaxConnections), NULL, NULL},
+       {"paranoid server security", P_BOOL, P_GLOBAL, GLOBAL_VAR(paranoid_server_security), NULL, NULL},
+       {"socket options", P_STRING, P_GLOBAL, GLOBAL_VAR(socket_options), NULL, NULL},
+
+       {"strict sync", P_BOOL, P_LOCAL, LOCAL_VAR(bStrictSync), NULL, NULL},
+       {"case insensitive filesystem", P_BOOL, P_LOCAL, LOCAL_VAR(bCIFileSystem), NULL, NULL}, 
+
+       {"max print jobs", P_INTEGER, P_LOCAL, LOCAL_VAR(iMaxPrintJobs), NULL, NULL},
+       {"printable", P_BOOL, P_LOCAL, LOCAL_VAR(bPrint_ok), NULL, NULL},
+       {"print ok", P_BOOL, P_LOCAL, LOCAL_VAR(bPrint_ok), NULL, NULL},
+
+       {"printer name", P_STRING, P_LOCAL, LOCAL_VAR(szPrintername), NULL, NULL},
+       {"printer", P_STRING, P_LOCAL, LOCAL_VAR(szPrintername), NULL, NULL},
+
+       {"map system", P_BOOL, P_LOCAL, LOCAL_VAR(bMap_system), NULL, NULL},
+       {"map hidden", P_BOOL, P_LOCAL, LOCAL_VAR(bMap_hidden), NULL, NULL},
+       {"map archive", P_BOOL, P_LOCAL, LOCAL_VAR(bMap_archive), NULL, NULL},
+
+       {"preferred master", P_ENUM, P_GLOBAL, GLOBAL_VAR(bPreferredMaster), NULL, enum_bool_auto},
+       {"prefered master", P_ENUM, P_GLOBAL, GLOBAL_VAR(bPreferredMaster), NULL, enum_bool_auto},
+       {"local master", P_BOOL, P_GLOBAL, GLOBAL_VAR(bLocalMaster), NULL, NULL},
+       {"browseable", P_BOOL, P_LOCAL, LOCAL_VAR(bBrowseable), NULL, NULL},
+       {"browsable", P_BOOL, P_LOCAL, LOCAL_VAR(bBrowseable), NULL, NULL},
+
+       {"wins server", P_LIST, P_GLOBAL, GLOBAL_VAR(szWINSservers), NULL, NULL},
+       {"wins support", P_BOOL, P_GLOBAL, GLOBAL_VAR(bWINSsupport), NULL, NULL},
+       {"dns proxy", P_BOOL, P_GLOBAL, GLOBAL_VAR(bWINSdnsProxy), NULL, NULL},
+       {"wins hook", P_STRING, P_GLOBAL, GLOBAL_VAR(szWINSHook), NULL, NULL}, 
+
+       {"csc policy", P_ENUM, P_LOCAL, LOCAL_VAR(iCSCPolicy), NULL, enum_csc_policy},
+
+       {"strict locking", P_BOOL, P_LOCAL, LOCAL_VAR(bStrictLocking), NULL, NULL},
+       {"oplocks", P_BOOL, P_LOCAL, LOCAL_VAR(bOplocks), NULL, NULL},
+
+       {"share backend", P_STRING, P_GLOBAL, GLOBAL_VAR(szShareBackend), NULL, NULL},
+       {"preload", P_STRING, P_GLOBAL, GLOBAL_VAR(szAutoServices), NULL, NULL},
+       {"auto services", P_STRING, P_GLOBAL, GLOBAL_VAR(szAutoServices), NULL, NULL},
+       {"lock dir", P_STRING, P_GLOBAL, GLOBAL_VAR(szLockDir), NULL, NULL}, 
+       {"lock directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szLockDir), NULL, NULL},
+       {"modules dir", P_STRING, P_GLOBAL, GLOBAL_VAR(szModulesDir), NULL, NULL},
+       {"pid directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szPidDir), NULL, NULL}, 
+       {"setup directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szSetupDir), NULL, NULL},
+
+       {"socket address", P_STRING, P_GLOBAL, GLOBAL_VAR(szSocketAddress), NULL, NULL},
+       {"copy", P_STRING, P_LOCAL, LOCAL_VAR(szCopy), handle_copy, NULL},
+       {"include", P_STRING, P_LOCAL, LOCAL_VAR(szInclude), handle_include, NULL},
+
+       {"available", P_BOOL, P_LOCAL, LOCAL_VAR(bAvailable), NULL, NULL},
+       {"volume", P_STRING, P_LOCAL, LOCAL_VAR(volume), NULL, NULL },
+       {"fstype", P_STRING, P_LOCAL, LOCAL_VAR(fstype), NULL, NULL},
+
+       {"panic action", P_STRING, P_GLOBAL, GLOBAL_VAR(panic_action), NULL, NULL},
+
+       {"msdfs root", P_BOOL, P_LOCAL, LOCAL_VAR(bMSDfsRoot), NULL, NULL},
+       {"host msdfs", P_BOOL, P_GLOBAL, GLOBAL_VAR(bHostMSDfs), NULL, NULL},
+       {"winbind separator", P_STRING, P_GLOBAL, GLOBAL_VAR(szWinbindSeparator), NULL, NULL },
+       {"winbindd socket directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szWinbinddSocketDirectory), NULL, NULL },
+       {"winbindd privileged socket directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szWinbinddPrivilegedSocketDirectory), NULL, NULL },
+       {"winbind sealed pipes", P_BOOL, P_GLOBAL, GLOBAL_VAR(bWinbindSealedPipes), NULL, NULL },
+       {"template shell", P_STRING, P_GLOBAL, GLOBAL_VAR(szTemplateShell), NULL, NULL },
+       {"template homedir", P_STRING, P_GLOBAL, GLOBAL_VAR(szTemplateHomedir), NULL, NULL },
+       {"idmap trusted only", P_BOOL, P_GLOBAL, GLOBAL_VAR(bIdmapTrustedOnly), NULL, NULL},
+
+       {"ntp signd socket directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szNTPSignDSocketDirectory), NULL, NULL },
+
+       {NULL, P_BOOL, P_NONE, 0, NULL, NULL}
+};
+
+
+/* local variables */
+struct loadparm_context {
+       const char *szConfigFile;
+       struct loadparm_global *globals;
+       struct loadparm_service **services;
+       struct loadparm_service *sDefault;
+       int iNumServices;
+       struct loadparm_service *currentService;
+       bool bInGlobalSection;
+       struct file_lists {
+               struct file_lists *next;
+               char *name;
+               char *subfname;
+               time_t modtime;
+       } *file_lists;
+       unsigned int flags[NUMPARAMETERS];
+       struct smb_iconv_convenience *iconv_convenience;
 };
 
 
+struct loadparm_service *lp_default_service(struct loadparm_context *lp_ctx)
+{
+       return lp_ctx->sDefault;
+}
+
 /*
   return the parameter table
 */
@@ -581,25 +528,13 @@ struct parm_struct *lp_parm_table(void)
        return parm_table;
 }
 
-static TALLOC_CTX *lp_talloc;
-
-/******************************************************************* a
- Free up temporary memory - called from the main loop.
-********************************************************************/
-
-void lp_talloc_free(void)
-{
-       if (!lp_talloc)
-               return;
-       talloc_free(lp_talloc);
-       lp_talloc = NULL;
-}
-
-/*******************************************************************
- Convenience routine to grab string parameters into temporary memory
- and run standard_sub_basic on them. The buffers can be written to by
- callers without affecting the source string.
-********************************************************************/
+/**
+ * Convenience routine to grab string parameters into temporary memory
+ * and run standard_sub_basic on them.
+ *
+ * The buffers can be written to by
+ * callers without affecting the source string.
+ */
 
 static const char *lp_string(const char *s)
 {
@@ -643,130 +578,132 @@ static const char *lp_string(const char *s)
 }
 
 /*
-   In this section all the functions that are used to access the 
-   parameters from the rest of the program are defined 
+   In this section all the functions that are used to access the
+   parameters from the rest of the program are defined
 */
 
-#define FN_GLOBAL_STRING(fn_name,ptr) \
- const char *fn_name(void) {return(lp_string(*(char **)(ptr) ? *(char **)(ptr) : ""));}
-#define FN_GLOBAL_CONST_STRING(fn_name,ptr) \
- const char *fn_name(void) {return(*(const char **)(ptr) ? *(const char **)(ptr) : "");}
-#define FN_GLOBAL_LIST(fn_name,ptr) \
- const char **fn_name(void) {return(*(const char ***)(ptr));}
-#define FN_GLOBAL_BOOL(fn_name,ptr) \
- bool fn_name(void) {return((bool)*(int *)(ptr));}
+#define FN_GLOBAL_STRING(fn_name,var_name) \
+ const char *fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name ? lp_string(lp_ctx->globals->var_name) : "";}
+#define FN_GLOBAL_CONST_STRING(fn_name,var_name) \
+ const char *fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name ? lp_ctx->globals->var_name : "";}
+#define FN_GLOBAL_LIST(fn_name,var_name) \
+ const char **fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name;}
+#define FN_GLOBAL_BOOL(fn_name,var_name) \
+ bool fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return false; return lp_ctx->globals->var_name;}
 #if 0 /* unused */
 #define FN_GLOBAL_CHAR(fn_name,ptr) \
  char fn_name(void) {return(*(char *)(ptr));}
 #endif
-#define FN_GLOBAL_INTEGER(fn_name,ptr) \
- int fn_name(void) {return(*(int *)(ptr));}
+#define FN_GLOBAL_INTEGER(fn_name,var_name) \
+ int fn_name(struct loadparm_context *lp_ctx) {return lp_ctx->globals->var_name;}
 
 #define FN_LOCAL_STRING(fn_name,val) \
- const char *fn_name(struct loadparm_service *service) {return(lp_string((const char *)((service != NULL && service->val != NULL) ? service->val : sDefault.val)));}
-#define FN_LOCAL_CONST_STRING(fn_name,val) \
- const char *fn_name(struct loadparm_service *service) {return (const char *)(service != NULL && service->val != NULL) ? service->val : sDefault.val;}
+ const char *fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return(lp_string((const char *)((service != NULL && service->val != NULL) ? service->val : sDefault->val)));}
 #define FN_LOCAL_LIST(fn_name,val) \
- const char **fn_name(struct loadparm_service *service) {return(const char **)(service != NULL && service->val != NULL? service->val : sDefault.val);}
+ const char **fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return(const char **)(service != NULL && service->val != NULL? service->val : sDefault->val);}
 #define FN_LOCAL_BOOL(fn_name,val) \
- bool fn_name(struct loadparm_service *service) {return((service != NULL)? service->val : sDefault.val);}
+ bool fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return((service != NULL)? service->val : sDefault->val);}
 #define FN_LOCAL_INTEGER(fn_name,val) \
- int fn_name(struct loadparm_service *service) {return((service != NULL)? service->val : sDefault.val);}
-
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_server_role, &loadparm.Globals.server_role)
-_PUBLIC_ FN_GLOBAL_LIST(lp_smb_ports, &loadparm.Globals.smb_ports)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_nbt_port, &loadparm.Globals.nbt_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_dgram_port, &loadparm.Globals.dgram_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_cldap_port, &loadparm.Globals.cldap_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_krb5_port, &loadparm.Globals.krb5_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_kpasswd_port, &loadparm.Globals.kpasswd_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_web_port, &loadparm.Globals.web_port)
-_PUBLIC_ FN_GLOBAL_STRING(lp_dos_charset, &dos_charset)
-_PUBLIC_ FN_GLOBAL_STRING(lp_swat_directory, &loadparm.Globals.swat_directory)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_tls_enabled, &loadparm.Globals.tls_enabled)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_keyfile, &loadparm.Globals.tls_keyfile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_certfile, &loadparm.Globals.tls_certfile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_cafile, &loadparm.Globals.tls_cafile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_crlfile, &loadparm.Globals.tls_crlfile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_dhpfile, &loadparm.Globals.tls_dhpfile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_unix_charset, &unix_charset)
-_PUBLIC_ FN_GLOBAL_STRING(lp_display_charset, &display_charset)
-_PUBLIC_ FN_GLOBAL_STRING(lp_configfile, &loadparm.Globals.szConfigFile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_share_backend, &loadparm.Globals.szShareBackend)
-_PUBLIC_ FN_GLOBAL_STRING(lp_sam_url, &loadparm.Globals.szSAM_URL)
-_PUBLIC_ FN_GLOBAL_STRING(lp_secrets_url, &loadparm.Globals.szSECRETS_URL)
-_PUBLIC_ FN_GLOBAL_STRING(lp_spoolss_url, &loadparm.Globals.szSPOOLSS_URL)
-_PUBLIC_ FN_GLOBAL_STRING(lp_wins_config_url, &loadparm.Globals.szWINS_CONFIG_URL)
-_PUBLIC_ FN_GLOBAL_STRING(lp_wins_url, &loadparm.Globals.szWINS_URL)
-_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_winbind_separator, &loadparm.Globals.szWinbindSeparator)
-_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_winbindd_socket_directory, &loadparm.Globals.szWinbinddSocketDirectory)
-_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_template_shell, &loadparm.Globals.szTemplateShell)
-_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_template_homedir, &loadparm.Globals.szTemplateHomedir)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_winbind_sealed_pipes, &loadparm.Globals.bWinbindSealedPipes)
-_PUBLIC_ FN_GLOBAL_STRING(lp_private_dir, &loadparm.Globals.szPrivateDir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_serverstring, &loadparm.Globals.szServerString)
-_PUBLIC_ FN_GLOBAL_STRING(lp_lockdir, &loadparm.Globals.szLockDir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_modulesdir, &loadparm.Globals.szModulesDir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_setupdir, &loadparm.Globals.szSetupDir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_ncalrpc_dir, &loadparm.Globals.ncalrpc_dir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_piddir, &loadparm.Globals.szPidDir)
-_PUBLIC_ FN_GLOBAL_LIST(lp_dcerpc_endpoint_servers, &loadparm.Globals.dcerpc_ep_servers)
-_PUBLIC_ FN_GLOBAL_LIST(lp_server_services, &loadparm.Globals.server_services)
-_PUBLIC_ FN_GLOBAL_STRING(lp_ntptr_providor, &loadparm.Globals.ntptr_providor)
-_PUBLIC_ FN_GLOBAL_STRING(lp_auto_services, &loadparm.Globals.szAutoServices)
-_PUBLIC_ FN_GLOBAL_STRING(lp_passwd_chat, &loadparm.Globals.szPasswdChat)
-_PUBLIC_ FN_GLOBAL_LIST(lp_passwordserver, &loadparm.Globals.szPasswordServers)
-_PUBLIC_ FN_GLOBAL_LIST(lp_name_resolve_order, &loadparm.Globals.szNameResolveOrder)
-_PUBLIC_ FN_GLOBAL_STRING(lp_realm, &loadparm.Globals.szRealm)
-_PUBLIC_ FN_GLOBAL_STRING(lp_socket_options, &loadparm.Globals.socket_options)
-_PUBLIC_ FN_GLOBAL_STRING(lp_workgroup, &loadparm.Globals.szWorkgroup)
-_PUBLIC_ FN_GLOBAL_STRING(lp_netbios_name, &loadparm.Globals.szNetbiosName)
-_PUBLIC_ FN_GLOBAL_STRING(lp_netbios_scope, &loadparm.Globals.szNetbiosScope)
-_PUBLIC_ FN_GLOBAL_LIST(lp_wins_server_list, &loadparm.Globals.szWINSservers)
-_PUBLIC_ FN_GLOBAL_LIST(lp_interfaces, &loadparm.Globals.szInterfaces)
-_PUBLIC_ FN_GLOBAL_STRING(lp_socket_address, &loadparm.Globals.szSocketAddress)
-_PUBLIC_ FN_GLOBAL_LIST(lp_netbios_aliases, &loadparm.Globals.szNetbiosAliases)
-
-_PUBLIC_ FN_GLOBAL_BOOL(lp_disable_netbios, &loadparm.Globals.bDisableNetbios)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_wins_support, &loadparm.Globals.bWINSsupport)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_wins_dns_proxy, &loadparm.Globals.bWINSdnsProxy)
-_PUBLIC_ FN_GLOBAL_STRING(lp_wins_hook, &loadparm.Globals.szWINSHook)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_local_master, &loadparm.Globals.bLocalMaster)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_readraw, &loadparm.Globals.bReadRaw)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_large_readwrite, &loadparm.Globals.bLargeReadwrite)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_writeraw, &loadparm.Globals.bWriteRaw)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_null_passwords, &loadparm.Globals.bNullPasswords)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_obey_pam_restrictions, &loadparm.Globals.bObeyPamRestrictions)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_encrypted_passwords, &loadparm.Globals.bEncryptPasswords)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_time_server, &loadparm.Globals.bTimeServer)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_bind_interfaces_only, &loadparm.Globals.bBindInterfacesOnly)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_unicode, &loadparm.Globals.bUnicode)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_nt_status_support, &loadparm.Globals.bNTStatusSupport)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_lanman_auth, &loadparm.Globals.bLanmanAuth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_ntlm_auth, &loadparm.Globals.bNTLMAuth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_client_plaintext_auth, &loadparm.Globals.bClientPlaintextAuth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_client_lanman_auth, &loadparm.Globals.bClientLanManAuth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_client_ntlmv2_auth, &loadparm.Globals.bClientNTLMv2Auth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_client_use_spnego_principal, &loadparm.Globals.client_use_spnego_principal)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_host_msdfs, &loadparm.Globals.bHostMSDfs)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_unix_extensions, &loadparm.Globals.bUnixExtensions)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_use_spnego, &loadparm.Globals.bUseSpnego)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_rpc_big_endian, &loadparm.Globals.bRpcBigEndian)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_max_wins_ttl, &loadparm.Globals.max_wins_ttl)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_min_wins_ttl, &loadparm.Globals.min_wins_ttl)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_maxmux, &loadparm.Globals.max_mux)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_max_xmit, &loadparm.Globals.max_xmit)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_passwordlevel, &loadparm.Globals.pwordlevel)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_srv_maxprotocol, &loadparm.Globals.srv_maxprotocol)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_srv_minprotocol, &loadparm.Globals.srv_minprotocol)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_maxprotocol, &loadparm.Globals.cli_maxprotocol)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_minprotocol, &loadparm.Globals.cli_minprotocol)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_security, &loadparm.Globals.security)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_paranoid_server_security, &loadparm.Globals.paranoid_server_security)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_announce_as, &loadparm.Globals.announce_as)
-_PUBLIC_ FN_GLOBAL_LIST(lp_js_include, &loadparm.Globals.jsInclude)
-_PUBLIC_ FN_LOCAL_STRING(lp_servicename, szService)
-_PUBLIC_ FN_LOCAL_CONST_STRING(lp_const_servicename, szService)
+ int fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return((service != NULL)? service->val : sDefault->val);}
+
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_server_role, server_role)
+_PUBLIC_ FN_GLOBAL_LIST(lp_smb_ports, smb_ports)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_nbt_port, nbt_port)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_dgram_port, dgram_port)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_cldap_port, cldap_port)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_krb5_port, krb5_port)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_kpasswd_port, kpasswd_port)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_web_port, web_port)
+_PUBLIC_ FN_GLOBAL_STRING(lp_swat_directory, swat_directory)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_tls_enabled, tls_enabled)
+_PUBLIC_ FN_GLOBAL_STRING(lp_tls_keyfile, tls_keyfile)
+_PUBLIC_ FN_GLOBAL_STRING(lp_tls_certfile, tls_certfile)
+_PUBLIC_ FN_GLOBAL_STRING(lp_tls_cafile, tls_cafile)
+_PUBLIC_ FN_GLOBAL_STRING(lp_tls_crlfile, tls_crlfile)
+_PUBLIC_ FN_GLOBAL_STRING(lp_tls_dhpfile, tls_dhpfile)
+_PUBLIC_ FN_GLOBAL_STRING(lp_share_backend, szShareBackend)
+_PUBLIC_ FN_GLOBAL_STRING(lp_sam_url, szSAM_URL)
+_PUBLIC_ FN_GLOBAL_STRING(lp_idmap_url, szIDMAP_URL)
+_PUBLIC_ FN_GLOBAL_STRING(lp_secrets_url, szSECRETS_URL)
+_PUBLIC_ FN_GLOBAL_STRING(lp_spoolss_url, szSPOOLSS_URL)
+_PUBLIC_ FN_GLOBAL_STRING(lp_wins_config_url, szWINS_CONFIG_URL)
+_PUBLIC_ FN_GLOBAL_STRING(lp_wins_url, szWINS_URL)
+_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_winbind_separator, szWinbindSeparator)
+_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_winbindd_socket_directory, szWinbinddSocketDirectory)
+_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_winbindd_privileged_socket_directory, szWinbinddPrivilegedSocketDirectory)
+_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_template_shell, szTemplateShell)
+_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_template_homedir, szTemplateHomedir)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_winbind_sealed_pipes, bWinbindSealedPipes)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_idmap_trusted_only, bIdmapTrustedOnly)
+_PUBLIC_ FN_GLOBAL_STRING(lp_private_dir, szPrivateDir)
+_PUBLIC_ FN_GLOBAL_STRING(lp_serverstring, szServerString)
+_PUBLIC_ FN_GLOBAL_STRING(lp_lockdir, szLockDir)
+_PUBLIC_ FN_GLOBAL_STRING(lp_modulesdir, szModulesDir)
+_PUBLIC_ FN_GLOBAL_STRING(lp_setupdir, szSetupDir)
+_PUBLIC_ FN_GLOBAL_STRING(lp_ncalrpc_dir, ncalrpc_dir)
+_PUBLIC_ FN_GLOBAL_STRING(lp_dos_charset, dos_charset)
+_PUBLIC_ FN_GLOBAL_STRING(lp_unix_charset, unix_charset)
+_PUBLIC_ FN_GLOBAL_STRING(lp_display_charset, display_charset)
+_PUBLIC_ FN_GLOBAL_STRING(lp_piddir, szPidDir)
+_PUBLIC_ FN_GLOBAL_LIST(lp_dcerpc_endpoint_servers, dcerpc_ep_servers)
+_PUBLIC_ FN_GLOBAL_LIST(lp_server_services, server_services)
+_PUBLIC_ FN_GLOBAL_STRING(lp_ntptr_providor, ntptr_providor)
+_PUBLIC_ FN_GLOBAL_STRING(lp_auto_services, szAutoServices)
+_PUBLIC_ FN_GLOBAL_STRING(lp_passwd_chat, szPasswdChat)
+_PUBLIC_ FN_GLOBAL_LIST(lp_passwordserver, szPasswordServers)
+_PUBLIC_ FN_GLOBAL_LIST(lp_name_resolve_order, szNameResolveOrder)
+_PUBLIC_ FN_GLOBAL_STRING(lp_realm, szRealm)
+_PUBLIC_ FN_GLOBAL_STRING(lp_socket_options, socket_options)
+_PUBLIC_ FN_GLOBAL_STRING(lp_workgroup, szWorkgroup)
+_PUBLIC_ FN_GLOBAL_STRING(lp_netbios_name, szNetbiosName)
+_PUBLIC_ FN_GLOBAL_STRING(lp_netbios_scope, szNetbiosScope)
+_PUBLIC_ FN_GLOBAL_LIST(lp_wins_server_list, szWINSservers)
+_PUBLIC_ FN_GLOBAL_LIST(lp_interfaces, szInterfaces)
+_PUBLIC_ FN_GLOBAL_STRING(lp_socket_address, szSocketAddress)
+_PUBLIC_ FN_GLOBAL_LIST(lp_netbios_aliases, szNetbiosAliases)
+
+_PUBLIC_ FN_GLOBAL_BOOL(lp_disable_netbios, bDisableNetbios)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_wins_support, bWINSsupport)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_wins_dns_proxy, bWINSdnsProxy)
+_PUBLIC_ FN_GLOBAL_STRING(lp_wins_hook, szWINSHook)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_local_master, bLocalMaster)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_readraw, bReadRaw)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_large_readwrite, bLargeReadwrite)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_writeraw, bWriteRaw)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_null_passwords, bNullPasswords)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_obey_pam_restrictions, bObeyPamRestrictions)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_encrypted_passwords, bEncryptPasswords)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_time_server, bTimeServer)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_bind_interfaces_only, bBindInterfacesOnly)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_unicode, bUnicode)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_nt_status_support, bNTStatusSupport)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_lanman_auth, bLanmanAuth)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_ntlm_auth, bNTLMAuth)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_client_plaintext_auth, bClientPlaintextAuth)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_client_lanman_auth, bClientLanManAuth)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_client_ntlmv2_auth, bClientNTLMv2Auth)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_client_use_spnego_principal, client_use_spnego_principal)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_host_msdfs, bHostMSDfs)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_unix_extensions, bUnixExtensions)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_use_spnego, bUseSpnego)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_rpc_big_endian, bRpcBigEndian)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_max_wins_ttl, max_wins_ttl)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_min_wins_ttl, min_wins_ttl)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_maxmux, max_mux)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_max_xmit, max_xmit)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_passwordlevel, pwordlevel)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_srv_maxprotocol, srv_maxprotocol)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_srv_minprotocol, srv_minprotocol)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_maxprotocol, cli_maxprotocol)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_minprotocol, cli_minprotocol)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_security, security)
+_PUBLIC_ FN_GLOBAL_BOOL(lp_paranoid_server_security, paranoid_server_security)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_announce_as, announce_as)
+const char *lp_servicename(const struct loadparm_service *service)
+{
+       return lp_string((const char *)service->szService);
+}
+
 _PUBLIC_ FN_LOCAL_STRING(lp_pathname, szPath)
 static FN_LOCAL_STRING(_lp_printername, szPrintername)
 _PUBLIC_ FN_LOCAL_LIST(lp_hostsallow, szHostsallow)
@@ -782,6 +719,7 @@ _PUBLIC_ FN_LOCAL_BOOL(lp_print_ok, bPrint_ok)
 _PUBLIC_ FN_LOCAL_BOOL(lp_map_hidden, bMap_hidden)
 _PUBLIC_ FN_LOCAL_BOOL(lp_map_archive, bMap_archive)
 _PUBLIC_ FN_LOCAL_BOOL(lp_strict_locking, bStrictLocking)
+_PUBLIC_ FN_LOCAL_BOOL(lp_oplocks, bOplocks)
 _PUBLIC_ FN_LOCAL_BOOL(lp_strict_sync, bStrictSync)
 _PUBLIC_ FN_LOCAL_BOOL(lp_ci_filesystem, bCIFileSystem)
 _PUBLIC_ FN_LOCAL_BOOL(lp_map_system, bMap_system)
@@ -791,15 +729,17 @@ _PUBLIC_ FN_LOCAL_INTEGER(lp_create_mask, iCreate_mask)
 _PUBLIC_ FN_LOCAL_INTEGER(lp_force_create_mode, iCreate_force_mode)
 _PUBLIC_ FN_LOCAL_INTEGER(lp_dir_mask, iDir_mask)
 _PUBLIC_ FN_LOCAL_INTEGER(lp_force_dir_mode, iDir_force_mode)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_server_signing, &loadparm.Globals.server_signing)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_client_signing, &loadparm.Globals.client_signing)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_server_signing, server_signing)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_client_signing, client_signing)
+
+_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_ntp_signd_socket_directory, szNTPSignDSocketDirectory)
 
 /* local prototypes */
 static int map_parameter(const char *pszParmName);
 static struct loadparm_service *getservicebyname(struct loadparm_context *lp_ctx, 
                                        const char *pszServiceName);
 static void copy_service(struct loadparm_service *pserviceDest,
-                        struct loadparm_service *pserviceSource, 
+                        struct loadparm_service *pserviceSource,
                         int *pcopymapDest);
 static bool service_ok(struct loadparm_service *service);
 static bool do_section(const char *pszSectionName, void *);
@@ -808,14 +748,18 @@ static void init_copymap(struct loadparm_service *pservice);
 /* This is a helper function for parametrical options support. */
 /* It returns a pointer to parametrical option value if it exists or NULL otherwise */
 /* Actual parametrical functions are quite simple */
-const char *lp_get_parametric(struct loadparm_service *service, 
+const char *lp_get_parametric(struct loadparm_context *lp_ctx,
+                             struct loadparm_service *service,
                              const char *type, const char *option)
 {
        char *vfskey;
         struct param_opt *data;
-       
-       data = (service == NULL ? loadparm.Globals.param_opt : service->param_opt);
-    
+
+       if (lp_ctx == NULL)
+               return NULL;
+
+       data = (service == NULL ? lp_ctx->globals->param_opt : service->param_opt);
+
        asprintf(&vfskey, "%s:%s", type, option);
        strlower(vfskey);
 
@@ -829,8 +773,8 @@ const char *lp_get_parametric(struct loadparm_service *service,
 
        if (service != NULL) {
                /* Try to fetch the same option but from globals */
-               /* but only if we are not already working with Globals */
-               for (data = loadparm.Globals.param_opt; data; 
+               /* but only if we are not already working with globals */
+               for (data = lp_ctx->globals->param_opt; data;
                     data = data->next) {
                        if (strcmp(data->key, vfskey) == 0) {
                                free(vfskey);
@@ -840,14 +784,14 @@ const char *lp_get_parametric(struct loadparm_service *service,
        }
 
        free(vfskey);
-       
+
        return NULL;
 }
 
 
-/*******************************************************************
-convenience routine to return int parameters.
-********************************************************************/
+/**
+ * convenience routine to return int parameters.
+ */
 static int lp_int(const char *s)
 {
 
@@ -856,12 +800,12 @@ static int lp_int(const char *s)
                return -1;
        }
 
-       return strtol(s, NULL, 0); 
+       return strtol(s, NULL, 0);
 }
 
-/*******************************************************************
-convenience routine to return unsigned long parameters.
-********************************************************************/
+/**
+ * convenience routine to return unsigned long parameters.
+ */
 static int lp_ulong(const char *s)
 {
 
@@ -873,9 +817,9 @@ static int lp_ulong(const char *s)
        return strtoul(s, NULL, 0);
 }
 
-/*******************************************************************
-convenience routine to return unsigned long parameters.
-********************************************************************/
+/**
+ * convenience routine to return unsigned long parameters.
+ */
 static double lp_double(const char *s)
 {
 
@@ -887,9 +831,9 @@ static double lp_double(const char *s)
        return strtod(s, NULL);
 }
 
-/*******************************************************************
-convenience routine to return boolean parameters.
-********************************************************************/
+/**
+ * convenience routine to return boolean parameters.
+ */
 static bool lp_bool(const char *s)
 {
        bool ret = false;
@@ -898,7 +842,7 @@ static bool lp_bool(const char *s)
                DEBUG(0,("lp_bool(%s): is called with NULL!\n",s));
                return false;
        }
-       
+
        if (!set_boolean(s, &ret)) {
                DEBUG(0,("lp_bool(%s): value is not boolean!\n",s));
                return false;
@@ -908,14 +852,17 @@ static bool lp_bool(const char *s)
 }
 
 
-/* Return parametric option from a given service. Type is a part of option before ':' */
-/* Parametric option has following syntax: 'Type: option = value' */
-/* Returned value is allocated in 'lp_talloc' context */
+/**
+ * Return parametric option from a given service. Type is a part of option before ':'
+ * Parametric option has following syntax: 'Type: option = value'
+ * Returned value is allocated in 'lp_talloc' context
+ */
 
-const char *lp_parm_string(struct loadparm_service *service, const char *type, 
+const char *lp_parm_string(struct loadparm_context *lp_ctx,
+                          struct loadparm_service *service, const char *type,
                           const char *option)
 {
-       const char *value = lp_get_parametric(service, type, option);
+       const char *value = lp_get_parametric(lp_ctx, service, type, option);
 
        if (value)
                return lp_string(value);
@@ -923,48 +870,56 @@ const char *lp_parm_string(struct loadparm_service *service, const char *type,
        return NULL;
 }
 
-/* Return parametric option from a given service. Type is a part of option before ':' */
-/* Parametric option has following syntax: 'Type: option = value' */
-/* Returned value is allocated in 'lp_talloc' context */
+/**
+ * Return parametric option from a given service. Type is a part of option before ':'
+ * Parametric option has following syntax: 'Type: option = value'
+ * Returned value is allocated in 'lp_talloc' context
+ */
 
-const char **lp_parm_string_list(struct loadparm_service *service, 
-                                const char *type, 
+const char **lp_parm_string_list(TALLOC_CTX *mem_ctx,
+                                struct loadparm_context *lp_ctx,
+                                struct loadparm_service *service,
+                                const char *type,
                                 const char *option, const char *separator)
 {
-       const char *value = lp_get_parametric(service, type, option);
-       
-       if (value)
-               return str_list_make(talloc_autofree_context(), value, 
-                                    separator);
+       const char *value = lp_get_parametric(lp_ctx, service, type, option);
+
+       if (value != NULL)
+               return str_list_make(mem_ctx, value, separator);
 
        return NULL;
 }
 
-/* Return parametric option from a given service. Type is a part of option before ':' */
-/* Parametric option has following syntax: 'Type: option = value' */
+/**
+ * Return parametric option from a given service. Type is a part of option before ':'
+ * Parametric option has following syntax: 'Type: option = value'
+ */
 
-int lp_parm_int(struct loadparm_service *service, const char *type, 
+int lp_parm_int(struct loadparm_context *lp_ctx,
+               struct loadparm_service *service, const char *type,
                const char *option, int default_v)
 {
-       const char *value = lp_get_parametric(service, type, option);
-       
+       const char *value = lp_get_parametric(lp_ctx, service, type, option);
+
        if (value)
                return lp_int(value);
 
        return default_v;
 }
 
-/* Return parametric option from a given service. Type is a part of
+/**
+ * Return parametric option from a given service. Type is a part of
  * option before ':'.
  * Parametric option has following syntax: 'Type: option = value'.
  */
 
-int lp_parm_bytes(struct loadparm_service *service, const char *type, 
+int lp_parm_bytes(struct loadparm_context *lp_ctx,
+                 struct loadparm_service *service, const char *type,
                  const char *option, int default_v)
 {
        uint64_t bval;
 
-       const char *value = lp_get_parametric(service, type, option);
+       const char *value = lp_get_parametric(lp_ctx, service, type, option);
 
        if (value && conv_str_size(value, &bval)) {
                if (bval <= INT_MAX) {
@@ -975,14 +930,17 @@ int lp_parm_bytes(struct loadparm_service *service, const char *type,
        return default_v;
 }
 
-/* Return parametric option from a given service. Type is a part of option before ':' */
-/* Parametric option has following syntax: 'Type: option = value' */
-
-unsigned long lp_parm_ulong(struct loadparm_service *service, const char *type, 
+/**
+ * Return parametric option from a given service.
+ * Type is a part of option before ':'
+ * Parametric option has following syntax: 'Type: option = value'
+ */
+unsigned long lp_parm_ulong(struct loadparm_context *lp_ctx,
+                           struct loadparm_service *service, const char *type,
                            const char *option, unsigned long default_v)
 {
-       const char *value = lp_get_parametric(service, type, option);
-       
+       const char *value = lp_get_parametric(lp_ctx, service, type, option);
+
        if (value)
                return lp_ulong(value);
 
@@ -990,53 +948,57 @@ unsigned long lp_parm_ulong(struct loadparm_service *service, const char *type,
 }
 
 
-double lp_parm_double(struct loadparm_service *service, const char *type, 
+double lp_parm_double(struct loadparm_context *lp_ctx,
+                     struct loadparm_service *service, const char *type,
                      const char *option, double default_v)
 {
-       const char *value = lp_get_parametric(service, type, option);
-       
-       if (value)
+       const char *value = lp_get_parametric(lp_ctx, service, type, option);
+
+       if (value != NULL)
                return lp_double(value);
 
        return default_v;
 }
 
-/* Return parametric option from a given service. Type is a part of option before ':' */
-/* Parametric option has following syntax: 'Type: option = value' */
+/**
+ * Return parametric option from a given service. Type is a part of option before ':'
+ * Parametric option has following syntax: 'Type: option = value'
+ */
 
-bool lp_parm_bool(struct loadparm_service *service, const char *type, 
+bool lp_parm_bool(struct loadparm_context *lp_ctx,
+                 struct loadparm_service *service, const char *type,
                  const char *option, bool default_v)
 {
-       const char *value = lp_get_parametric(service, type, option);
-       
-       if (value)
+       const char *value = lp_get_parametric(lp_ctx, service, type, option);
+
+       if (value != NULL)
                return lp_bool(value);
 
        return default_v;
 }
 
 
-/***************************************************************************
- Initialise a service to the defaults.
-***************************************************************************/
+/**
Initialise a service to the defaults.
+ */
 
-static struct loadparm_service *init_service(TALLOC_CTX *mem_ctx)
+static struct loadparm_service *init_service(TALLOC_CTX *mem_ctx, struct loadparm_service *sDefault)
 {
-       struct loadparm_service *pservice = 
+       struct loadparm_service *pservice =
                talloc_zero(mem_ctx, struct loadparm_service);
-       copy_service(pservice, &sDefault, NULL);
+       copy_service(pservice, sDefault, NULL);
        return pservice;
 }
 
 /**
- Set a string value, deallocating any existing space, and allocing the space
- for the string
-**/
Set a string value, deallocating any existing space, and allocing the space
for the string
+ */
 static bool string_set(TALLOC_CTX *mem_ctx, char **dest, const char *src)
 {
        talloc_free(*dest);
 
-       if (src == NULL) 
+       if (src == NULL)
                src = "";
 
        *dest = talloc_strdup(mem_ctx, src);
@@ -1050,13 +1012,13 @@ static bool string_set(TALLOC_CTX *mem_ctx, char **dest, const char *src)
 
 
 
-/***************************************************************************
- Add a new service to the services array initialising it with the given 
- service. 
-***************************************************************************/
+/**
+ * Add a new service to the services array initialising it with the given
+ * service.
+ */
 
-static struct loadparm_service *add_a_service(struct loadparm_context *lp_ctx, 
-                                    const struct loadparm_service *pservice, 
+struct loadparm_service *lp_add_service(struct loadparm_context *lp_ctx,
+                                    const struct loadparm_service *pservice,
                                     const char *name)
 {
        int i;
@@ -1068,7 +1030,7 @@ static struct loadparm_service *add_a_service(struct loadparm_context *lp_ctx,
 
        /* it might already exist */
        if (name) {
-               struct loadparm_service *service = getservicebyname(lp_ctx, 
+               struct loadparm_service *service = getservicebyname(lp_ctx,
                                                                    name);
                if (service != NULL) {
                        /* Clean all parametric options for service */
@@ -1086,106 +1048,89 @@ static struct loadparm_service *add_a_service(struct loadparm_context *lp_ctx,
 
        /* find an invalid one */
        for (i = 0; i < lp_ctx->iNumServices; i++)
-               if (lp_ctx->ServicePtrs[i] == NULL)
+               if (lp_ctx->services[i] == NULL)
                        break;
 
        /* if not, then create one */
        if (i == lp_ctx->iNumServices) {
                struct loadparm_service **tsp;
-               
-               tsp = realloc_p(lp_ctx->ServicePtrs, struct loadparm_service *, 
-                               num_to_alloc);
-                                          
+
+               tsp = talloc_realloc(lp_ctx, lp_ctx->services, struct loadparm_service *, num_to_alloc);
+
                if (!tsp) {
-                       DEBUG(0,("add_a_service: failed to enlarge ServicePtrs!\n"));
+                       DEBUG(0,("lp_add_service: failed to enlarge services!\n"));
                        return NULL;
-               }
-               else {
-                       lp_ctx->ServicePtrs = tsp;
-                       lp_ctx->ServicePtrs[lp_ctx->iNumServices] = NULL;
+               } else {
+                       lp_ctx->services = tsp;
+                       lp_ctx->services[lp_ctx->iNumServices] = NULL;
                }
 
                lp_ctx->iNumServices++;
-       } 
+       }
 
-       lp_ctx->ServicePtrs[i] = init_service(talloc_autofree_context());
-       if (lp_ctx->ServicePtrs[i] == NULL) {
-               DEBUG(0,("add_a_service: out of memory!\n"));
+       lp_ctx->services[i] = init_service(lp_ctx->services, lp_ctx->sDefault);
+       if (lp_ctx->services[i] == NULL) {
+               DEBUG(0,("lp_add_service: out of memory!\n"));
                return NULL;
        }
-       copy_service(lp_ctx->ServicePtrs[i], &tservice, NULL);
+       copy_service(lp_ctx->services[i], &tservice, NULL);
        if (name != NULL)
-               string_set(lp_ctx->ServicePtrs[i], &lp_ctx->ServicePtrs[i]->szService, name);
-       return lp_ctx->ServicePtrs[i];
+               string_set(lp_ctx->services[i], &lp_ctx->services[i]->szService, name);
+       return lp_ctx->services[i];
 }
 
-/***************************************************************************
- Add a new home service, with the specified home directory, defaults coming 
- from service ifrom.
-***************************************************************************/
+/**
+ * Add a new home service, with the specified home directory, defaults coming
from service ifrom.
+ */
 
-bool lp_add_home(struct loadparm_context *lp_ctx, 
-                const char *pszHomename, 
+bool lp_add_home(struct loadparm_context *lp_ctx,
+                const char *pszHomename,
                 struct loadparm_service *default_service,
                 const char *user, const char *pszHomedir)
 {
        struct loadparm_service *service;
-       pstring newHomedir;
 
-       service = add_a_service(lp_ctx, default_service, pszHomename);
+       service = lp_add_service(lp_ctx, default_service, pszHomename);
 
        if (service == NULL)
                return false;
 
        if (!(*(default_service->szPath))
-           || strequal(default_service->szPath, sDefault.szPath)) {
-               pstrcpy(newHomedir, pszHomedir);
+           || strequal(default_service->szPath, lp_ctx->sDefault->szPath)) {
+               service->szPath = talloc_strdup(service, pszHomedir);
        } else {
-               pstrcpy(newHomedir, lp_pathname(default_service));
-               string_sub(newHomedir,"%H", pszHomedir, sizeof(newHomedir)); 
+               service->szPath = string_sub_talloc(service, lp_pathname(default_service, lp_ctx->sDefault), "%H", pszHomedir); 
        }
 
-       string_set(service, &service->szPath, newHomedir);
-
        if (!(*(service->comment))) {
                service->comment = talloc_asprintf(service, "Home directory of %s", user);
        }
        service->bAvailable = default_service->bAvailable;
        service->bBrowseable = default_service->bBrowseable;
 
-       DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n", 
-                 pszHomename, user, newHomedir));
-       
-       return true;
-}
+       DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n",
+                 pszHomename, user, service->szPath));
 
-/***************************************************************************
- Add a new service, based on an old one.
-***************************************************************************/
-
-struct loadparm_service *lp_add_service(struct loadparm_context *lp_ctx, 
-                              const char *pszService, 
-                              struct loadparm_service *default_service)
-{
-       return add_a_service(lp_ctx, default_service, pszService);
+       return true;
 }
 
-/***************************************************************************
- Add the IPC service.
-***************************************************************************/
+/**
Add the IPC service.
+ */
 
-static bool lp_add_hidden(struct loadparm_context *lp_ctx, const char *name, 
+static bool lp_add_hidden(struct loadparm_context *lp_ctx, const char *name,
                          const char *fstype)
 {
-       struct loadparm_service *service = add_a_service(lp_ctx, &sDefault, name);
+       struct loadparm_service *service = lp_add_service(lp_ctx, lp_ctx->sDefault, name);
 
        if (service == NULL)
                return false;
 
        string_set(service, &service->szPath, tmpdir());
 
-       service->comment = talloc_asprintf(service, "%s Service (%s)", 
-                               fstype, loadparm.Globals.szServerString);
+       service->comment = talloc_asprintf(service, "%s Service (%s)",
+                               fstype, lp_ctx->globals->szServerString);
        string_set(service, &service->fstype, fstype);
        service->iMaxConnections = -1;
        service->bAvailable = true;
@@ -1194,7 +1139,7 @@ static bool lp_add_hidden(struct loadparm_context *lp_ctx, const char *name,
        service->bBrowseable = false;
 
        if (strcasecmp(fstype, "IPC") == 0) {
-               lp_do_service_parameter(lp_ctx, service, "ntvfs handler", 
+               lp_do_service_parameter(lp_ctx, service, "ntvfs handler",
                                        "default");
        }
 
@@ -1203,17 +1148,17 @@ static bool lp_add_hidden(struct loadparm_context *lp_ctx, const char *name,
        return true;
 }
 
-/***************************************************************************
- Add a new printer service, with defaults coming from service iFrom.
-***************************************************************************/
+/**
Add a new printer service, with defaults coming from service iFrom.
+ */
 
 bool lp_add_printer(struct loadparm_context *lp_ctx,
-                   const char *pszPrintername, 
+                   const char *pszPrintername,
                    struct loadparm_service *default_service)
 {
        const char *comment = "From Printcap";
        struct loadparm_service *service;
-       service = add_a_service(lp_ctx, default_service, pszPrintername);
+       service = lp_add_service(lp_ctx, default_service, pszPrintername);
 
        if (service == NULL)
                return false;
@@ -1226,7 +1171,7 @@ bool lp_add_printer(struct loadparm_context *lp_ctx,
        /* the printer name is set to the service name. */
        string_set(service, &service->szPrintername, pszPrintername);
        string_set(service, &service->comment, comment);
-       service->bBrowseable = sDefault.bBrowseable;
+       service->bBrowseable = default_service->bBrowseable;
        /* Printers cannot be read_only. */
        service->bRead_only = false;
        /* Printer services must be printable. */
@@ -1237,10 +1182,10 @@ bool lp_add_printer(struct loadparm_context *lp_ctx,
        return true;
 }
 
-/***************************************************************************
- Map a parameter's string representation to something we can use. 
- Returns False if the parameter string is not recognised, else TRUE.
-***************************************************************************/
+/**
+ * Map a parameter's string representation to something we can use.
Returns False if the parameter string is not recognised, else TRUE.
+ */
 
 static int map_parameter(const char *pszParmName)
 {
@@ -1263,7 +1208,7 @@ static int map_parameter(const char *pszParmName)
 }
 
 
-/*
+/**
   return the parameter structure for a parameter
 */
 struct parm_struct *lp_parm_struct(const char *name)
@@ -1273,20 +1218,26 @@ struct parm_struct *lp_parm_struct(const char *name)
        return &parm_table[parmnum];
 }
 
-/*
+/**
   return the parameter pointer for a parameter
 */
-void *lp_parm_ptr(struct loadparm_service *service, struct parm_struct *parm)
+void *lp_parm_ptr(struct loadparm_context *lp_ctx,
+                 struct loadparm_service *service, struct parm_struct *parm)
 {
-       if (service == NULL)
-               return parm->ptr;
-
-       return ((char *)service) + PTR_DIFF(parm->ptr, &sDefault);
+       if (service == NULL) {
+               if (parm->class == P_LOCAL)
+                       return ((char *)lp_ctx->sDefault)+parm->offset;
+               else if (parm->class == P_GLOBAL)
+                       return ((char *)lp_ctx->globals)+parm->offset;
+               else return NULL;
+       } else {
+               return ((char *)service) + parm->offset;
+       }
 }
 
-/***************************************************************************
-Find a service by name. Otherwise works like get_service.
-***************************************************************************/
+/**
+ * Find a service by name. Otherwise works like get_service.
+ */
 
 static struct loadparm_service *getservicebyname(struct loadparm_context *lp_ctx, 
                                        const char *pszServiceName)
@@ -1294,21 +1245,21 @@ static struct loadparm_service *getservicebyname(struct loadparm_context *lp_ctx
        int iService;
 
        for (iService = lp_ctx->iNumServices - 1; iService >= 0; iService--)
-               if (lp_ctx->ServicePtrs[iService] != NULL &&
-                   strwicmp(lp_ctx->ServicePtrs[iService]->szService, pszServiceName) == 0) {
-                       return lp_ctx->ServicePtrs[iService];
+               if (lp_ctx->services[iService] != NULL &&
+                   strwicmp(lp_ctx->services[iService]->szService, pszServiceName) == 0) {
+                       return lp_ctx->services[iService];
                }
 
        return NULL;
 }
 
-/***************************************************************************
- Copy a service structure to another.
- If pcopymapDest is NULL then copy all fields
-***************************************************************************/
+/**
Copy a service structure to another.
If pcopymapDest is NULL then copy all fields
+ */
 
-static void copy_service(struct loadparm_service *pserviceDest, 
-                        struct loadparm_service *pserviceSource, 
+static void copy_service(struct loadparm_service *pserviceDest,
+                        struct loadparm_service *pserviceSource,
                         int *pcopymapDest)
 {
        int i;
@@ -1317,15 +1268,12 @@ static void copy_service(struct loadparm_service *pserviceDest,
        bool not_added;
 
        for (i = 0; parm_table[i].label; i++)
-               if (parm_table[i].ptr && parm_table[i].class == P_LOCAL &&
+               if (parm_table[i].offset != -1 && parm_table[i].class == P_LOCAL &&
                    (bcopyall || pcopymapDest[i])) {
-                       void *def_ptr = parm_table[i].ptr;
                        void *src_ptr =
-                               ((char *)pserviceSource) + PTR_DIFF(def_ptr,
-                                                                   &sDefault);
+                               ((char *)pserviceSource) + parm_table[i].offset;
                        void *dest_ptr =
-                               ((char *)pserviceDest) + PTR_DIFF(def_ptr,
-                                                                 &sDefault);
+                               ((char *)pserviceDest) + parm_table[i].offset;
 
                        switch (parm_table[i].type) {
                                case P_BOOL:
@@ -1339,19 +1287,19 @@ static void copy_service(struct loadparm_service *pserviceDest,
                                        break;
 
                                case P_STRING:
-                                       string_set(pserviceDest, 
+                                       string_set(pserviceDest,
                                                   (char **)dest_ptr,
                                                   *(char **)src_ptr);
                                        break;
 
                                case P_USTRING:
-                                       string_set(pserviceDest, 
+                                       string_set(pserviceDest,
                                                   (char **)dest_ptr,
                                                   *(char **)src_ptr);
                                        strupper(*(char **)dest_ptr);
                                        break;
                                case P_LIST:
-                                       *(const char ***)dest_ptr = str_list_copy(talloc_autofree_context()
+                                       *(const char ***)dest_ptr = str_list_copy(pserviceDest
                                                                                  *(const char ***)src_ptr);
                                        break;
                                default:
@@ -1366,7 +1314,7 @@ static void copy_service(struct loadparm_service *pserviceDest,
                               (void *)pserviceSource->copymap,
                               sizeof(int) * NUMPARAMETERS);
        }
-       
+
        data = pserviceSource->param_opt;
        while (data) {
                not_added = true;
@@ -1376,7 +1324,7 @@ static void copy_service(struct loadparm_service *pserviceDest,
                        /* If we already have same option, override it */
                        if (strcmp(pdata->key, data->key) == 0) {
                                talloc_free(pdata->value);
-                               pdata->value = talloc_reference(pdata, 
+                               pdata->value = talloc_reference(pdata,
                                                             data->value);
                                not_added = false;
                                break;
@@ -1395,11 +1343,10 @@ static void copy_service(struct loadparm_service *pserviceDest,
        }
 }
 
-/***************************************************************************
-Check a service for consistency. Return False if the service is in any way
-incomplete or faulty, else True.
-***************************************************************************/
-
+/**
+ * Check a service for consistency. Return False if the service is in any way
+ * incomplete or faulty, else True.
+ */
 static bool service_ok(struct loadparm_service *service)
 {
        bool bRetval;
@@ -1434,11 +1381,11 @@ static bool service_ok(struct loadparm_service *service)
 
 
 /*******************************************************************
- Keep a linked list of all config files so we know when one has changed 
+ Keep a linked list of all config files so we know when one has changed
  it's date and needs to be reloaded.
 ********************************************************************/
 
-static void add_to_file_list(struct loadparm_context *lp_ctx, 
+static void add_to_file_list(struct loadparm_context *lp_ctx,
                             const char *fname, const char *subfname)
 {
        struct file_lists *f = lp_ctx->file_lists;
@@ -1450,7 +1397,7 @@ static void add_to_file_list(struct loadparm_context *lp_ctx,
        }
 
        if (!f) {
-               f = talloc(talloc_autofree_context(), struct file_lists);
+               f = talloc(lp_ctx, struct file_lists);
                if (!f)
                        return;
                f->next = lp_ctx->file_lists;
@@ -1476,7 +1423,6 @@ static void add_to_file_list(struct loadparm_context *lp_ctx,
 /*******************************************************************
  Check if a config file has changed date.
 ********************************************************************/
-
 bool lp_file_list_changed(struct loadparm_context *lp_ctx)
 {
        struct file_lists *f;
@@ -1486,7 +1432,7 @@ bool lp_file_list_changed(struct loadparm_context *lp_ctx)
                char *n2;
                time_t mod_time;
 
-               n2 = standard_sub_basic(talloc_autofree_context(), f->name);
+               n2 = standard_sub_basic(lp_ctx, f->name);
 
                DEBUGADD(6, ("file %s -> %s  last mod_time: %s\n",
                             f->name, n2, ctime(&f->modtime)));
@@ -1509,15 +1455,14 @@ bool lp_file_list_changed(struct loadparm_context *lp_ctx)
  Handle the include operation.
 ***************************************************************************/
 
-static bool handle_include(struct loadparm_context *lp_ctx, 
+static bool handle_include(struct loadparm_context *lp_ctx,
                           const char *pszParmValue, char **ptr)
 {
-       char *fname = standard_sub_basic(talloc_autofree_context(), 
-                                        pszParmValue);
+       char *fname = standard_sub_basic(lp_ctx, pszParmValue);
 
        add_to_file_list(lp_ctx, pszParmValue, fname);
 
-       string_set(talloc_autofree_context(), ptr, fname);
+       string_set(lp_ctx, ptr, fname);
 
        if (file_exist(fname))
                return pm_process(fname, do_section, do_parameter, lp_ctx);
@@ -1531,13 +1476,13 @@ static bool handle_include(struct loadparm_context *lp_ctx,
  Handle the interpretation of the copy parameter.
 ***************************************************************************/
 
-static bool handle_copy(struct loadparm_context *lp_ctx, 
+static bool handle_copy(struct loadparm_context *lp_ctx,
                        const char *pszParmValue, char **ptr)
 {
        bool bRetval;
        struct loadparm_service *serviceTemp;
 
-       string_set(talloc_autofree_context(), ptr, pszParmValue);
+       string_set(lp_ctx, ptr, pszParmValue);
 
        bRetval = false;
 
@@ -1553,7 +1498,7 @@ static bool handle_copy(struct loadparm_context *lp_ctx,
                        bRetval = true;
                }
        } else {
-               DEBUG(0, ("Unable to copy service - source not found: %s\n", 
+               DEBUG(0, ("Unable to copy service - source not found: %s\n",
                          pszParmValue));
                bRetval = false;
        }
@@ -1561,6 +1506,21 @@ static bool handle_copy(struct loadparm_context *lp_ctx,
        return bRetval;
 }
 
+static bool handle_debuglevel(struct loadparm_context *lp_ctx,
+                       const char *pszParmValue, char **ptr)
+{
+       DEBUGLEVEL = atoi(pszParmValue);
+
+       return true;
+}
+
+static bool handle_logfile(struct loadparm_context *lp_ctx,
+                       const char *pszParmValue, char **ptr)
+{
+       logfile = pszParmValue;
+       return true;
+}
+
 /***************************************************************************
  Initialise a copymap.
 ***************************************************************************/
@@ -1580,11 +1540,12 @@ static void init_copymap(struct loadparm_service *pservice)
                pservice->copymap[i] = true;
 }
 
-/***************************************************************************
- Process a parametric option
-***************************************************************************/
-static bool lp_do_parameter_parametric(struct loadparm_service *service, 
-                                      const char *pszParmName, 
+/**
+ * Process a parametric option
+ */
+static bool lp_do_parameter_parametric(struct loadparm_context *lp_ctx,
+                                      struct loadparm_service *service,
+                                      const char *pszParmName,
                                       const char *pszParmValue, int flags)
 {
        struct param_opt *paramo, *data;
@@ -1601,8 +1562,8 @@ static bool lp_do_parameter_parametric(struct loadparm_service *service,
        strlower(name);
 
        if (service == NULL) {
-               data = loadparm.Globals.param_opt;
-               mem_ctx = talloc_autofree_context();
+               data = lp_ctx->globals->param_opt;
+               mem_ctx = lp_ctx->globals;
        } else {
                data = service->param_opt;
                mem_ctx = service;
@@ -1633,24 +1594,24 @@ static bool lp_do_parameter_parametric(struct loadparm_service *service,
        paramo->value = talloc_strdup(paramo, pszParmValue);
        paramo->flags = flags;
        if (service == NULL) {
-               DLIST_ADD(loadparm.Globals.param_opt, paramo);
+               DLIST_ADD(lp_ctx->globals->param_opt, paramo);
        } else {
                DLIST_ADD(service->param_opt, paramo);
        }
 
        free(name);
-       
+
        return true;
 }
 
-static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr, 
+static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
                         const char *pszParmName, const char *pszParmValue,
                         struct loadparm_context *lp_ctx)
 {
        int i;
        /* if it is a special case then go ahead */
        if (parm_table[parmnum].special) {
-               parm_table[parmnum].special(lp_ctx, pszParmValue, 
+               parm_table[parmnum].special(lp_ctx, pszParmValue,
                                            (char **)parm_ptr);
                return true;
        }
@@ -1692,7 +1653,7 @@ static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
                }
 
                case P_LIST:
-                       *(const char ***)parm_ptr = str_list_make(mem_ctx, 
+                       *(const char ***)parm_ptr = str_list_make(mem_ctx,
                                                                  pszParmValue, NULL);
                        break;
 
@@ -1722,25 +1683,23 @@ static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
                                return false;
                        }
                        break;
-               case P_SEP:
-                       break;
        }
 
-       if (parm_table[parmnum].flags & FLAG_DEFAULT) {
-               parm_table[parmnum].flags &= ~FLAG_DEFAULT;
+       if (lp_ctx->flags[parmnum] & FLAG_DEFAULT) {
+               lp_ctx->flags[parmnum] &= ~FLAG_DEFAULT;
                /* we have to also unset FLAG_DEFAULT on aliases */
-               for (i=parmnum-1;i>=0 && parm_table[i].ptr == parm_table[parmnum].ptr;i--) {
-                       parm_table[i].flags &= ~FLAG_DEFAULT;
+               for (i=parmnum-1;i>=0 && parm_table[i].offset == parm_table[parmnum].offset;i--) {
+                       lp_ctx->flags[i] &= ~FLAG_DEFAULT;
                }
-               for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].ptr == parm_table[parmnum].ptr;i++) {
-                       parm_table[i].flags &= ~FLAG_DEFAULT;
+               for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].offset == parm_table[parmnum].offset;i++) {
+                       lp_ctx->flags[i] &= ~FLAG_DEFAULT;
                }
        }
        return true;
 }
 
 
-bool lp_do_global_parameter(struct loadparm_context *lp_ctx, 
+bool lp_do_global_parameter(struct loadparm_context *lp_ctx,
                            const char *pszParmName, const char *pszParmValue)
 {
        int parmnum = map_parameter(pszParmName);
@@ -1748,93 +1707,81 @@ bool lp_do_global_parameter(struct loadparm_context *lp_ctx,
 
        if (parmnum < 0) {
                if (strchr(pszParmName, ':')) {
-                       return lp_do_parameter_parametric(NULL, pszParmName, pszParmValue, 0);
+                       return lp_do_parameter_parametric(lp_ctx, NULL, pszParmName, pszParmValue, 0);
                }
                DEBUG(0, ("Ignoring unknown parameter \"%s\"\n", pszParmName));
                return true;
        }
 
-       if (parm_table[parmnum].flags & FLAG_DEPRECATED) {
-               DEBUG(1, ("WARNING: The \"%s\" option is deprecated\n",
-                         pszParmName));
-       }
-
        /* if the flag has been set on the command line, then don't allow override,
           but don't report an error */
-       if (parm_table[parmnum].flags & FLAG_CMDLINE) {
+       if (lp_ctx->flags[parmnum] & FLAG_CMDLINE) {
                return true;
        }
 
-       parm_ptr = parm_table[parmnum].ptr;
+       parm_ptr = lp_parm_ptr(lp_ctx, NULL, &parm_table[parmnum]);
 
-       return set_variable(talloc_autofree_context(), parmnum, parm_ptr, 
+       return set_variable(lp_ctx, parmnum, parm_ptr,
                            pszParmName, pszParmValue, lp_ctx);
 }
 
-bool lp_do_service_parameter(struct loadparm_context *lp_ctx, 
-                            struct loadparm_service *service, 
+bool lp_do_service_parameter(struct loadparm_context *lp_ctx,
+                            struct loadparm_service *service,
                             const char *pszParmName, const char *pszParmValue)
 {
-       void *def_ptr = NULL;
        void *parm_ptr;
        int i;
        int parmnum = map_parameter(pszParmName);
 
        if (parmnum < 0) {
                if (strchr(pszParmName, ':')) {
-                       return lp_do_parameter_parametric(service, pszParmName, pszParmValue, 0);
+                       return lp_do_parameter_parametric(lp_ctx, service, pszParmName, pszParmValue, 0);
                }
                DEBUG(0, ("Ignoring unknown parameter \"%s\"\n", pszParmName));
                return true;
        }
 
-       if (parm_table[parmnum].flags & FLAG_DEPRECATED) {
-               DEBUG(1, ("WARNING: The \"%s\" option is deprecated\n",
-                         pszParmName));
-       }
-
        /* if the flag has been set on the command line, then don't allow override,
           but don't report an error */
-       if (parm_table[parmnum].flags & FLAG_CMDLINE) {
+       if (lp_ctx->flags[parmnum] & FLAG_CMDLINE) {
                return true;
        }
 
-       def_ptr = parm_table[parmnum].ptr;
-
        if (parm_table[parmnum].class == P_GLOBAL) {
                DEBUG(0,
                      ("Global parameter %s found in service section!\n",
                       pszParmName));
                return true;
        }
-       parm_ptr = ((char *)service) + PTR_DIFF(def_ptr, &sDefault);
+       parm_ptr = ((char *)service) + parm_table[parmnum].offset;
 
        if (!service->copymap)
                init_copymap(service);
 
-       /* this handles the aliases - set the copymap for other 
+       /* this handles the aliases - set the copymap for other
         * entries with the same data pointer */
        for (i = 0; parm_table[i].label; i++)
-               if (parm_table[i].ptr == parm_table[parmnum].ptr)
+               if (parm_table[i].offset == parm_table[parmnum].offset &&
+                   parm_table[i].class == parm_table[parmnum].class)
                        service->copymap[i] = false;
 
-       return set_variable(service, parmnum, parm_ptr, pszParmName, 
+       return set_variable(service, parmnum, parm_ptr, pszParmName,
                            pszParmValue, lp_ctx);
 }
 
-/***************************************************************************
- Process a parameter.
-***************************************************************************/
+/**
Process a parameter.
+ */
 
-static bool do_parameter(const char *pszParmName, const char *pszParmValue, 
+static bool do_parameter(const char *pszParmName, const char *pszParmValue,
                         void *userdata)
 {
        struct loadparm_context *lp_ctx = (struct loadparm_context *)userdata;
 
-       if (lp_ctx->bInGlobalSection) 
-               return lp_do_global_parameter(lp_ctx, pszParmName, 
+       if (lp_ctx->bInGlobalSection)
+               return lp_do_global_parameter(lp_ctx, pszParmName,
                                              pszParmValue);
-       else 
+       else
                return lp_do_service_parameter(lp_ctx, lp_ctx->currentService,
                                               pszParmName, pszParmValue);
 }
@@ -1843,14 +1790,14 @@ static bool do_parameter(const char *pszParmName, const char *pszParmValue,
   variable argument do parameter
 */
 bool lp_do_global_parameter_var(struct loadparm_context *lp_ctx, const char *pszParmName, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);
-bool lp_do_global_parameter_var(struct loadparm_context *lp_ctx, 
-                               const char *pszParmName, const char *fmt, ...) 
+bool lp_do_global_parameter_var(struct loadparm_context *lp_ctx,
+                               const char *pszParmName, const char *fmt, ...)
 {
        char *s;
        bool ret;
        va_list ap;
 
-       va_start(ap, fmt);      
+       va_start(ap, fmt);
        s = talloc_vasprintf(NULL, fmt, ap);
        va_end(ap);
        ret = lp_do_global_parameter(lp_ctx, pszParmName, s);
@@ -1864,7 +1811,8 @@ bool lp_do_global_parameter_var(struct loadparm_context *lp_ctx,
   parsing code. It sets the parameter then marks the parameter as unable to be modified
   by smb.conf processing
 */
-bool lp_set_cmdline(const char *pszParmName, const char *pszParmValue)
+bool lp_set_cmdline(struct loadparm_context *lp_ctx, const char *pszParmName,
+                   const char *pszParmValue)
 {
        int parmnum = map_parameter(pszParmName);
        int i;
@@ -1874,7 +1822,8 @@ bool lp_set_cmdline(const char *pszParmName, const char *pszParmValue)
 
        if (parmnum < 0 && strchr(pszParmName, ':')) {
                /* set a parametric option */
-               return lp_do_parameter_parametric(NULL, pszParmName, pszParmValue, FLAG_CMDLINE);
+               return lp_do_parameter_parametric(lp_ctx, NULL, pszParmName,
+                                                 pszParmValue, FLAG_CMDLINE);
        }
 
        if (parmnum < 0) {
@@ -1883,20 +1832,20 @@ bool lp_set_cmdline(const char *pszParmName, const char *pszParmValue)
        }
 
        /* reset the CMDLINE flag in case this has been called before */
-       parm_table[parmnum].flags &= ~FLAG_CMDLINE;
+       lp_ctx->flags[parmnum] &= ~FLAG_CMDLINE;
 
-       if (!lp_do_global_parameter(&loadparm, pszParmName, pszParmValue)) {
+       if (!lp_do_global_parameter(lp_ctx, pszParmName, pszParmValue)) {
                return false;
        }
 
-       parm_table[parmnum].flags |= FLAG_CMDLINE;
+       lp_ctx->flags[parmnum] |= FLAG_CMDLINE;
 
        /* we have to also set FLAG_CMDLINE on aliases */
-       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>=0 && parm_table[i].offset == parm_table[parmnum].offset;i--) {
+               lp_ctx->flags[i] |= FLAG_CMDLINE;
        }
-       for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].ptr == parm_table[parmnum].ptr;i++) {
-               parm_table[i].flags |= FLAG_CMDLINE;
+       for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].offset == parm_table[parmnum].offset;i++) {
+               lp_ctx->flags[i] |= FLAG_CMDLINE;
        }
 
        return true;
@@ -1905,7 +1854,7 @@ bool lp_set_cmdline(const char *pszParmName, const char *pszParmValue)
 /*
   set a option from the commandline in 'a=b' format. Use to support --option
 */
-bool lp_set_option(const char *option)
+bool lp_set_option(struct loadparm_context *lp_ctx, const char *option)
 {
        char *p, *s;
        bool ret;
@@ -1923,7 +1872,7 @@ bool lp_set_option(const char *option)
 
        *p = 0;
 
-       ret = lp_set_cmdline(s, p+1);
+       ret = lp_set_cmdline(lp_ctx, s, p+1);
        free(s);
        return ret;
 }
@@ -1931,9 +1880,9 @@ bool lp_set_option(const char *option)
 
 #define BOOLSTR(b) ((b) ? "Yes" : "No")
 
-/***************************************************************************
- Print a parameter of the specified type.
-***************************************************************************/
+/**
Print a parameter of the specified type.
+ */
 
 static void print_parameter(struct parm_struct *p, void *ptr, FILE * f)
 {
@@ -1966,7 +1915,7 @@ static void print_parameter(struct parm_struct *p, void *ptr, FILE * f)
                case P_LIST:
                        if ((char ***)ptr && *(char ***)ptr) {
                                char **list = *(char ***)ptr;
-                               
+
                                for (; *list; list++)
                                        fprintf(f, "%s%s", *list,
                                                ((*(list+1))?", ":""));
@@ -1979,14 +1928,12 @@ static void print_parameter(struct parm_struct *p, void *ptr, FILE * f)
                                fprintf(f, "%s", *(char **)ptr);
                        }
                        break;
-               case P_SEP:
-                       break;
        }
 }
 
-/***************************************************************************
- Check if two parameters are equal.
-***************************************************************************/
+/**
Check if two parameters are equal.
+ */
 
 static bool equal_parameter(parm_type type, void *ptr1, void *ptr2)
 {
@@ -2001,7 +1948,7 @@ static bool equal_parameter(parm_type type, void *ptr1, void *ptr2)
                        return (*((int *)ptr1) == *((int *)ptr2));
 
                case P_LIST:
-                       return str_list_equal((const char **)(*(char ***)ptr1), 
+                       return str_list_equal((const char **)(*(char ***)ptr1),
                                              (const char **)(*(char ***)ptr2));
 
                case P_STRING:
@@ -2014,17 +1961,17 @@ static bool equal_parameter(parm_type type, void *ptr1, void *ptr2)
                                p2 = NULL;
                        return (p1 == p2 || strequal(p1, p2));
                }
-               case P_SEP:
-                       break;
        }
        return false;
 }
 
-/***************************************************************************
- Process a new section (service). At this stage all sections are services.
- Later we'll have special sections that permit server parameters to be set.
- Returns True on success, False on failure. 
-***************************************************************************/
+/**
+ * Process a new section (service).
+ *
+ * At this stage all sections are services.
+ * Later we'll have special sections that permit server parameters to be set.
+ * Returns True on success, False on failure.
+ */
 
 static bool do_section(const char *pszSectionName, void *userdata)
 {
@@ -2055,7 +2002,7 @@ static bool do_section(const char *pszSectionName, void *userdata)
                /* issued by the post-processing of a previous section. */
                DEBUG(2, ("Processing section \"[%s]\"\n", pszSectionName));
 
-               if ((loadparm.currentService = add_a_service(lp_ctx, &sDefault, 
+               if ((lp_ctx->currentService = lp_add_service(lp_ctx, lp_ctx->sDefault,
                                                             pszSectionName))
                    == NULL) {
                        DEBUG(0, ("Failed to add a new service\n"));
@@ -2067,60 +2014,60 @@ static bool do_section(const char *pszSectionName, void *userdata)
 }
 
 
-/***************************************************************************
Determine if a partcular base parameter is currentl set to the default value.
-***************************************************************************/
+/**
* Determine if a particular base parameter is currently set to the default value.
+ */
 
-static bool is_default(int i)
+static bool is_default(struct loadparm_service *sDefault, int i)
 {
+       void *def_ptr = ((char *)sDefault) + parm_table[i].offset;
        if (!defaults_saved)
                return false;
        switch (parm_table[i].type) {
                case P_LIST:
                        return str_list_equal((const char **)parm_table[i].def.lvalue, 
-                                             (const char **)(*(char ***)parm_table[i].ptr));
+                                             (const char **)def_ptr);
                case P_STRING:
                case P_USTRING:
                        return strequal(parm_table[i].def.svalue,
-                                       *(char **)parm_table[i].ptr);
+                                       *(char **)def_ptr);
                case P_BOOL:
                        return parm_table[i].def.bvalue ==
-                               *(int *)parm_table[i].ptr;
+                               *(int *)def_ptr;
                case P_INTEGER:
                case P_OCTAL:
                case P_BYTES:
                case P_ENUM:
                        return parm_table[i].def.ivalue ==
-                               *(int *)parm_table[i].ptr;
-               case P_SEP:
-                       break;
+                               *(int *)def_ptr;
        }
        return false;
 }
 
-/***************************************************************************
-Display the contents of the global structure.
-***************************************************************************/
+/**
+ *Display the contents of the global structure.
+ */
 
-static void dump_globals(FILE *f, bool show_defaults)
+static void dump_globals(struct loadparm_context *lp_ctx, FILE *f,
+                        bool show_defaults)
 {
        int i;
        struct param_opt *data;
-       
+
        fprintf(f, "# Global parameters\n[global]\n");
 
        for (i = 0; parm_table[i].label; i++)
                if (parm_table[i].class == P_GLOBAL &&
-                   parm_table[i].ptr &&
-                   (i == 0 || (parm_table[i].ptr != parm_table[i - 1].ptr))) {
-                       if (!show_defaults && (parm_table[i].flags & FLAG_DEFAULT)) 
+                   parm_table[i].offset != -1 &&
+                   (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) {
+                       if (!show_defaults && (lp_ctx->flags[i] & FLAG_DEFAULT)) 
                                continue;
                        fprintf(f, "\t%s = ", parm_table[i].label);
-                       print_parameter(&parm_table[i], parm_table[i].ptr, f);
+                       print_parameter(&parm_table[i], lp_parm_ptr(lp_ctx, NULL, &parm_table[i]), f);
                        fprintf(f, "\n");
        }
-       if (loadparm.Globals.param_opt != NULL) {
-               for (data = loadparm.Globals.param_opt; data; 
+       if (lp_ctx->globals->param_opt != NULL) {
+               for (data = lp_ctx->globals->param_opt; data;
                     data = data->next) {
                        fprintf(f, "\t%s = %s\n", data->key, data->value);
                }
@@ -2128,40 +2075,38 @@ static void dump_globals(FILE *f, bool show_defaults)
 
 }
 
-/***************************************************************************
- Display the contents of a single services record.
-***************************************************************************/
+/**
Display the contents of a single services record.
+ */
 
-static void dump_a_service(struct loadparm_service * pService, FILE * f)
+static void dump_a_service(struct loadparm_service * pService, struct loadparm_service *sDefault, FILE * f)
 {
        int i;
        struct param_opt *data;
-       
-       if (pService != &sDefault)
+
+       if (pService != sDefault)
                fprintf(f, "\n[%s]\n", pService->szService);
 
        for (i = 0; parm_table[i].label; i++)
                if (parm_table[i].class == P_LOCAL &&
-                   parm_table[i].ptr &&
+                   parm_table[i].offset != -1 &&
                    (*parm_table[i].label != '-') &&
-                   (i == 0 || (parm_table[i].ptr != parm_table[i - 1].ptr))) {
-                       int pdiff = PTR_DIFF(parm_table[i].ptr, &sDefault);
-
-                       if (pService == &sDefault) {
-                               if (defaults_saved && is_default(i))
+                   (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) {
+                       if (pService == sDefault) {
+                               if (defaults_saved && is_default(sDefault, i))
                                        continue;
                        } else {
                                if (equal_parameter(parm_table[i].type,
                                                    ((char *)pService) +
-                                                   pdiff,
-                                                   ((char *)&sDefault) +
-                                                   pdiff))
+                                                   parm_table[i].offset,
+                                                   ((char *)sDefault) +
+                                                   parm_table[i].offset))
                                        continue;
                        }
 
                        fprintf(f, "\t%s = ", parm_table[i].label);
                        print_parameter(&parm_table[i],
-                                       ((char *)pService) + pdiff, f);
+                                       ((char *)pService) + parm_table[i].offset, f);
                        fprintf(f, "\n");
        }
        if (pService->param_opt != NULL) {
@@ -2171,77 +2116,64 @@ static void dump_a_service(struct loadparm_service * pService, FILE * f)
         }
 }
 
-bool lp_dump_a_parameter(int snum, char *parm_name, FILE * f, bool isGlobal)
+bool lp_dump_a_parameter(struct loadparm_context *lp_ctx,
+                        struct loadparm_service *service,
+                        const char *parm_name, FILE * f)
 {
-       struct loadparm_service * pService = loadparm.ServicePtrs[snum];
        struct parm_struct *parm;
        void *ptr;
-       
+
        parm = lp_parm_struct(parm_name);
        if (!parm) {
                return false;
        }
-       
-       if (isGlobal)
-               ptr = parm->ptr;
-       else
-               ptr = ((char *)pService) +
-                       PTR_DIFF(parm->ptr, &sDefault);
-       
-       print_parameter(parm,
-                       ptr, f);
+
+       ptr = lp_parm_ptr(lp_ctx, service,parm);
+
+       print_parameter(parm, ptr, f);
        fprintf(f, "\n");
        return true;
 }
 
-/***************************************************************************
- Return info about the next service  in a service. snum==-1 gives the globals.
- Return NULL when out of parameters.
-***************************************************************************/
+/**
Return info about the next service  in a service. snum==-1 gives the globals.
Return NULL when out of parameters.
+ */
 
-struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters)
+struct parm_struct *lp_next_parameter(struct loadparm_context *lp_ctx, int snum, int *i, 
+                                     int allparameters)
 {
        if (snum == -1) {
                /* do the globals */
                for (; parm_table[*i].label; (*i)++) {
-                       if (parm_table[*i].class == P_SEPARATOR)
-                               return &parm_table[(*i)++];
-
-                       if (!parm_table[*i].ptr
+                       if (parm_table[*i].offset == -1
                            || (*parm_table[*i].label == '-'))
                                continue;
 
                        if ((*i) > 0
-                           && (parm_table[*i].ptr ==
-                               parm_table[(*i) - 1].ptr))
+                           && (parm_table[*i].offset ==
+                               parm_table[(*i) - 1].offset))
                                continue;
 
                        return &parm_table[(*i)++];
                }
        } else {
-               struct loadparm_service *pService = loadparm.ServicePtrs[snum];
+               struct loadparm_service *pService = lp_ctx->services[snum];
 
                for (; parm_table[*i].label; (*i)++) {
-                       if (parm_table[*i].class == P_SEPARATOR)
-                               return &parm_table[(*i)++];
-
                        if (parm_table[*i].class == P_LOCAL &&
-                           parm_table[*i].ptr &&
+                           parm_table[*i].offset != -1 &&
                            (*parm_table[*i].label != '-') &&
                            ((*i) == 0 ||
-                            (parm_table[*i].ptr !=
-                             parm_table[(*i) - 1].ptr)))
+                            (parm_table[*i].offset !=
+                             parm_table[(*i) - 1].offset)))
                        {
-                               int pdiff =
-                                       PTR_DIFF(parm_table[*i].ptr,
-                                                &sDefault);
-
                                if (allparameters ||
                                    !equal_parameter(parm_table[*i].type,
                                                     ((char *)pService) +
-                                                    pdiff,
-                                                    ((char *)&sDefault) +
-                                                    pdiff))
+                                                    parm_table[*i].offset,
+                                                    ((char *)lp_ctx->sDefault) +
+                                                    parm_table[*i].offset))
                                {
                                        return &parm_table[(*i)++];
                                }
@@ -2253,67 +2185,103 @@ struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters)
 }
 
 
-/***************************************************************************
- Auto-load some home services.
-***************************************************************************/
-
-static void lp_add_auto_services(struct loadparm_context *lp_ctx, 
+/**
+ * Auto-load some home services.
+ */
+static void lp_add_auto_services(struct loadparm_context *lp_ctx,
                                 const char *str)
 {
        return;
 }
 
-/***************************************************************************
- Have we loaded a services file yet?
-***************************************************************************/
 
-bool lp_loaded(void)
-{
-       return bLoaded;
-}
-
-/***************************************************************************
- Unload unused services.
-***************************************************************************/
+/**
+ * Unload unused services.
+ */
 
-void lp_killunused(struct smbsrv_connection *smb, bool (*snumused) (struct smbsrv_connection *, int))
+void lp_killunused(struct loadparm_context *lp_ctx,
+                  struct smbsrv_connection *smb,
+                  bool (*snumused) (struct smbsrv_connection *, int))
 {
        int i;
-       for (i = 0; i < loadparm.iNumServices; i++) {
-               if (loadparm.ServicePtrs[i] == NULL)
+       for (i = 0; i < lp_ctx->iNumServices; i++) {
+               if (lp_ctx->services[i] == NULL)
                        continue;
 
                if (!snumused || !snumused(smb, i)) {
-                       talloc_free(loadparm.ServicePtrs[i]);
-                       loadparm.ServicePtrs[i] = NULL;
+                       talloc_free(lp_ctx->services[i]);
+                       lp_ctx->services[i] = NULL;
                }
        }
 }
 
-/***************************************************************************
- Initialise the global parameter structure.
-***************************************************************************/
-bool loadparm_init(struct loadparm_context *lp_ctx)
+
+static int lp_destructor(struct loadparm_context *lp_ctx)
+{
+       struct param_opt *data;
+
+       if (lp_ctx->globals->param_opt != NULL) {
+               struct param_opt *next;
+               for (data = lp_ctx->globals->param_opt; data; data=next) {
+                       next = data->next;
+                       if (data->flags & FLAG_CMDLINE) continue;
+                       DLIST_REMOVE(lp_ctx->globals->param_opt, data);
+                       talloc_free(data);
+               }
+       }
+
+       return 0;
+}
+
+/**
+ * Initialise the global parameter structure.
+ */
+struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 {
        int i;
        char *myname;
+       struct loadparm_context *lp_ctx;
+
+       lp_ctx = talloc_zero(mem_ctx, struct loadparm_context);
+       if (lp_ctx == NULL)
+               return NULL;
+
+       talloc_set_destructor(lp_ctx, lp_destructor);
+       lp_ctx->bInGlobalSection = true;
+       lp_ctx->globals = talloc_zero(lp_ctx, struct loadparm_global);
+       lp_ctx->sDefault = talloc_zero(lp_ctx, struct loadparm_service);
+
+       lp_ctx->sDefault->iMaxPrintJobs = 1000;
+       lp_ctx->sDefault->bAvailable = true;
+       lp_ctx->sDefault->bBrowseable = true;
+       lp_ctx->sDefault->bRead_only = true;
+       lp_ctx->sDefault->bMap_archive = true;
+       lp_ctx->sDefault->bStrictLocking = true;
+       lp_ctx->sDefault->bOplocks = true;
+       lp_ctx->sDefault->iCreate_mask = 0744;
+       lp_ctx->sDefault->iCreate_force_mode = 0000;
+       lp_ctx->sDefault->iDir_mask = 0755;
+       lp_ctx->sDefault->iDir_force_mode = 0000;
 
        DEBUG(3, ("Initialising global parameters\n"));
 
        for (i = 0; parm_table[i].label; i++) {
                if ((parm_table[i].type == P_STRING ||
                     parm_table[i].type == P_USTRING) &&
-                   parm_table[i].ptr &&
-                   !(parm_table[i].flags & FLAG_CMDLINE)) {
-                       string_set(talloc_autofree_context(), 
-                                  (char **)parm_table[i].ptr, "");
+                   parm_table[i].offset != -1 &&
+                   !(lp_ctx->flags[i] & FLAG_CMDLINE)) {
+                       char **r;
+                       if (parm_table[i].class == P_LOCAL) {
+                               r = (char **)(((char *)lp_ctx->sDefault) + parm_table[i].offset);
+                       } else {
+                               r = (char **)(((char *)lp_ctx->globals) + parm_table[i].offset);
+                       }
+                       *r = talloc_strdup(lp_ctx, "");
                }
        }
 
-       lp_do_global_parameter(lp_ctx, "config file", dyn_CONFIGFILE);
-
        lp_do_global_parameter(lp_ctx, "share backend", "classic");
-       
+
        lp_do_global_parameter(lp_ctx, "server role", "standalone");
 
        /* options that can be set on the command line must be initialised via
@@ -2325,20 +2293,21 @@ bool loadparm_init(struct loadparm_context *lp_ctx)
        myname = get_myname();
        lp_do_global_parameter(lp_ctx, "netbios name", myname);
        SAFE_FREE(myname);
-       lp_do_global_parameter(lp_ctx, "name resolve order", "lmhosts wins host bcast");
+       lp_do_global_parameter(lp_ctx, "name resolve order", "wins host bcast");
 
        lp_do_global_parameter(lp_ctx, "fstype", FSTYPE_STRING);
        lp_do_global_parameter(lp_ctx, "ntvfs handler", "unixuid default");
        lp_do_global_parameter(lp_ctx, "max connections", "-1");
 
        lp_do_global_parameter(lp_ctx, "dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup unixinfo");
-       lp_do_global_parameter(lp_ctx, "server services", "smb rpc nbt wrepl ldap cldap web kdc drepl winbind");
+       lp_do_global_parameter(lp_ctx, "server services", "smb rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd");
        lp_do_global_parameter(lp_ctx, "ntptr providor", "simple_ldb");
        lp_do_global_parameter(lp_ctx, "auth methods:domain controller", "anonymous sam_ignoredomain");
        lp_do_global_parameter(lp_ctx, "auth methods:member server", "anonymous sam winbind");
        lp_do_global_parameter(lp_ctx, "auth methods:standalone", "anonymous sam_ignoredomain");
        lp_do_global_parameter(lp_ctx, "private dir", dyn_PRIVATE_DIR);
        lp_do_global_parameter(lp_ctx, "sam database", "sam.ldb");
+       lp_do_global_parameter(lp_ctx, "idmap database", "idmap.ldb");
        lp_do_global_parameter(lp_ctx, "secrets database", "secrets.ldb");
        lp_do_global_parameter(lp_ctx, "spoolss database", "spoolss.ldb");
        lp_do_global_parameter(lp_ctx, "wins config database", "wins_config.ldb");
@@ -2349,7 +2318,7 @@ bool loadparm_init(struct loadparm_context *lp_ctx)
           data from the sam, but for the moment leave it in a tdb to
           keep regedt32 from popping up an annoying dialog. */
        lp_do_global_parameter(lp_ctx, "registry:HKEY_USERS", "hku.ldb");
-       
+
        /* using UTF8 by default allows us to support all chars */
        lp_do_global_parameter(lp_ctx, "unix charset", "UTF8");
 
@@ -2367,10 +2336,10 @@ bool loadparm_init(struct loadparm_context *lp_ctx)
        lp_do_global_parameter(lp_ctx, "ncalrpc dir", dyn_NCALRPCDIR);
 
        lp_do_global_parameter(lp_ctx, "socket address", "0.0.0.0");
-       lp_do_global_parameter_var(lp_ctx, "server string", 
+       lp_do_global_parameter_var(lp_ctx, "server string",
                                   "Samba %s", SAMBA_VERSION_STRING);
 
-       lp_do_global_parameter_var(lp_ctx, "announce version", "%d.%d", 
+       lp_do_global_parameter_var(lp_ctx, "announce version", "%d.%d",
                         DEFAULT_MAJOR_VERSION,
                         DEFAULT_MINOR_VERSION);
 
@@ -2400,7 +2369,7 @@ bool loadparm_init(struct loadparm_context *lp_ctx)
        lp_do_global_parameter(lp_ctx, "LanmanAuth", "True");
        lp_do_global_parameter(lp_ctx, "NTLMAuth", "True");
        lp_do_global_parameter(lp_ctx, "client use spnego principal", "False");
-       
+
        lp_do_global_parameter(lp_ctx, "UnixExtensions", "False");
 
        lp_do_global_parameter(lp_ctx, "PreferredMaster", "Auto");
@@ -2412,8 +2381,10 @@ bool loadparm_init(struct loadparm_context *lp_ctx)
        lp_do_global_parameter(lp_ctx, "winbind separator", "\\");
        lp_do_global_parameter(lp_ctx, "winbind sealed pipes", "True");
        lp_do_global_parameter(lp_ctx, "winbindd socket directory", dyn_WINBINDD_SOCKET_DIR);
+       lp_do_global_parameter(lp_ctx, "winbindd privileged socket directory", dyn_WINBINDD_PRIVILEGED_SOCKET_DIR);
        lp_do_global_parameter(lp_ctx, "template shell", "/bin/false");
        lp_do_global_parameter(lp_ctx, "template homedir", "/home/%WORKGROUP%/%ACCOUNTNAME%");
+       lp_do_global_parameter(lp_ctx, "idmap trusted only", "False");
 
        lp_do_global_parameter(lp_ctx, "client signing", "Yes");
        lp_do_global_parameter(lp_ctx, "server signing", "auto");
@@ -2438,51 +2409,51 @@ bool loadparm_init(struct loadparm_context *lp_ctx)
        lp_do_global_parameter(lp_ctx, "tls keyfile", "tls/key.pem");
        lp_do_global_parameter(lp_ctx, "tls certfile", "tls/cert.pem");
        lp_do_global_parameter(lp_ctx, "tls cafile", "tls/ca.pem");
-       lp_do_global_parameter_var(lp_ctx, "js include", "%s", dyn_JSDIR);
-       lp_do_global_parameter_var(lp_ctx, "setup directory", "%s", 
+       lp_do_global_parameter_var(lp_ctx, "setup directory", "%s",
                                   dyn_SETUPDIR);
 
+       lp_do_global_parameter(lp_ctx, "prefork children:smb", "4");
+
+       lp_do_global_parameter(lp_ctx, "ntp signd socket directory", dyn_NTP_SIGND_SOCKET_DIR);
+
        for (i = 0; parm_table[i].label; i++) {
-               if (!(parm_table[i].flags & FLAG_CMDLINE)) {
-                       parm_table[i].flags |= FLAG_DEFAULT;
+               if (!(lp_ctx->flags[i] & FLAG_CMDLINE)) {
+                       lp_ctx->flags[i] |= FLAG_DEFAULT;
                }
        }
 
-       return true;
+       return lp_ctx;
 }
 
-/***************************************************************************
- Load the services array from the services file. Return True on success, 
- False on failure.
-***************************************************************************/
+const char *lp_configfile(struct loadparm_context *lp_ctx)
+{
+       return lp_ctx->szConfigFile;
+}
 
-bool lp_load(void)
+bool lp_load_default(struct loadparm_context *lp_ctx)
+{
+       return lp_load(lp_ctx, dyn_CONFIGFILE);
+}
+
+/**
+ * Load the services array from the services file.
+ *
+ * Return True on success, False on failure.
+ */
+bool lp_load(struct loadparm_context *lp_ctx, const char *filename)
 {
        char *n2;
        bool bRetval;
-       struct param_opt *data;
-       struct loadparm_context *lp_ctx = &loadparm;
 
-       bRetval = false;
+       filename = talloc_strdup(lp_ctx, filename);
 
-       if (lp_ctx->Globals.param_opt != NULL) {
-               struct param_opt *next;
-               for (data = lp_ctx->Globals.param_opt; data; data=next) {
-                       next = data->next;
-                       if (data->flags & FLAG_CMDLINE) continue;
-                       DLIST_REMOVE(lp_ctx->Globals.param_opt, data);
-                       talloc_free(data);
-               }
-       }
+       lp_ctx->szConfigFile = filename;
 
-       if (!loadparm_init(lp_ctx))
-               return false;
-       
        lp_ctx->bInGlobalSection = true;
-       n2 = standard_sub_basic(talloc_autofree_context(), lp_configfile());
+       n2 = standard_sub_basic(lp_ctx, lp_ctx->szConfigFile);
        DEBUG(2, ("lp_load: refreshing parameters from %s\n", n2));
-       
-       add_to_file_list(lp_ctx, lp_configfile(), n2);
+
+       add_to_file_list(lp_ctx, lp_ctx->szConfigFile, n2);
 
        /* We get sections first, so have to start 'behind' to make up */
        lp_ctx->currentService = NULL;
@@ -2494,87 +2465,93 @@ bool lp_load(void)
                if (lp_ctx->currentService != NULL)
                        bRetval = service_ok(lp_ctx->currentService);
 
-       lp_add_auto_services(lp_ctx, lp_auto_services());
+       lp_add_auto_services(lp_ctx, lp_auto_services(lp_ctx));
 
        lp_add_hidden(lp_ctx, "IPC$", "IPC");
        lp_add_hidden(lp_ctx, "ADMIN$", "DISK");
 
-       bLoaded = true;
-
-       if (!lp_ctx->Globals.szWINSservers && lp_ctx->Globals.bWINSsupport) {
+       if (!lp_ctx->globals->szWINSservers && lp_ctx->globals->bWINSsupport) {
                lp_do_global_parameter(lp_ctx, "wins server", "127.0.0.1");
        }
 
-       init_iconv();
+       panic_action = lp_ctx->globals->panic_action;
+
+       reload_charcnv(lp_ctx);
+
+       /* FIXME: Check locale in environment for this: */
+       if (strcmp(lp_display_charset(lp_ctx), lp_unix_charset(lp_ctx)) != 0)
+               d_set_iconv(smb_iconv_open(lp_display_charset(lp_ctx), lp_unix_charset(lp_ctx)));
+       else
+               d_set_iconv((smb_iconv_t)-1);
 
        return bRetval;
 }
 
-/***************************************************************************
- Return the max number of services.
-***************************************************************************/
+/**
Return the max number of services.
+ */
 
-int lp_numservices(void)
+int lp_numservices(struct loadparm_context *lp_ctx)
 {
-       return loadparm.iNumServices;
+       return lp_ctx->iNumServices;
 }
 
-/***************************************************************************
-Display the contents of the services array in human-readable form.
-***************************************************************************/
+/**
+ * Display the contents of the services array in human-readable form.
+ */
 
-void lp_dump(FILE *f, bool show_defaults, int maxtoprint)
+void lp_dump(struct loadparm_context *lp_ctx, FILE *f, bool show_defaults,
+            int maxtoprint)
 {
-       struct loadparm_context *lp_ctx;
        int iService;
 
-       lp_ctx = &loadparm;
-
        if (show_defaults)
                defaults_saved = false;
 
-       dump_globals(f, show_defaults);
+       dump_globals(lp_ctx, f, show_defaults);
 
-       dump_a_service(&sDefault, f);
+       dump_a_service(lp_ctx->sDefault, lp_ctx->sDefault, f);
 
        for (iService = 0; iService < maxtoprint; iService++)
-               lp_dump_one(f, show_defaults, lp_ctx->ServicePtrs[iService]);
+               lp_dump_one(f, show_defaults, lp_ctx->services[iService], lp_ctx->sDefault);
 }
 
-/***************************************************************************
-Display the contents of one service in human-readable form.
-***************************************************************************/
-
-void lp_dump_one(FILE *f, bool show_defaults, struct loadparm_service *service)
+/**
+ * Display the contents of one service in human-readable form.
+ */
+void lp_dump_one(FILE *f, bool show_defaults, struct loadparm_service *service, struct loadparm_service *sDefault)
 {
        if (service != NULL) {
                if (service->szService[0] == '\0')
                        return;
-               dump_a_service(service, f);
+               dump_a_service(service, sDefault, f);
        }
 }
 
-struct loadparm_service *lp_servicebynum(int snum)
+struct loadparm_service *lp_servicebynum(struct loadparm_context *lp_ctx,
+                                        int snum)
 {
-       return loadparm.ServicePtrs[snum];
+       return lp_ctx->services[snum];
 }
 
-struct loadparm_service *lp_service(const char *service_name)
+struct loadparm_service *lp_service(struct loadparm_context *lp_ctx,
+                                   const char *service_name)
 {
        int iService;
         char *serviceName;
-       for (iService = loadparm.iNumServices - 1; iService >= 0; iService--) {
-               if (loadparm.ServicePtrs[iService] && 
-                   loadparm.ServicePtrs[iService]->szService) {
+
+       for (iService = lp_ctx->iNumServices - 1; iService >= 0; iService--) {
+               if (lp_ctx->services[iService] &&
+                   lp_ctx->services[iService]->szService) {
                        /*
                         * The substitution here is used to support %U is
                         * service names
                         */
-                       serviceName = standard_sub_basic(loadparm.ServicePtrs[iService],
-                                                        loadparm.ServicePtrs[iService]->szService);
+                       serviceName = standard_sub_basic(
+                                       lp_ctx->services[iService],
+                                       lp_ctx->services[iService]->szService);
                        if (strequal(serviceName, service_name))
-                               return loadparm.ServicePtrs[iService];
+                               return lp_ctx->services[iService];
                }
        }
 
@@ -2583,46 +2560,80 @@ struct loadparm_service *lp_service(const char *service_name)
 }
 
 
-/*******************************************************************
- A useful volume label function. 
-********************************************************************/
-const char *volume_label(struct loadparm_service *service)
+/**
+ * A useful volume label function.
+ */
+const char *volume_label(struct loadparm_service *service, struct loadparm_service *sDefault)
 {
-       const char *ret = lp_volume(service);
+       const char *ret = lp_volume(service, sDefault);
        if (!*ret)
                return lp_servicename(service);
        return ret;
 }
 
 
-/***********************************************************
- If we are PDC then prefer us as DMB
-************************************************************/
-
-bool lp_domain_logons(void)
-{
-       return (lp_server_role() == ROLE_DOMAIN_CONTROLLER);
-}
-
-const char *lp_printername(struct loadparm_service *service)
+/**
+ * If we are PDC then prefer us as DMB
+ */
+const char *lp_printername(struct loadparm_service *service, struct loadparm_service *sDefault)
 {
-       const char *ret = _lp_printername(service);
+       const char *ret = _lp_printername(service, sDefault);
        if (ret == NULL || (ret != NULL && *ret == '\0'))
-               ret = lp_const_servicename(service);
+               ret = lp_servicename(service);
 
        return ret;
 }
 
 
-/*******************************************************************
- Return the max print jobs per queue.
-********************************************************************/
-
-int lp_maxprintjobs(struct loadparm_service *service)
+/**
+ * Return the max print jobs per queue.
+ */
+int lp_maxprintjobs(struct loadparm_service *service, struct loadparm_service *sDefault)
 {
-       int maxjobs = (service != NULL) ? service->iMaxPrintJobs : sDefault.iMaxPrintJobs;
+       int maxjobs = (service != NULL) ? service->iMaxPrintJobs : sDefault->iMaxPrintJobs;
        if (maxjobs <= 0 || maxjobs >= PRINT_MAX_JOBID)
                maxjobs = PRINT_MAX_JOBID - 1;
 
        return maxjobs;
 }
+
+struct smb_iconv_convenience *lp_iconv_convenience(struct loadparm_context *lp_ctx)
+{
+       if (lp_ctx == NULL) {
+               static struct smb_iconv_convenience *fallback_ic = NULL;
+               if (fallback_ic == NULL)
+                       fallback_ic = smb_iconv_convenience_init(talloc_autofree_context(), 
+                                                 "CP850", "UTF8", true);
+               return fallback_ic;
+       }
+       return lp_ctx->iconv_convenience;
+}
+
+_PUBLIC_ void reload_charcnv(struct loadparm_context *lp_ctx)
+{
+       talloc_free(lp_ctx->iconv_convenience);
+       lp_ctx->iconv_convenience = smb_iconv_convenience_init_lp(lp_ctx, lp_ctx);
+}
+
+void lp_smbcli_options(struct loadparm_context *lp_ctx,
+                        struct smbcli_options *options)
+{
+       options->max_xmit = lp_max_xmit(lp_ctx);
+       options->max_mux = lp_maxmux(lp_ctx);
+       options->use_spnego = lp_nt_status_support(lp_ctx) && lp_use_spnego(lp_ctx); 
+       options->signing = lp_client_signing(lp_ctx);
+       options->request_timeout = SMB_REQUEST_TIMEOUT;
+       options->ntstatus_support = lp_nt_status_support(lp_ctx);
+       options->max_protocol = lp_cli_maxprotocol(lp_ctx);
+       options->unicode = lp_unicode(lp_ctx);
+       options->use_oplocks = true;
+       options->use_level2_oplocks = true;
+}
+
+void lp_smbcli_session_options(struct loadparm_context *lp_ctx,
+                                struct smbcli_session_options *options)
+{
+       options->lanman_auth = lp_client_lanman_auth(lp_ctx);
+       options->ntlmv2_auth = lp_client_ntlmv2_auth(lp_ctx);
+       options->plaintext_auth = lp_client_plaintext_auth(lp_ctx);
+}