r25038: Pass context in more places.
[kai/samba.git] / source4 / param / loadparm.c
index 85044e3a04b9c2d812b60e6ecbace2b45ab7b08b..6becf820666b487970b68ca6e73c0e33190bf212 100644 (file)
@@ -10,6 +10,7 @@
    Copyright (C) Stefan (metze) Metzmacher 2002
    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
 #include "includes.h"
 #include "version.h"
 #include "dynconfig.h"
-#include "pstring.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 "param/param.h"
 #include "param/loadparm.h"
+#include "pstring.h"
 
-static BOOL bLoaded = False;
+static bool bLoaded = false;
 
-#define standard_sub_basic(str,len)
+#define standard_sub_basic talloc_strdup
 
 /* some helpful bits */
-#define LP_SNUM_OK(i) (((i) >= 0) && ((i) < iNumServices) && ServicePtrs[(i)]->valid)
-#define VALID(i) ServicePtrs[i]->valid
-
-static BOOL do_parameter(const char *, const char *, void *);
-static BOOL do_parameter_var(const char *pszParmName, const char *fmt, ...);
+#define LP_SNUM_OK(i) (((i) >= 0) && ((i) < loadparm.iNumServices) && VALID(i))
+#define VALID(i) (loadparm.ServicePtrs[i] != NULL)
 
-static BOOL defaults_saved = False;
+static bool do_parameter(const char *, const char *, void *);
 
+static bool defaults_saved = false;
 
 struct param_opt {
        struct param_opt *prev, *next;
@@ -87,15 +87,12 @@ struct param_opt {
 /* 
  * This structure describes global (ie., server-wide) parameters.
  */
-typedef struct
+struct global
 {
-       int server_role;
+       enum server_role server_role;
 
        char **smb_ports;
-       char *dos_charset;
-       char *unix_charset;
        char *ncalrpc_dir;
-       char *display_charset;
        char *szLockDir;
        char *szModulesDir;
        char *szPidDir;
@@ -131,6 +128,8 @@ typedef struct
        char *ntptr_providor;
        char *szWinbindSeparator;
        char *szWinbinddSocketDirectory;
+       char *szTemplateShell;
+       char *szTemplateHomedir;
        int bWinbindSealedPipes;
        char *webapps_directory;
        int tls_enabled;
@@ -176,8 +175,8 @@ typedef struct
        int bLanmanAuth;
        int bNTLMAuth;
        int bUseSpnego;
-       int  server_signing;
-       int  client_signing;
+       int server_signing;
+       int client_signing;
        int bClientPlaintextAuth;
        int bClientLanManAuth;
        int bClientNTLMv2Auth;
@@ -188,17 +187,14 @@ typedef struct
        int bDisableNetbios;
        int bRpcBigEndian;
        struct param_opt *param_opt;
-}
-global;
+};
 
-static global Globals;
 
 /* 
  * This structure describes a single service. 
  */
-typedef struct
+struct service
 {
-       int valid;
        char *szService;
        char *szPath;
        char *szCopy;
@@ -232,13 +228,11 @@ typedef struct
        struct param_opt *param_opt;
 
        char dummy[3];          /* for alignment */
-}
-service;
+};
 
 
 /* This is a default service used to prime a services structure */
-static service sDefault = {
-       True,                   /* valid */
+static struct service sDefault = {
        NULL,                   /* szService */
        NULL,                   /* szPath */
        NULL,                   /* szCopy */
@@ -253,38 +247,46 @@ static service sDefault = {
        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 */
+       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 */
+       false,                  /* bMSDfsRoot */
+       false,                  /* bStrictSync */
+       false,                  /* bCIFileSystem */
        NULL,                   /* Parametric options */
 
        ""                      /* dummy */
 };
 
 /* local variables */
-static service **ServicePtrs = NULL;
-static int iNumServices = 0;
-static int iServiceIndex = 0;
-static BOOL bInGlobalSection = True;
+static struct loadparm_context {
+       struct global Globals;
+       struct service **ServicePtrs;
+       int iNumServices;
+       struct service *currentService;
+       bool bInGlobalSection;
+} loadparm = {
+       .iNumServices = 0,
+       .currentService = NULL,
+       .bInGlobalSection = true,
+       .ServicePtrs = NULL,
+};
 
 #define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct))
 
 /* prototypes for the special type handlers */
-static BOOL handle_include(const char *pszParmValue, char **ptr);
-static BOOL handle_copy(const char *pszParmValue, char **ptr);
+static bool handle_include(const char *pszParmValue, char **ptr);
+static bool handle_copy(const char *pszParmValue, char **ptr);
 
 static const struct enum_list enum_protocol[] = {
        {PROTOCOL_SMB2, "SMB2"},
@@ -313,12 +315,12 @@ static const struct enum_list enum_announce_as[] = {
 };
 
 static const struct enum_list enum_bool_auto[] = {
-       {False, "No"},
-       {False, "False"},
-       {False, "0"},
-       {True, "Yes"},
-       {True, "True"},
-       {True, "1"},
+       {false, "No"},
+       {false, "False"},
+       {false, "0"},
+       {true, "Yes"},
+       {true, "True"},
+       {true, "1"},
        {Auto, "Auto"},
        {-1, NULL}
 };
@@ -379,49 +381,49 @@ static const struct enum_list enum_server_role[] = {
 static struct parm_struct parm_table[] = {
        {"Base Options", P_SEP, P_SEPARATOR},
 
-       {"server role", P_ENUM, P_GLOBAL, &Globals.server_role, NULL, enum_server_role, FLAG_BASIC},
+       {"server role", P_ENUM, P_GLOBAL, &loadparm.Globals.server_role, NULL, enum_server_role, FLAG_BASIC},
 
-       {"dos charset", P_STRING, P_GLOBAL, &Globals.dos_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"unix charset", P_STRING, P_GLOBAL, &Globals.unix_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"ncalrpc dir", P_STRING, P_GLOBAL, &Globals.ncalrpc_dir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"display charset", P_STRING, P_GLOBAL, &Globals.display_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"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, &Globals.szWorkgroup, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"realm", P_STRING, P_GLOBAL, &Globals.szRealm, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"netbios name", P_USTRING, P_GLOBAL, &Globals.szNetbiosName, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"netbios aliases", P_LIST, P_GLOBAL, &Globals.szNetbiosAliases, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"netbios scope", P_USTRING, P_GLOBAL, &Globals.szNetbiosScope, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"server string", P_STRING, P_GLOBAL, &Globals.szServerString, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED  | FLAG_DEVELOPER},
-       {"interfaces", P_LIST, P_GLOBAL, &Globals.szInterfaces, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"bind interfaces only", P_BOOL, P_GLOBAL, &Globals.bBindInterfacesOnly, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
+       {"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, &Globals.ntptr_providor, NULL, NULL, FLAG_ADVANCED},
-       {"dcerpc endpoint servers", P_LIST, P_GLOBAL, &Globals.dcerpc_ep_servers, NULL, NULL, FLAG_ADVANCED},
-       {"server services", P_LIST, P_GLOBAL, &Globals.server_services, 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, &Globals.security, NULL, enum_security, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"encrypt passwords", P_BOOL, P_GLOBAL, &Globals.bEncryptPasswords, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"null passwords", P_BOOL, P_GLOBAL, &Globals.bNullPasswords, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"obey pam restrictions", P_BOOL, P_GLOBAL, &Globals.bObeyPamRestrictions, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"password server", P_LIST, P_GLOBAL, &Globals.szPasswordServers, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"sam database", P_STRING, P_GLOBAL, &Globals.szSAM_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"secrets database", P_STRING, P_GLOBAL, &Globals.szSECRETS_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"spoolss database", P_STRING, P_GLOBAL, &Globals.szSPOOLSS_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"wins config database", P_STRING, P_GLOBAL, &Globals.szWINS_CONFIG_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"wins database", P_STRING, P_GLOBAL, &Globals.szWINS_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"private dir", P_STRING, P_GLOBAL, &Globals.szPrivateDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"passwd chat", P_STRING, P_GLOBAL, &Globals.szPasswdChat, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"password level", P_INTEGER, P_GLOBAL, &Globals.pwordlevel, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"lanman auth", P_BOOL, P_GLOBAL, &Globals.bLanmanAuth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"ntlm auth", P_BOOL, P_GLOBAL, &Globals.bNTLMAuth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"client NTLMv2 auth", P_BOOL, P_GLOBAL, &Globals.bClientNTLMv2Auth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"client lanman auth", P_BOOL, P_GLOBAL, &Globals.bClientLanManAuth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"client plaintext auth", P_BOOL, P_GLOBAL, &Globals.bClientPlaintextAuth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"client use spnego principal", P_BOOL, P_GLOBAL, &Globals.client_use_spnego_principal, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"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},
 
@@ -441,52 +443,52 @@ static struct parm_struct parm_table[] = {
        
        {"Protocol Options", P_SEP, P_SEPARATOR},
        
-       {"smb ports", P_LIST, P_GLOBAL, &Globals.smb_ports, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"nbt port", P_INTEGER, P_GLOBAL, &Globals.nbt_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"dgram port", P_INTEGER, P_GLOBAL, &Globals.dgram_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"cldap port", P_INTEGER, P_GLOBAL, &Globals.cldap_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"krb5 port", P_INTEGER, P_GLOBAL, &Globals.krb5_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"kpasswd port", P_INTEGER, P_GLOBAL, &Globals.kpasswd_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"web port", P_INTEGER, P_GLOBAL, &Globals.web_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"tls enabled", P_BOOL, P_GLOBAL, &Globals.tls_enabled, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"tls keyfile", P_STRING, P_GLOBAL, &Globals.tls_keyfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"tls certfile", P_STRING, P_GLOBAL, &Globals.tls_certfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"tls cafile", P_STRING, P_GLOBAL, &Globals.tls_cafile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"tls crlfile", P_STRING, P_GLOBAL, &Globals.tls_crlfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"tls dh params file", P_STRING, P_GLOBAL, &Globals.tls_dhpfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"web application directory", P_STRING, P_GLOBAL, &Globals.webapps_directory, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"large readwrite", P_BOOL, P_GLOBAL, &Globals.bLargeReadwrite, NULL, NULL, FLAG_DEVELOPER},
-       {"server max protocol", P_ENUM, P_GLOBAL, &Globals.srv_maxprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
-       {"server min protocol", P_ENUM, P_GLOBAL, &Globals.srv_minprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
-       {"client max protocol", P_ENUM, P_GLOBAL, &Globals.cli_maxprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
-       {"client min protocol", P_ENUM, P_GLOBAL, &Globals.cli_minprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
-       {"unicode", P_BOOL, P_GLOBAL, &Globals.bUnicode, NULL, NULL, FLAG_DEVELOPER},
-       {"read raw", P_BOOL, P_GLOBAL, &Globals.bReadRaw, NULL, NULL, FLAG_DEVELOPER},
-       {"write raw", P_BOOL, P_GLOBAL, &Globals.bWriteRaw, NULL, NULL, FLAG_DEVELOPER},
-       {"disable netbios", P_BOOL, P_GLOBAL, &Globals.bDisableNetbios, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"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},
+       {"web application directory", P_STRING, P_GLOBAL, &loadparm.Globals.webapps_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, &Globals.bNTStatusSupport, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-
-       {"announce version", P_STRING, P_GLOBAL, &Globals.szAnnounceVersion, NULL, NULL, FLAG_DEVELOPER},
-       {"announce as", P_ENUM, P_GLOBAL, &Globals.announce_as, NULL, enum_announce_as, FLAG_DEVELOPER},
-       {"max mux", P_INTEGER, P_GLOBAL, &Globals.max_mux, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"max xmit", P_BYTES, P_GLOBAL, &Globals.max_xmit, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-
-       {"name resolve order", P_LIST, P_GLOBAL, &Globals.szNameResolveOrder, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"max wins ttl", P_INTEGER, P_GLOBAL, &Globals.max_wins_ttl, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"min wins ttl", P_INTEGER, P_GLOBAL, &Globals.min_wins_ttl, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"time server", P_BOOL, P_GLOBAL, &Globals.bTimeServer, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"unix extensions", P_BOOL, P_GLOBAL, &Globals.bUnixExtensions, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"use spnego", P_BOOL, P_GLOBAL, &Globals.bUseSpnego, NULL, NULL, FLAG_DEVELOPER},
-       {"server signing", P_ENUM, P_GLOBAL, &Globals.server_signing, NULL, enum_smb_signing_vals, FLAG_ADVANCED}, 
-       {"client signing", P_ENUM, P_GLOBAL, &Globals.client_signing, NULL, enum_smb_signing_vals, FLAG_ADVANCED}, 
-       {"rpc big endian", P_BOOL, P_GLOBAL, &Globals.bRpcBigEndian, NULL, NULL, 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, &Globals.paranoid_server_security, NULL, NULL, FLAG_DEVELOPER},
-       {"socket options", P_STRING, P_GLOBAL, &Globals.socket_options, NULL, NULL, FLAG_DEVELOPER},
+       {"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}, 
@@ -513,18 +515,18 @@ static struct parm_struct parm_table[] = {
 
        {"Browse Options", P_SEP, P_SEPARATOR},
        
-       {"preferred master", P_ENUM, P_GLOBAL, &Globals.bPreferredMaster, NULL, enum_bool_auto, FLAG_BASIC | FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"prefered master", P_ENUM, P_GLOBAL, &Globals.bPreferredMaster, NULL, enum_bool_auto, FLAG_HIDE},
-       {"local master", P_BOOL, P_GLOBAL, &Globals.bLocalMaster, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"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, &Globals.szWINSservers, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"wins support", P_BOOL, P_GLOBAL, &Globals.bWINSsupport, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"dns proxy", P_BOOL, P_GLOBAL, &Globals.bWINSdnsProxy, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"wins hook", P_STRING, P_GLOBAL, &Globals.szWINSHook, NULL, NULL, FLAG_ADVANCED}, 
+       {"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},
        
@@ -534,21 +536,19 @@ static struct parm_struct parm_table[] = {
 
        {"Miscellaneous Options", P_SEP, P_SEPARATOR},
        
-       {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE},
-       {"share backend", P_STRING, P_GLOBAL, &Globals.szShareBackend, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, 
-       {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"modules dir", P_STRING, P_GLOBAL, &Globals.szModulesDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, 
-       {"js include", P_LIST, P_GLOBAL, &Globals.jsInclude, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"jsonrpc services directory", P_STRING, P_GLOBAL, &Globals.jsonrpcServicesDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"setup directory", P_STRING, P_GLOBAL, &Globals.szSetupDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       
-       {"socket address", P_STRING, P_GLOBAL, &Globals.szSocketAddress, NULL, NULL, FLAG_DEVELOPER},
-       {"-valid", P_BOOL, P_LOCAL, &sDefault.valid, NULL, NULL, FLAG_HIDE},
+       {"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},
+       {"jsonrpc services directory", P_STRING, P_GLOBAL, &loadparm.Globals.jsonrpcServicesDir, 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},
        
@@ -559,10 +559,12 @@ static struct parm_struct parm_table[] = {
        {"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, &Globals.bHostMSDfs, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"winbind separator", P_STRING, P_GLOBAL, &Globals.szWinbindSeparator, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER },
-       {"winbindd socket directory", P_STRING, P_GLOBAL, &Globals.szWinbinddSocketDirectory, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER },
-       {"winbind sealed pipes", P_BOOL, P_GLOBAL, &Globals.bWinbindSealedPipes, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER },
+       {"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}
 };
@@ -576,161 +578,6 @@ struct parm_struct *lp_parm_table(void)
        return parm_table;
 }
 
-/***************************************************************************
- Initialise the global parameter structure.
-***************************************************************************/
-static void init_globals(void)
-{
-       int i;
-       char *myname;
-
-       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(parm_table[i].ptr, "");
-               }
-       }
-
-       do_parameter("config file", dyn_CONFIGFILE, NULL);
-
-       do_parameter("share backend", "classic", NULL);
-       
-       do_parameter("server role", "standalone", NULL);
-
-       /* options that can be set on the command line must be initialised via
-          the slower do_parameter() to ensure that FLAG_CMDLINE is obeyed */
-#ifdef TCP_NODELAY
-       do_parameter("socket options", "TCP_NODELAY", NULL);
-#endif
-       do_parameter("workgroup", DEFAULT_WORKGROUP, NULL);
-       myname = get_myname();
-       do_parameter("netbios name", myname, NULL);
-       SAFE_FREE(myname);
-       do_parameter("name resolve order", "lmhosts wins host bcast", NULL);
-
-       do_parameter("fstype", FSTYPE_STRING, NULL);
-       do_parameter("ntvfs handler", "unixuid default", NULL);
-       do_parameter("max connections", "-1", NULL);
-
-       do_parameter("dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup unixinfo", NULL);
-       do_parameter("server services", "smb rpc nbt wrepl ldap cldap web kdc drepl winbind", NULL);
-       do_parameter("ntptr providor", "simple_ldb", NULL);
-       do_parameter("auth methods:domain controller", "anonymous sam_ignoredomain", NULL);
-       do_parameter("auth methods:member server", "anonymous sam winbind", NULL);
-       do_parameter("auth methods:standalone", "anonymous sam_ignoredomain", NULL);
-       do_parameter("private dir", dyn_PRIVATE_DIR, NULL);
-       do_parameter("sam database", "sam.ldb", NULL);
-       do_parameter("secrets database", "secrets.ldb", NULL);
-       do_parameter("spoolss database", "spoolss.ldb", NULL);
-       do_parameter("wins config database", "wins_config.ldb", NULL);
-       do_parameter("wins database", "wins.ldb", NULL);
-       do_parameter("registry:HKEY_LOCAL_MACHINE", "hklm.ldb", NULL);
-
-       /* This hive should be dynamically generated by Samba using
-          data from the sam, but for the moment leave it in a tdb to
-          keep regedt32 from popping up an annoying dialog. */
-       do_parameter("registry:HKEY_USERS", "hku.ldb", NULL);
-       
-       /* using UTF8 by default allows us to support all chars */
-       do_parameter("unix charset", "UTF8", NULL);
-
-       /* Use codepage 850 as a default for the dos character set */
-       do_parameter("dos charset", "CP850", NULL);
-
-       /*
-        * Allow the default PASSWD_CHAT to be overridden in local.h.
-        */
-       do_parameter("passwd chat", DEFAULT_PASSWD_CHAT, NULL);
-
-       do_parameter("pid directory", dyn_PIDDIR, NULL);
-       do_parameter("lock dir", dyn_LOCKDIR, NULL);
-       do_parameter("modules dir", dyn_MODULESDIR, NULL);
-       do_parameter("ncalrpc dir", dyn_NCALRPCDIR, NULL);
-
-       do_parameter("socket address", "0.0.0.0", NULL);
-       do_parameter_var("server string", "Samba %s", SAMBA_VERSION_STRING);
-
-       do_parameter_var("announce version", "%d.%d", 
-                        DEFAULT_MAJOR_VERSION,
-                        DEFAULT_MINOR_VERSION);
-
-       do_parameter("password server", "*", NULL);
-
-       do_parameter("max mux", "50", NULL);
-       do_parameter("max xmit", "12288", NULL);
-       do_parameter("password level", "0", NULL);
-       do_parameter("LargeReadwrite", "True", NULL);
-       do_parameter("server min protocol", "CORE", NULL);
-       do_parameter("server max protocol", "NT1", NULL);
-       do_parameter("client min protocol", "CORE", NULL);
-       do_parameter("client max protocol", "NT1", NULL);
-       do_parameter("security", "USER", NULL);
-       do_parameter("paranoid server security", "True", NULL);
-       do_parameter("EncryptPasswords", "True", NULL);
-       do_parameter("ReadRaw", "True", NULL);
-       do_parameter("WriteRaw", "True", NULL);
-       do_parameter("NullPasswords", "False", NULL);
-       do_parameter("ObeyPamRestrictions", "False", NULL);
-       do_parameter("announce as", "NT SERVER", NULL);
-
-       do_parameter("TimeServer", "False", NULL);
-       do_parameter("BindInterfacesOnly", "False", NULL);
-       do_parameter("Unicode", "True", NULL);
-       do_parameter("ClientLanManAuth", "True", NULL);
-       do_parameter("LanmanAuth", "True", NULL);
-       do_parameter("NTLMAuth", "True", NULL);
-       do_parameter("client use spnego principal", "False", NULL);
-       
-       do_parameter("UnixExtensions", "False", NULL);
-
-       do_parameter("PreferredMaster", "Auto", NULL);
-       do_parameter("LocalMaster", "True", NULL);
-
-       do_parameter("wins support", "False", NULL);
-       do_parameter("dns proxy", "True", NULL);
-
-       do_parameter("winbind separator", "\\", NULL);
-       do_parameter("winbind sealed pipes", "True", NULL);
-       do_parameter("winbindd socket directory", dyn_WINBINDD_SOCKET_DIR, NULL);
-
-       do_parameter("client signing", "Yes", NULL);
-       do_parameter("server signing", "auto", NULL);
-
-       do_parameter("use spnego", "True", NULL);
-
-       do_parameter("smb ports", "445 139", NULL);
-       do_parameter("nbt port", "137", NULL);
-       do_parameter("dgram port", "138", NULL);
-       do_parameter("cldap port", "389", NULL);
-       do_parameter("krb5 port", "88", NULL);
-       do_parameter("kpasswd port", "464", NULL);
-       do_parameter("web port", "901", NULL);
-       do_parameter("web application directory", dyn_WEBAPPSDIR, NULL);
-       do_parameter("jsonrpc services directory", dyn_SERVICESDIR, NULL);
-
-       do_parameter("nt status support", "True", NULL);
-
-       do_parameter("max wins ttl", "518400", NULL); /* 6 days */
-       do_parameter("min wins ttl", "10", NULL);
-
-       do_parameter("tls enabled", "True", NULL);
-       do_parameter("tls keyfile", "tls/key.pem", NULL);
-       do_parameter("tls certfile", "tls/cert.pem", NULL);
-       do_parameter("tls cafile", "tls/ca.pem", NULL);
-       do_parameter_var("js include", "%s", dyn_JSDIR);
-       do_parameter_var("setup directory", "%s", dyn_SETUPDIR);
-
-       for (i = 0; parm_table[i].label; i++) {
-               if (!(parm_table[i].flags & FLAG_CMDLINE)) {
-                       parm_table[i].flags |= FLAG_DEFAULT;
-               }
-       }
-}
-
 static TALLOC_CTX *lp_talloc;
 
 /******************************************************************* a
@@ -804,7 +651,7 @@ static const char *lp_string(const char *s)
 #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));}
bool fn_name(void) {return((bool)*(int *)(ptr));}
 #if 0 /* unused */
 #define FN_GLOBAL_CHAR(fn_name,ptr) \
  char fn_name(void) {return(*(char *)(ptr));}
@@ -813,113 +660,109 @@ static const char *lp_string(const char *s)
  int fn_name(void) {return(*(int *)(ptr));}
 
 #define FN_LOCAL_STRING(fn_name,val) \
- const char *fn_name(int i) {return(lp_string((LP_SNUM_OK(i) && ServicePtrs[(i)]->val) ? ServicePtrs[(i)]->val : sDefault.val));}
+ const char *fn_name(struct 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(int i) {return (const char *)((LP_SNUM_OK(i) && ServicePtrs[(i)]->val) ? ServicePtrs[(i)]->val : sDefault.val);}
+ const char *fn_name(struct service *service) {return (const char *)(service != NULL && service->val != NULL) ? service->val : sDefault.val;}
 #define FN_LOCAL_LIST(fn_name,val) \
- const char **fn_name(int i) {return(const char **)(LP_SNUM_OK(i)? ServicePtrs[(i)]->val : sDefault.val);}
+ const char **fn_name(struct service *service) {return(const char **)(service != NULL && service->val != NULL? service->val : sDefault.val);}
 #define FN_LOCAL_BOOL(fn_name,val) \
- BOOL fn_name(int i) {return(LP_SNUM_OK(i)? ServicePtrs[(i)]->val : sDefault.val);}
-#if 0 /* unused */
-#define FN_LOCAL_CHAR(fn_name,val) \
- char fn_name(int i) {return(LP_SNUM_OK(i)? ServicePtrs[(i)]->val : sDefault.val);}
-#endif
+ bool fn_name(struct service *service) {return((service != NULL)? service->val : sDefault.val);}
 #define FN_LOCAL_INTEGER(fn_name,val) \
- int fn_name(int i) {return(LP_SNUM_OK(i)? ServicePtrs[(i)]->val : sDefault.val);}
-
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_server_role, &Globals.server_role)
-_PUBLIC_ FN_GLOBAL_LIST(lp_smb_ports, &Globals.smb_ports)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_nbt_port, &Globals.nbt_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_dgram_port, &Globals.dgram_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_cldap_port, &Globals.cldap_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_krb5_port, &Globals.krb5_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_kpasswd_port, &Globals.kpasswd_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_web_port, &Globals.web_port)
-_PUBLIC_ FN_GLOBAL_STRING(lp_dos_charset, &Globals.dos_charset)
-_PUBLIC_ FN_GLOBAL_STRING(lp_webapps_directory, &Globals.webapps_directory)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_tls_enabled, &Globals.tls_enabled)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_keyfile, &Globals.tls_keyfile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_certfile, &Globals.tls_certfile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_cafile, &Globals.tls_cafile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_crlfile, &Globals.tls_crlfile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_tls_dhpfile, &Globals.tls_dhpfile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset)
-_PUBLIC_ FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset)
-_PUBLIC_ FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile)
-_PUBLIC_ FN_GLOBAL_STRING(lp_share_backend, &Globals.szShareBackend)
-_PUBLIC_ FN_GLOBAL_STRING(lp_sam_url, &Globals.szSAM_URL)
-_PUBLIC_ FN_GLOBAL_STRING(lp_secrets_url, &Globals.szSECRETS_URL)
-_PUBLIC_ FN_GLOBAL_STRING(lp_spoolss_url, &Globals.szSPOOLSS_URL)
-_PUBLIC_ FN_GLOBAL_STRING(lp_wins_config_url, &Globals.szWINS_CONFIG_URL)
-_PUBLIC_ FN_GLOBAL_STRING(lp_wins_url, &Globals.szWINS_URL)
-_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_winbind_separator, &Globals.szWinbindSeparator)
-_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_winbindd_socket_directory, &Globals.szWinbinddSocketDirectory)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_winbind_sealed_pipes, &Globals.bWinbindSealedPipes)
-_PUBLIC_ FN_GLOBAL_STRING(lp_private_dir, &Globals.szPrivateDir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString)
-_PUBLIC_ FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_modulesdir, &Globals.szModulesDir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_setupdir, &Globals.szSetupDir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_ncalrpc_dir, &Globals.ncalrpc_dir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
-_PUBLIC_ FN_GLOBAL_LIST(lp_dcerpc_endpoint_servers, &Globals.dcerpc_ep_servers)
-_PUBLIC_ FN_GLOBAL_LIST(lp_server_services, &Globals.server_services)
-_PUBLIC_ FN_GLOBAL_STRING(lp_ntptr_providor, &Globals.ntptr_providor)
-_PUBLIC_ FN_GLOBAL_STRING(lp_auto_services, &Globals.szAutoServices)
-_PUBLIC_ FN_GLOBAL_STRING(lp_passwd_chat, &Globals.szPasswdChat)
-_PUBLIC_ FN_GLOBAL_LIST(lp_passwordserver, &Globals.szPasswordServers)
-_PUBLIC_ FN_GLOBAL_LIST(lp_name_resolve_order, &Globals.szNameResolveOrder)
-_PUBLIC_ FN_GLOBAL_STRING(lp_realm, &Globals.szRealm)
-_PUBLIC_ FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
-_PUBLIC_ FN_GLOBAL_STRING(lp_workgroup, &Globals.szWorkgroup)
-_PUBLIC_ FN_GLOBAL_STRING(lp_netbios_name, &Globals.szNetbiosName)
-_PUBLIC_ FN_GLOBAL_STRING(lp_netbios_scope, &Globals.szNetbiosScope)
-_PUBLIC_ FN_GLOBAL_LIST(lp_wins_server_list, &Globals.szWINSservers)
-_PUBLIC_ FN_GLOBAL_LIST(lp_interfaces, &Globals.szInterfaces)
-_PUBLIC_ FN_GLOBAL_STRING(lp_socket_address, &Globals.szSocketAddress)
-_PUBLIC_ FN_GLOBAL_LIST(lp_netbios_aliases, &Globals.szNetbiosAliases)
-
-_PUBLIC_ FN_GLOBAL_BOOL(lp_disable_netbios, &Globals.bDisableNetbios)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_wins_support, &Globals.bWINSsupport)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_wins_dns_proxy, &Globals.bWINSdnsProxy)
-_PUBLIC_ FN_GLOBAL_STRING(lp_wins_hook, &Globals.szWINSHook)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_local_master, &Globals.bLocalMaster)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_readraw, &Globals.bReadRaw)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_large_readwrite, &Globals.bLargeReadwrite)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_writeraw, &Globals.bWriteRaw)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_null_passwords, &Globals.bNullPasswords)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_obey_pam_restrictions, &Globals.bObeyPamRestrictions)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_encrypted_passwords, &Globals.bEncryptPasswords)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_time_server, &Globals.bTimeServer)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_bind_interfaces_only, &Globals.bBindInterfacesOnly)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_unicode, &Globals.bUnicode)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_nt_status_support, &Globals.bNTStatusSupport)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_lanman_auth, &Globals.bLanmanAuth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_ntlm_auth, &Globals.bNTLMAuth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_client_plaintext_auth, &Globals.bClientPlaintextAuth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_client_lanman_auth, &Globals.bClientLanManAuth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_client_ntlmv2_auth, &Globals.bClientNTLMv2Auth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_client_use_spnego_principal, &Globals.client_use_spnego_principal)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_host_msdfs, &Globals.bHostMSDfs)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_unix_extensions, &Globals.bUnixExtensions)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_use_spnego, &Globals.bUseSpnego)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_rpc_big_endian, &Globals.bRpcBigEndian)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_max_wins_ttl, &Globals.max_wins_ttl)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_min_wins_ttl, &Globals.min_wins_ttl)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_maxmux, &Globals.max_mux)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_max_xmit, &Globals.max_xmit)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_passwordlevel, &Globals.pwordlevel)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_srv_maxprotocol, &Globals.srv_maxprotocol)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_srv_minprotocol, &Globals.srv_minprotocol)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_maxprotocol, &Globals.cli_maxprotocol)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_minprotocol, &Globals.cli_minprotocol)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_security, &Globals.security)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_paranoid_server_security, &Globals.paranoid_server_security)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_announce_as, &Globals.announce_as)
-_PUBLIC_ FN_GLOBAL_LIST(lp_js_include, &Globals.jsInclude)
-_PUBLIC_ FN_GLOBAL_STRING(lp_jsonrpc_services_dir, &Globals.jsonrpcServicesDir)
-_PUBLIC_ 
-_PUBLIC_ 
+ int fn_name(struct 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_webapps_directory, &loadparm.Globals.webapps_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_GLOBAL_STRING(lp_jsonrpc_services_dir, &loadparm.Globals.jsonrpcServicesDir)
 _PUBLIC_ FN_LOCAL_STRING(lp_servicename, szService)
 _PUBLIC_ FN_LOCAL_CONST_STRING(lp_const_servicename, szService)
 _PUBLIC_ FN_LOCAL_STRING(lp_pathname, szPath)
@@ -946,32 +789,28 @@ _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, &Globals.server_signing)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_client_signing, &Globals.client_signing)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_server_signing, &loadparm.Globals.server_signing)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_client_signing, &loadparm.Globals.client_signing)
 
 /* local prototypes */
-
 static int map_parameter(const char *pszParmName);
-static int getservicebyname(const char *pszServiceName,
-                           service * pserviceDest);
-static void copy_service(service * pserviceDest,
-                        service * pserviceSource, int *pcopymapDest);
-static BOOL service_ok(int iService);
-static BOOL do_section(const char *pszSectionName, void *);
-static void init_copymap(service * pservice);
+static struct service *getservicebyname(const char *pszServiceName);
+static void copy_service(struct service *pserviceDest,
+                        struct service *pserviceSource, int *pcopymapDest);
+static bool service_ok(struct service *service);
+static bool do_section(const char *pszSectionName, void *);
+static void init_copymap(struct 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(int lookup_service, const char *type, const char *option)
+const char *lp_get_parametric(struct service *service, const char *type, 
+                             const char *option)
 {
        char *vfskey;
         struct param_opt *data;
        
-       if (lookup_service >= iNumServices) return NULL;
-       
-       data = (lookup_service < 0) ? 
-               Globals.param_opt : ServicePtrs[lookup_service]->param_opt;
+       data = (service == NULL ? loadparm.Globals.param_opt : service->param_opt);
     
        asprintf(&vfskey, "%s:%s", type, option);
        strlower(vfskey);
@@ -984,16 +823,15 @@ const char *lp_get_parametric(int lookup_service, const char *type, const char *
                data = data->next;
        }
 
-       if (lookup_service >= 0) {
+       if (service != NULL) {
                /* Try to fetch the same option but from globals */
                /* but only if we are not already working with Globals */
-               data = Globals.param_opt;
-               while (data) {
+               for (data = loadparm.Globals.param_opt; data; 
+                    data = data->next) {
                        if (strcmp(data->key, vfskey) == 0) {
                                free(vfskey);
                                return data->value;
                        }
-                       data = data->next;
                }
        }
 
@@ -1011,7 +849,7 @@ static int lp_int(const char *s)
 
        if (!s) {
                DEBUG(0,("lp_int(%s): is called with NULL!\n",s));
-               return (-1);
+               return -1;
        }
 
        return strtol(s, NULL, 0); 
@@ -1025,7 +863,7 @@ static int lp_ulong(const char *s)
 
        if (!s) {
                DEBUG(0,("lp_int(%s): is called with NULL!\n",s));
-               return (-1);
+               return -1;
        }
 
        return strtoul(s, NULL, 0);
@@ -1039,7 +877,7 @@ static double lp_double(const char *s)
 
        if (!s) {
                DEBUG(0,("lp_double(%s): is called with NULL!\n",s));
-               return (-1);
+               return -1;
        }
 
        return strtod(s, NULL);
@@ -1048,18 +886,18 @@ static double lp_double(const char *s)
 /*******************************************************************
 convenience routine to return boolean parameters.
 ********************************************************************/
-static BOOL lp_bool(const char *s)
+static bool lp_bool(const char *s)
 {
-       BOOL ret = False;
+       bool ret = false;
 
        if (!s) {
                DEBUG(0,("lp_bool(%s): is called with NULL!\n",s));
-               return False;
+               return false;
        }
        
        if (!set_boolean(s, &ret)) {
                DEBUG(0,("lp_bool(%s): value is not boolean!\n",s));
-               return False;
+               return false;
        }
 
        return ret;
@@ -1070,9 +908,10 @@ static BOOL lp_bool(const char *s)
 /* Parametric option has following syntax: 'Type: option = value' */
 /* Returned value is allocated in 'lp_talloc' context */
 
-const char *lp_parm_string(int lookup_service, const char *type, const char *option)
+const char *lp_parm_string(struct service *service, const char *type, 
+                          const char *option)
 {
-       const char *value = lp_get_parametric(lookup_service, type, option);
+       const char *value = lp_get_parametric(service, type, option);
 
        if (value)
                return lp_string(value);
@@ -1084,13 +923,14 @@ const char *lp_parm_string(int lookup_service, const char *type, const char *opt
 /* Parametric option has following syntax: 'Type: option = value' */
 /* Returned value is allocated in 'lp_talloc' context */
 
-const char **lp_parm_string_list(int lookup_service, const char *type, const char *option,
-                                const char *separator)
+const char **lp_parm_string_list(struct service *service, const char *type, 
+                                const char *option, const char *separator)
 {
-       const char *value = lp_get_parametric(lookup_service, type, option);
+       const char *value = lp_get_parametric(service, type, option);
        
        if (value)
-               return str_list_make(talloc_autofree_context(), value, separator);
+               return str_list_make(talloc_autofree_context(), value, 
+                                    separator);
 
        return NULL;
 }
@@ -1098,9 +938,10 @@ const char **lp_parm_string_list(int lookup_service, const char *type, const cha
 /* 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(int lookup_service, const char *type, const char *option, int default_v)
+int lp_parm_int(struct service *service, const char *type, const char *option, 
+               int default_v)
 {
-       const char *value = lp_get_parametric(lookup_service, type, option);
+       const char *value = lp_get_parametric(service, type, option);
        
        if (value)
                return lp_int(value);
@@ -1113,11 +954,12 @@ int lp_parm_int(int lookup_service, const char *type, const char *option, int de
  * Parametric option has following syntax: 'Type: option = value'.
  */
 
-int lp_parm_bytes(int lookup_service, const char *type, const char *option, int default_v)
+int lp_parm_bytes(struct service *service, const char *type, 
+                 const char *option, int default_v)
 {
        uint64_t bval;
 
-       const char *value = lp_get_parametric(lookup_service, type, option);
+       const char *value = lp_get_parametric(service, type, option);
 
        if (value && conv_str_size(value, &bval)) {
                if (bval <= INT_MAX) {
@@ -1131,9 +973,10 @@ int lp_parm_bytes(int lookup_service, const char *type, const char *option, int
 /* 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(int lookup_service, const char *type, const char *option, unsigned long default_v)
+unsigned long lp_parm_ulong(struct service *service, const char *type, 
+                           const char *option, unsigned long default_v)
 {
-       const char *value = lp_get_parametric(lookup_service, type, option);
+       const char *value = lp_get_parametric(service, type, option);
        
        if (value)
                return lp_ulong(value);
@@ -1142,9 +985,10 @@ unsigned long lp_parm_ulong(int lookup_service, const char *type, const char *op
 }
 
 
-double lp_parm_double(int lookup_service, const char *type, const char *option, double default_v)
+double lp_parm_double(struct service *service, const char *type, 
+                     const char *option, double default_v)
 {
-       const char *value = lp_get_parametric(lookup_service, type, option);
+       const char *value = lp_get_parametric(service, type, option);
        
        if (value)
                return lp_double(value);
@@ -1155,9 +999,10 @@ double lp_parm_double(int lookup_service, const char *type, const char *option,
 /* 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(int lookup_service, const char *type, const char *option, BOOL default_v)
+bool lp_parm_bool(struct service *service, const char *type, 
+                 const char *option, bool default_v)
 {
-       const char *value = lp_get_parametric(lookup_service, type, option);
+       const char *value = lp_get_parametric(service, type, option);
        
        if (value)
                return lp_bool(value);
@@ -1170,58 +1015,11 @@ BOOL lp_parm_bool(int lookup_service, const char *type, const char *option, BOOL
  Initialise a service to the defaults.
 ***************************************************************************/
 
-static void init_service(service * pservice)
+static struct service *init_service(TALLOC_CTX *mem_ctx)
 {
-       memset((char *)pservice, '\0', sizeof(service));
+       struct service *pservice = talloc_zero(mem_ctx, struct service);
        copy_service(pservice, &sDefault, NULL);
-}
-
-/***************************************************************************
- Free the dynamically allocated parts of a service struct.
-***************************************************************************/
-
-static void free_service(service *pservice)
-{
-       int i;
-        struct param_opt *data, *pdata;
-       if (!pservice)
-               return;
-
-       if (pservice->szService)
-               DEBUG(5, ("free_service: Freeing service %s\n",
-                      pservice->szService));
-
-       string_free(&pservice->szService);
-       SAFE_FREE(pservice->copymap);
-
-       for (i = 0; parm_table[i].label; i++) {
-               if ((parm_table[i].type == P_STRING ||
-                    parm_table[i].type == P_USTRING) &&
-                   parm_table[i].class == P_LOCAL) {
-                       string_free((char **)
-                                   (((char *)pservice) +
-                                    PTR_DIFF(parm_table[i].ptr, &sDefault)));
-               } else if (parm_table[i].type == P_LIST &&
-                          parm_table[i].class == P_LOCAL) {
-                       char ***listp = (char ***)(((char *)pservice) + 
-                                                  PTR_DIFF(parm_table[i].ptr, &sDefault));
-                       talloc_free(*listp);
-                       *listp = NULL;
-               }
-       }
-                               
-       DEBUG(5,("Freeing parametrics:\n"));
-       data = pservice->param_opt;
-       while (data) {
-               DEBUG(5,("[%s = %s]\n", data->key, data->value));
-               string_free(&data->key);
-               string_free(&data->value);
-               pdata = data->next;
-               SAFE_FREE(data);
-               data = pdata;
-       }
-
-       ZERO_STRUCTP(pservice);
+       return pservice;
 }
 
 /***************************************************************************
@@ -1229,69 +1027,67 @@ static void free_service(service *pservice)
  service. 
 ***************************************************************************/
 
-static int add_a_service(const service *pservice, const char *name)
+static struct service *add_a_service(struct loadparm_context *lp_ctx, 
+                                    const struct service *pservice, 
+                                    const char *name)
 {
        int i;
-       service tservice;
-       int num_to_alloc = iNumServices + 1;
+       struct service tservice;
+       int num_to_alloc = lp_ctx->iNumServices + 1;
        struct param_opt *data, *pdata;
 
        tservice = *pservice;
 
        /* it might already exist */
        if (name) {
-               i = getservicebyname(name, NULL);
-               if (i >= 0) {
+               struct service *service = getservicebyname(name);
+               if (service != NULL) {
                        /* Clean all parametric options for service */
                        /* They will be added during parsing again */
-                       data = ServicePtrs[i]->param_opt;
+                       data = service->param_opt;
                        while (data) {
-                               string_free(&data->key);
-                               string_free(&data->value);
                                pdata = data->next;
-                               SAFE_FREE(data);
+                               talloc_free(data);
                                data = pdata;
                        }
-                       ServicePtrs[i]->param_opt = NULL;
-                       return (i);
+                       service->param_opt = NULL;
+                       return service;
                }
        }
 
        /* find an invalid one */
-       for (i = 0; i < iNumServices; i++)
-               if (!ServicePtrs[i]->valid)
+       for (i = 0; i < lp_ctx->iNumServices; i++)
+               if (lp_ctx->ServicePtrs[i] == NULL)
                        break;
 
        /* if not, then create one */
-       if (i == iNumServices) {
-               service **tsp;
+       if (i == lp_ctx->iNumServices) {
+               struct service **tsp;
                
-               tsp = realloc_p(ServicePtrs, service *, num_to_alloc);
+               tsp = realloc_p(lp_ctx->ServicePtrs, struct service *, 
+                               num_to_alloc);
                                           
                if (!tsp) {
                        DEBUG(0,("add_a_service: failed to enlarge ServicePtrs!\n"));
-                       return (-1);
+                       return NULL;
                }
                else {
-                       ServicePtrs = tsp;
-                       ServicePtrs[iNumServices] = malloc_p(service);
-               }
-               if (!ServicePtrs[iNumServices]) {
-                       DEBUG(0,("add_a_service: out of memory!\n"));
-                       return (-1);
+                       lp_ctx->ServicePtrs = tsp;
+                       lp_ctx->ServicePtrs[lp_ctx->iNumServices] = NULL;
                }
 
-               iNumServices++;
-       } else
-               free_service(ServicePtrs[i]);
-
-       ServicePtrs[i]->valid = True;
+               lp_ctx->iNumServices++;
+       } 
 
-       init_service(ServicePtrs[i]);
-       copy_service(ServicePtrs[i], &tservice, NULL);
-       if (name)
-               string_set(&ServicePtrs[i]->szService, name);
-       return (i);
+       lp_ctx->ServicePtrs[i] = init_service(talloc_autofree_context());
+       if (lp_ctx->ServicePtrs[i] == NULL) {
+               DEBUG(0,("add_a_service: out of memory!\n"));
+               return NULL;
+       }
+       copy_service(lp_ctx->ServicePtrs[i], &tservice, NULL);
+       if (name != NULL)
+               string_set(lp_ctx->ServicePtrs[i], &lp_ctx->ServicePtrs[i]->szService, name);
+       return lp_ctx->ServicePtrs[i];
 }
 
 /***************************************************************************
@@ -1299,95 +1095,97 @@ static int add_a_service(const service *pservice, const char *name)
  from service ifrom.
 ***************************************************************************/
 
-BOOL lp_add_home(const char *pszHomename, int iDefaultService, 
+bool lp_add_home(struct loadparm_context *lp_ctx, 
+                const char *pszHomename, struct service *default_service,
                 const char *user, const char *pszHomedir)
 {
-       int i;
+       struct service *service;
        pstring newHomedir;
 
-       i = add_a_service(ServicePtrs[iDefaultService], pszHomename);
+       service = add_a_service(lp_ctx, default_service, pszHomename);
 
-       if (i < 0)
-               return (False);
+       if (service == NULL)
+               return false;
 
-       if (!(*(ServicePtrs[iDefaultService]->szPath))
-           || strequal(ServicePtrs[iDefaultService]->szPath, lp_pathname(-1))) {
+       if (!(*(default_service->szPath))
+           || strequal(default_service->szPath, sDefault.szPath)) {
                pstrcpy(newHomedir, pszHomedir);
        } else {
-               pstrcpy(newHomedir, lp_pathname(iDefaultService));
+               pstrcpy(newHomedir, lp_pathname(default_service));
                string_sub(newHomedir,"%H", pszHomedir, sizeof(newHomedir)); 
        }
 
-       string_set(&ServicePtrs[i]->szPath, newHomedir);
+       string_set(service, &service->szPath, newHomedir);
 
-       if (!(*(ServicePtrs[i]->comment))) {
-               pstring comment;
-               slprintf(comment, sizeof(comment) - 1,
-                        "Home directory of %s", user);
-               string_set(&ServicePtrs[i]->comment, comment);
+       if (!(*(service->comment))) {
+               service->comment = talloc_asprintf(service, "Home directory of %s", user);
        }
-       ServicePtrs[i]->bAvailable = sDefault.bAvailable;
-       ServicePtrs[i]->bBrowseable = sDefault.bBrowseable;
+       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));
+       DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n", 
+                 pszHomename, user, newHomedir));
        
-       return (True);
+       return true;
 }
 
 /***************************************************************************
  Add a new service, based on an old one.
 ***************************************************************************/
 
-int lp_add_service(const char *pszService, int iDefaultService)
+struct service *lp_add_service(struct loadparm_context *lp_ctx, 
+                              const char *pszService, 
+                              struct service *default_service)
 {
-       return (add_a_service(ServicePtrs[iDefaultService], pszService));
+       return add_a_service(lp_ctx, default_service, pszService);
 }
 
 /***************************************************************************
  Add the IPC service.
 ***************************************************************************/
 
-static BOOL lp_add_hidden(const char *name, const char *fstype)
+static bool lp_add_hidden(struct loadparm_context *lp_ctx, const char *name, 
+                         const char *fstype)
 {
-       pstring comment;
-       int i = add_a_service(&sDefault, name);
+       struct service *service = add_a_service(lp_ctx, &sDefault, name);
 
-       if (i < 0)
-               return (False);
+       if (service == NULL)
+               return false;
 
-       slprintf(comment, sizeof(comment) - 1,
-                "%s Service (%s)", fstype, Globals.szServerString);
+       string_set(service, &service->szPath, tmpdir());
 
-       string_set(&ServicePtrs[i]->szPath, tmpdir());
-       string_set(&ServicePtrs[i]->comment, comment);
-       string_set(&ServicePtrs[i]->fstype, fstype);
-       ServicePtrs[i]->iMaxConnections = -1;
-       ServicePtrs[i]->bAvailable = True;
-       ServicePtrs[i]->bRead_only = True;
-       ServicePtrs[i]->bPrint_ok = False;
-       ServicePtrs[i]->bBrowseable = False;
+       service->comment = talloc_asprintf(service, "%s Service (%s)", 
+                               fstype, loadparm.Globals.szServerString);
+       string_set(service, &service->fstype, fstype);
+       service->iMaxConnections = -1;
+       service->bAvailable = true;
+       service->bRead_only = true;
+       service->bPrint_ok = false;
+       service->bBrowseable = false;
 
        if (strcasecmp(fstype, "IPC") == 0) {
-               lp_do_parameter(i, "ntvfs handler", "default");
+               lp_do_service_parameter(service, "ntvfs handler", "default");
        }
 
        DEBUG(3, ("adding hidden service %s\n", name));
 
-       return (True);
+       return true;
 }
 
 /***************************************************************************
  Add a new printer service, with defaults coming from service iFrom.
 ***************************************************************************/
 
-BOOL lp_add_printer(const char *pszPrintername, int iDefaultService)
+bool lp_add_printer(struct loadparm_context *lp_ctx,
+                   const char *pszPrintername, 
+                   struct service *default_service)
 {
        const char *comment = "From Printcap";
-       int i = add_a_service(ServicePtrs[iDefaultService], pszPrintername);
+       struct service *service;
+       service = add_a_service(lp_ctx, default_service, pszPrintername);
 
-       if (i < 0)
-               return (False);
+       if (service == NULL)
+               return false;
 
        /* note that we do NOT default the availability flag to True - */
        /* we take it from the default service passed. This allows all */
@@ -1395,17 +1193,17 @@ BOOL lp_add_printer(const char *pszPrintername, int iDefaultService)
        /* entry (if/when the 'available' keyword is implemented!).    */
 
        /* the printer name is set to the service name. */
-       string_set(&ServicePtrs[i]->szPrintername, pszPrintername);
-       string_set(&ServicePtrs[i]->comment, comment);
-       ServicePtrs[i]->bBrowseable = sDefault.bBrowseable;
+       string_set(service, &service->szPrintername, pszPrintername);
+       string_set(service, &service->comment, comment);
+       service->bBrowseable = sDefault.bBrowseable;
        /* Printers cannot be read_only. */
-       ServicePtrs[i]->bRead_only = False;
+       service->bRead_only = false;
        /* Printer services must be printable. */
-       ServicePtrs[i]->bPrint_ok = True;
+       service->bPrint_ok = true;
 
        DEBUG(3, ("adding printer service %s\n", pszPrintername));
 
-       return (True);
+       return true;
 }
 
 /***************************************************************************
@@ -1418,11 +1216,11 @@ static int map_parameter(const char *pszParmName)
        int iIndex;
 
        if (*pszParmName == '-')
-               return (-1);
+               return -1;
 
        for (iIndex = 0; parm_table[iIndex].label; iIndex++)
                if (strwicmp(parm_table[iIndex].label, pszParmName) == 0)
-                       return (iIndex);
+                       return iIndex;
 
        /* Warn only if it isn't parametric option */
        if (strchr(pszParmName, ':') == NULL)
@@ -1430,7 +1228,7 @@ static int map_parameter(const char *pszParmName)
        /* We do return 'fail' for parametric options as well because they are
           stored in different storage
         */
-       return (-1);
+       return -1;
 }
 
 
@@ -1447,31 +1245,29 @@ struct parm_struct *lp_parm_struct(const char *name)
 /*
   return the parameter pointer for a parameter
 */
-void *lp_parm_ptr(int snum, struct parm_struct *parm)
+void *lp_parm_ptr(struct service *service, struct parm_struct *parm)
 {
-       if (snum == -1) {
+       if (service == NULL)
                return parm->ptr;
-       }
-       return ((char *)ServicePtrs[snum]) + PTR_DIFF(parm->ptr, &sDefault);
+
+       return ((char *)service) + PTR_DIFF(parm->ptr, &sDefault);
 }
 
 /***************************************************************************
 Find a service by name. Otherwise works like get_service.
 ***************************************************************************/
 
-static int getservicebyname(const char *pszServiceName, service * pserviceDest)
+static struct service *getservicebyname(const char *pszServiceName)
 {
        int iService;
 
-       for (iService = iNumServices - 1; iService >= 0; iService--)
+       for (iService = loadparm.iNumServices - 1; iService >= 0; iService--)
                if (VALID(iService) &&
-                   strwicmp(ServicePtrs[iService]->szService, pszServiceName) == 0) {
-                       if (pserviceDest != NULL)
-                               copy_service(pserviceDest, ServicePtrs[iService], NULL);
-                       break;
+                   strwicmp(loadparm.ServicePtrs[iService]->szService, pszServiceName) == 0) {
+                       return loadparm.ServicePtrs[iService];
                }
 
-       return (iService);
+       return NULL;
 }
 
 /***************************************************************************
@@ -1479,12 +1275,14 @@ static int getservicebyname(const char *pszServiceName, service * pserviceDest)
  If pcopymapDest is NULL then copy all fields
 ***************************************************************************/
 
-static void copy_service(service * pserviceDest, service * pserviceSource, int *pcopymapDest)
+static void copy_service(struct service *pserviceDest, 
+                        struct service *pserviceSource, 
+                        int *pcopymapDest)
 {
        int i;
-       BOOL bcopyall = (pcopymapDest == NULL);
+       bool bcopyall = (pcopymapDest == NULL);
        struct param_opt *data, *pdata, *paramo;
-       BOOL not_added;
+       bool not_added;
 
        for (i = 0; parm_table[i].label; i++)
                if (parm_table[i].ptr && parm_table[i].class == P_LOCAL &&
@@ -1509,12 +1307,14 @@ static void copy_service(service * pserviceDest, service * pserviceSource, int *
                                        break;
 
                                case P_STRING:
-                                       string_set(dest_ptr,
+                                       string_set(pserviceDest, 
+                                                  (char **)dest_ptr,
                                                   *(char **)src_ptr);
                                        break;
 
                                case P_USTRING:
-                                       string_set(dest_ptr,
+                                       string_set(pserviceDest, 
+                                                  (char **)dest_ptr,
                                                   *(char **)src_ptr);
                                        strupper(*(char **)dest_ptr);
                                        break;
@@ -1537,25 +1337,26 @@ static void copy_service(service * pserviceDest, service * pserviceSource, int *
        
        data = pserviceSource->param_opt;
        while (data) {
-               not_added = True;
+               not_added = true;
                pdata = pserviceDest->param_opt;
                /* Traverse destination */
                while (pdata) {
                        /* If we already have same option, override it */
                        if (strcmp(pdata->key, data->key) == 0) {
-                               string_free(&pdata->value);
-                               pdata->value = strdup(data->value);
-                               not_added = False;
+                               talloc_free(pdata->value);
+                               pdata->value = talloc_reference(pdata, 
+                                                            data->value);
+                               not_added = false;
                                break;
                        }
                        pdata = pdata->next;
                }
                if (not_added) {
-                       paramo = malloc_p(struct param_opt);
-                       if (!paramo)
+                       paramo = talloc(pserviceDest, struct param_opt);
+                       if (paramo == NULL)
                                smb_panic("OOM");
-                       paramo->key = strdup(data->key);
-                       paramo->value = strdup(data->value);
+                       paramo->key = talloc_reference(paramo, data->key);
+                       paramo->value = talloc_reference(paramo, data->value);
                        DLIST_ADD(pserviceDest->param_opt, paramo);
                }
                data = data->next;
@@ -1567,36 +1368,36 @@ Check a service for consistency. Return False if the service is in any way
 incomplete or faulty, else True.
 ***************************************************************************/
 
-static BOOL service_ok(int iService)
+static bool service_ok(struct service *service)
 {
-       BOOL bRetval;
+       bool bRetval;
 
-       bRetval = True;
-       if (ServicePtrs[iService]->szService[0] == '\0') {
+       bRetval = true;
+       if (service->szService[0] == '\0') {
                DEBUG(0, ("The following message indicates an internal error:\n"));
                DEBUG(0, ("No service name in service entry.\n"));
-               bRetval = False;
+               bRetval = false;
        }
 
        /* The [printers] entry MUST be printable. I'm all for flexibility, but */
        /* I can't see why you'd want a non-printable printer service...        */
-       if (strwicmp(ServicePtrs[iService]->szService, PRINTERS_NAME) == 0) {
-               if (!ServicePtrs[iService]->bPrint_ok) {
+       if (strwicmp(service->szService, PRINTERS_NAME) == 0) {
+               if (!service->bPrint_ok) {
                        DEBUG(0, ("WARNING: [%s] service MUST be printable!\n",
-                              ServicePtrs[iService]->szService));
-                       ServicePtrs[iService]->bPrint_ok = True;
+                              service->szService));
+                       service->bPrint_ok = true;
                }
                /* [printers] service must also be non-browsable. */
-               if (ServicePtrs[iService]->bBrowseable)
-                       ServicePtrs[iService]->bBrowseable = False;
+               if (service->bBrowseable)
+                       service->bBrowseable = false;
        }
 
        /* If a service is flagged unavailable, log the fact at level 0. */
-       if (!ServicePtrs[iService]->bAvailable)
+       if (!service->bAvailable)
                DEBUG(1, ("NOTE: Service %s is flagged unavailable.\n",
-                         ServicePtrs[iService]->szService));
+                         service->szService));
 
-       return (bRetval);
+       return bRetval;
 }
 
 static struct file_lists {
@@ -1622,18 +1423,18 @@ static void add_to_file_list(const char *fname, const char *subfname)
        }
 
        if (!f) {
-               f = malloc_p(struct file_lists);
+               f = talloc(talloc_autofree_context(), struct file_lists);
                if (!f)
                        return;
                f->next = file_lists;
-               f->name = strdup(fname);
+               f->name = talloc_strdup(f, fname);
                if (!f->name) {
-                       SAFE_FREE(f);
+                       talloc_free(f);
                        return;
                }
-               f->subfname = strdup(subfname);
+               f->subfname = talloc_strdup(f, subfname);
                if (!f->subfname) {
-                       SAFE_FREE(f);
+                       talloc_free(f);
                        return;
                }
                file_lists = f;
@@ -1649,17 +1450,16 @@ static void add_to_file_list(const char *fname, const char *subfname)
  Check if a config file has changed date.
 ********************************************************************/
 
-BOOL lp_file_list_changed(void)
+bool lp_file_list_changed(void)
 {
-       struct file_lists *f = file_lists;
+       struct file_lists *f;
        DEBUG(6, ("lp_file_list_changed()\n"));
 
-       while (f) {
-               pstring n2;
+       for (f = file_lists; f != NULL; f = f->next) {
+               char *n2;
                time_t mod_time;
 
-               pstrcpy(n2, f->name);
-               standard_sub_basic(n2,sizeof(n2));
+               n2 = standard_sub_basic(talloc_autofree_context(), f->name);
 
                DEBUGADD(6, ("file %s -> %s  last mod_time: %s\n",
                             f->name, n2, ctime(&f->modtime)));
@@ -1667,94 +1467,87 @@ BOOL lp_file_list_changed(void)
                mod_time = file_modtime(n2);
 
                if (mod_time && ((f->modtime != mod_time) || (f->subfname == NULL) || (strcmp(n2, f->subfname) != 0))) {
-                       DEBUGADD(6,
-                                ("file %s modified: %s\n", n2,
+                       DEBUGADD(6, ("file %s modified: %s\n", n2,
                                  ctime(&mod_time)));
                        f->modtime = mod_time;
-                       SAFE_FREE(f->subfname);
-                       f->subfname = strdup(n2);
-                       return (True);
+                       talloc_free(f->subfname);
+                       f->subfname = talloc_strdup(f, n2);
+                       return true;
                }
-               f = f->next;
        }
-       return (False);
+       return false;
 }
 
 /***************************************************************************
  Handle the include operation.
 ***************************************************************************/
 
-static BOOL handle_include(const char *pszParmValue, char **ptr)
+static bool handle_include(const char *pszParmValue, char **ptr)
 {
-       pstring fname;
-       pstrcpy(fname, pszParmValue);
-
-       standard_sub_basic(fname,sizeof(fname));
+       char *fname = standard_sub_basic(talloc_autofree_context(), 
+                                        pszParmValue);
 
        add_to_file_list(pszParmValue, fname);
 
-       string_set(ptr, fname);
+       string_set(talloc_autofree_context(), ptr, fname);
 
        if (file_exist(fname))
-               return (pm_process(fname, do_section, do_parameter, NULL));
+               return pm_process(fname, do_section, do_parameter, &loadparm);
 
        DEBUG(2, ("Can't find include file %s\n", fname));
 
-       return (False);
+       return false;
 }
 
 /***************************************************************************
  Handle the interpretation of the copy parameter.
 ***************************************************************************/
 
-static BOOL handle_copy(const char *pszParmValue, char **ptr)
+static bool handle_copy(const char *pszParmValue, char **ptr)
 {
-       BOOL bRetval;
-       int iTemp;
-       service serviceTemp;
-
-       string_set(ptr, pszParmValue);
+       bool bRetval;
+       struct service *serviceTemp;
 
-       init_service(&serviceTemp);
+       string_set(talloc_autofree_context(), ptr, pszParmValue);
 
-       bRetval = False;
+       bRetval = false;
 
        DEBUG(3, ("Copying service from service %s\n", pszParmValue));
 
-       if ((iTemp = getservicebyname(pszParmValue, &serviceTemp)) >= 0) {
-               if (iTemp == iServiceIndex) {
+       if ((serviceTemp = getservicebyname(pszParmValue)) != NULL) {
+               if (serviceTemp == loadparm.currentService) {
                        DEBUG(0, ("Can't copy service %s - unable to copy self!\n", pszParmValue));
                } else {
-                       copy_service(ServicePtrs[iServiceIndex],
-                                    &serviceTemp,
-                                    ServicePtrs[iServiceIndex]->copymap);
-                       bRetval = True;
+                       copy_service(loadparm.currentService,
+                                    serviceTemp,
+                                    loadparm.currentService->copymap);
+                       bRetval = true;
                }
        } else {
                DEBUG(0, ("Unable to copy service - source not found: %s\n", pszParmValue));
-               bRetval = False;
+               bRetval = false;
        }
 
-       free_service(&serviceTemp);
-       return (bRetval);
+       return bRetval;
 }
 
 /***************************************************************************
  Initialise a copymap.
 ***************************************************************************/
 
-static void init_copymap(service * pservice)
+static void init_copymap(struct service *pservice)
 {
        int i;
-       SAFE_FREE(pservice->copymap);
-       pservice->copymap = malloc_array_p(int, NUMPARAMETERS);
-       if (!pservice->copymap)
+       talloc_free(pservice->copymap);
+       pservice->copymap = talloc_array(pservice, int, NUMPARAMETERS);
+       if (pservice->copymap == NULL) {
                DEBUG(0,
                      ("Couldn't allocate copymap!! (size %d)\n",
                       (int)NUMPARAMETERS));
-       else
-               for (i = 0; i < NUMPARAMETERS; i++)
-                       pservice->copymap[i] = True;
+               return;
+       }
+       for (i = 0; i < NUMPARAMETERS; i++)
+               pservice->copymap[i] = true;
 }
 
 #if 0 /* not used anywhere */
@@ -1772,24 +1565,29 @@ void *lp_local_ptr(int snum, void *ptr)
 /***************************************************************************
  Process a parametric option
 ***************************************************************************/
-static BOOL lp_do_parameter_parametric(int snum, const char *pszParmName, const char *pszParmValue, int flags)
+static bool lp_do_parameter_parametric(struct service *service, 
+                                      const char *pszParmName, 
+                                      const char *pszParmValue, int flags)
 {
        struct param_opt *paramo, *data;
        char *name;
+       TALLOC_CTX *mem_ctx;
 
        while (isspace((unsigned char)*pszParmName)) {
                pszParmName++;
        }
 
        name = strdup(pszParmName);
-       if (!name) return False;
+       if (!name) return false;
 
        strlower(name);
 
-       if (snum < 0) {
-               data = Globals.param_opt;
+       if (service == NULL) {
+               data = loadparm.Globals.param_opt;
+               mem_ctx = talloc_autofree_context();
        } else {
-               data = ServicePtrs[snum]->param_opt;
+               data = service->param_opt;
+               mem_ctx = service;
        }
 
        /* Traverse destination */
@@ -1799,107 +1597,52 @@ static BOOL lp_do_parameter_parametric(int snum, const char *pszParmName, const
                if (strcmp(paramo->key, name) == 0) {
                        if ((paramo->flags & FLAG_CMDLINE) &&
                            !(flags & FLAG_CMDLINE)) {
-                               return True;
+                               return true;
                        }
 
-                       free(paramo->value);
-                       paramo->value = strdup(pszParmValue);
+                       talloc_free(paramo->value);
+                       paramo->value = talloc_strdup(paramo, pszParmValue);
                        paramo->flags = flags;
                        free(name);
-                       return True;
+                       return true;
                }
        }
 
-       paramo = malloc_p(struct param_opt);
+       paramo = talloc(mem_ctx, struct param_opt);
        if (!paramo)
                smb_panic("OOM");
-       paramo->key = strdup(name);
-       paramo->value = strdup(pszParmValue);
+       paramo->key = talloc_strdup(paramo, name);
+       paramo->value = talloc_strdup(paramo, pszParmValue);
        paramo->flags = flags;
-       if (snum < 0) {
-               DLIST_ADD(Globals.param_opt, paramo);
+       if (service == NULL) {
+               DLIST_ADD(loadparm.Globals.param_opt, paramo);
        } else {
-               DLIST_ADD(ServicePtrs[snum]->param_opt, paramo);
+               DLIST_ADD(service->param_opt, paramo);
        }
 
        free(name);
        
-       return True;
+       return true;
 }
 
-/***************************************************************************
- Process a parameter for a particular service number. If snum < 0
- then assume we are in the globals.
-***************************************************************************/
-BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue)
+static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr, 
+                        const char *pszParmName, const char *pszParmValue)
 {
-       int parmnum, i;
-       void *parm_ptr = NULL;  /* where we are going to store the result */
-       void *def_ptr = NULL;
-
-       parmnum = map_parameter(pszParmName);
-
-       if (parmnum < 0) {
-               if (strchr(pszParmName, ':')) {
-                       return lp_do_parameter_parametric(snum, 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) {
-               return True;
-       }
-
-       def_ptr = parm_table[parmnum].ptr;
-
-       /* we might point at a service, the default service or a global */
-       if (snum < 0) {
-               parm_ptr = def_ptr;
-       } else {
-               if (parm_table[parmnum].class == P_GLOBAL) {
-                       DEBUG(0,
-                             ("Global parameter %s found in service section!\n",
-                              pszParmName));
-                       return (True);
-               }
-               parm_ptr =
-                       ((char *)ServicePtrs[snum]) + PTR_DIFF(def_ptr,
-                                                           &sDefault);
-       }
-
-       if (snum >= 0) {
-               if (!ServicePtrs[snum]->copymap)
-                       init_copymap(ServicePtrs[snum]);
-
-               /* 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)
-                               ServicePtrs[snum]->copymap[i] = False;
-       }
-
+       int i;
        /* if it is a special case then go ahead */
        if (parm_table[parmnum].special) {
                parm_table[parmnum].special(pszParmValue, (char **)parm_ptr);
-               return (True);
+               return true;
        }
 
        /* now switch on the type of variable it is */
        switch (parm_table[parmnum].type)
        {
                case P_BOOL: {
-                       BOOL b;
+                       bool b;
                        if (!set_boolean(pszParmValue, &b)) {
                                DEBUG(0,("lp_do_parameter(%s): value is not boolean!\n", pszParmValue));
-                               return False;
+                               return false;
                        }
                        *(int *)parm_ptr = b;
                        }
@@ -1925,20 +1668,20 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
 
                        DEBUG(0,("lp_do_parameter(%s): value is not "
                            "a valid size specifier!\n", pszParmValue));
-                       return False;
+                       return false;
                }
 
                case P_LIST:
-                       *(const char ***)parm_ptr = str_list_make(talloc_autofree_context()
+                       *(const char ***)parm_ptr = str_list_make(mem_ctx
                                                                  pszParmValue, NULL);
                        break;
 
                case P_STRING:
-                       string_set(parm_ptr, pszParmValue);
+                       string_set(mem_ctx, (char **)parm_ptr, pszParmValue);
                        break;
 
                case P_USTRING:
-                       string_set(parm_ptr, pszParmValue);
+                       string_set(mem_ctx, (char **)parm_ptr, pszParmValue);
                        strupper(*(char **)parm_ptr);
                        break;
 
@@ -1956,7 +1699,7 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
                        if (!parm_table[parmnum].enum_list[i].name) {
                                DEBUG(0,("Unknown enumerated value '%s' for '%s'\n", 
                                         pszParmValue, pszParmName));
-                               return False;
+                               return false;
                        }
                        break;
                case P_SEP:
@@ -1973,35 +1716,138 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
                        parm_table[i].flags &= ~FLAG_DEFAULT;
                }
        }
+       return true;
+}
+
+
+bool lp_do_global_parameter(struct loadparm_context *lp_ctx, 
+                           const char *pszParmName, const char *pszParmValue)
+{
+       int parmnum = map_parameter(pszParmName);
+       void *parm_ptr;
+
+       if (parmnum < 0) {
+               if (strchr(pszParmName, ':')) {
+                       return lp_do_parameter_parametric(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) {
+               return true;
+       }
+
+       parm_ptr = parm_table[parmnum].ptr;
+
+       return set_variable(talloc_autofree_context(), parmnum, parm_ptr, 
+                           pszParmName, pszParmValue);
+}
+
+bool lp_do_service_parameter(struct 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);
+               }
+               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));
+       }
 
-       return (True);
+       /* 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) {
+               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);
+
+       if (!service->copymap)
+               init_copymap(service);
+
+       /* 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)
+                       service->copymap[i] = false;
+
+       return set_variable(service, parmnum, parm_ptr, pszParmName, 
+                           pszParmValue);
+}
+
+/***************************************************************************
+ Process a parameter for a particular service number. If snum < 0
+ then assume we are in the globals.
+***************************************************************************/
+bool lp_do_parameter(struct service *service, const char *pszParmName, 
+                    const char *pszParmValue)
+{
+       if (service == NULL) {
+               return lp_do_global_parameter(&loadparm, pszParmName, 
+                                             pszParmValue);
+       } else {
+               return lp_do_service_parameter(service,
+                                       pszParmName, pszParmValue);
+       }
+       return true;
 }
 
 /***************************************************************************
  Process a parameter.
 ***************************************************************************/
 
-static BOOL do_parameter(const char *pszParmName, const char *pszParmValue, void *userdata)
+static bool do_parameter(const char *pszParmName, const char *pszParmValue, 
+                        void *userdata)
 {
-       return (lp_do_parameter(bInGlobalSection ? -2 : iServiceIndex,
-                               pszParmName, pszParmValue));
+       if (loadparm.bInGlobalSection) 
+               return lp_do_global_parameter(&loadparm, pszParmName, 
+                                             pszParmValue);
+       else 
+               return lp_do_service_parameter(loadparm.currentService,
+                                              pszParmName, pszParmValue);
 }
 
 /*
   variable argument do parameter
 */
-static BOOL do_parameter_var(const char *pszParmName, const char *fmt, ...) PRINTF_ATTRIBUTE(2, 3);
-
-static BOOL do_parameter_var(const char *pszParmName, const char *fmt, ...)
+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, ...) 
 {
        char *s;
-       BOOL ret;
+       bool ret;
        va_list ap;
 
        va_start(ap, fmt);      
        s = talloc_vasprintf(NULL, fmt, ap);
        va_end(ap);
-       ret = do_parameter(pszParmName, s, NULL);
+       ret = lp_do_global_parameter(lp_ctx, pszParmName, s);
        talloc_free(s);
        return ret;
 }
@@ -2012,7 +1858,7 @@ static BOOL do_parameter_var(const char *pszParmName, const char *fmt, ...)
   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(const char *pszParmName, const char *pszParmValue)
 {
        int parmnum = map_parameter(pszParmName);
        int i;
@@ -2022,19 +1868,19 @@ BOOL lp_set_cmdline(const char *pszParmName, const char *pszParmValue)
 
        if (parmnum < 0 && strchr(pszParmName, ':')) {
                /* set a parametric option */
-               return lp_do_parameter_parametric(-1, pszParmName, pszParmValue, FLAG_CMDLINE);
+               return lp_do_parameter_parametric(NULL, pszParmName, pszParmValue, FLAG_CMDLINE);
        }
 
        if (parmnum < 0) {
                DEBUG(0,("Unknown option '%s'\n", pszParmName));
-               return False;
+               return false;
        }
 
        /* reset the CMDLINE flag in case this has been called before */
        parm_table[parmnum].flags &= ~FLAG_CMDLINE;
 
-       if (!lp_do_parameter(-2, pszParmName, pszParmValue)) {
-               return False;
+       if (!lp_do_parameter(NULL, pszParmName, pszParmValue)) {
+               return false;
        }
 
        parm_table[parmnum].flags |= FLAG_CMDLINE;
@@ -2047,26 +1893,26 @@ BOOL lp_set_cmdline(const char *pszParmName, const char *pszParmValue)
                parm_table[i].flags |= FLAG_CMDLINE;
        }
 
-       return True;
+       return true;
 }
 
 /*
   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(const char *option)
 {
        char *p, *s;
-       BOOL ret;
+       bool ret;
 
        s = strdup(option);
        if (!s) {
-               return False;
+               return false;
        }
 
        p = strchr(s, '=');
        if (!p) {
                free(s);
-               return False;
+               return false;
        }
 
        *p = 0;
@@ -2099,7 +1945,7 @@ static void print_parameter(struct parm_struct *p, void *ptr, FILE * f)
                        break;
 
                case P_BOOL:
-                       fprintf(f, "%s", BOOLSTR((BOOL)*(int *)ptr));
+                       fprintf(f, "%s", BOOLSTR((bool)*(int *)ptr));
                        break;
 
                case P_INTEGER:
@@ -2136,7 +1982,7 @@ static void print_parameter(struct parm_struct *p, void *ptr, FILE * f)
  Check if two parameters are equal.
 ***************************************************************************/
 
-static BOOL equal_parameter(parm_type type, void *ptr1, void *ptr2)
+static bool equal_parameter(parm_type type, void *ptr1, void *ptr2)
 {
        switch (type) {
                case P_BOOL:
@@ -2165,7 +2011,7 @@ static BOOL equal_parameter(parm_type type, void *ptr1, void *ptr2)
                case P_SEP:
                        break;
        }
-       return (False);
+       return false;
 }
 
 /***************************************************************************
@@ -2174,27 +2020,28 @@ static BOOL equal_parameter(parm_type type, void *ptr1, void *ptr2)
  Returns True on success, False on failure. 
 ***************************************************************************/
 
-static BOOL do_section(const char *pszSectionName, void *userdata)
+static bool do_section(const char *pszSectionName, void *userdata)
 {
-       BOOL bRetval;
-       BOOL isglobal = ((strwicmp(pszSectionName, GLOBAL_NAME) == 0) ||
+       struct loadparm_context *lp_ctx = (struct loadparm_context *)userdata;
+       bool bRetval;
+       bool isglobal = ((strwicmp(pszSectionName, GLOBAL_NAME) == 0) ||
                         (strwicmp(pszSectionName, GLOBAL_NAME2) == 0));
-       bRetval = False;
+       bRetval = false;
 
        /* if we've just struck a global section, note the fact. */
-       bInGlobalSection = isglobal;
+       lp_ctx->bInGlobalSection = isglobal;
 
        /* check for multiple global sections */
-       if (bInGlobalSection) {
+       if (lp_ctx->bInGlobalSection) {
                DEBUG(3, ("Processing section \"[%s]\"\n", pszSectionName));
-               return (True);
+               return true;
        }
 
        /* if we have a current service, tidy it up before moving on */
-       bRetval = True;
+       bRetval = true;
 
-       if (iServiceIndex >= 0)
-               bRetval = service_ok(iServiceIndex);
+       if (lp_ctx->currentService != NULL)
+               bRetval = service_ok(lp_ctx->currentService);
 
        /* if all is still well, move to the next record in the services array */
        if (bRetval) {
@@ -2202,14 +2049,15 @@ 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 ((iServiceIndex = add_a_service(&sDefault, pszSectionName))
-                   < 0) {
+               if ((loadparm.currentService = add_a_service(lp_ctx, &sDefault, 
+                                                            pszSectionName))
+                   == NULL) {
                        DEBUG(0, ("Failed to add a new service\n"));
-                       return (False);
+                       return false;
                }
        }
 
-       return (bRetval);
+       return bRetval;
 }
 
 
@@ -2217,10 +2065,10 @@ static BOOL do_section(const char *pszSectionName, void *userdata)
  Determine if a partcular base parameter is currentl set to the default value.
 ***************************************************************************/
 
-static BOOL is_default(int i)
+static bool is_default(int i)
 {
        if (!defaults_saved)
-               return False;
+               return false;
        switch (parm_table[i].type) {
                case P_LIST:
                        return str_list_equal((const char **)parm_table[i].def.lvalue, 
@@ -2241,14 +2089,14 @@ static BOOL is_default(int i)
                case P_SEP:
                        break;
        }
-       return False;
+       return false;
 }
 
 /***************************************************************************
 Display the contents of the global structure.
 ***************************************************************************/
 
-static void dump_globals(FILE *f, BOOL show_defaults)
+static void dump_globals(FILE *f, bool show_defaults)
 {
        int i;
        struct param_opt *data;
@@ -2265,11 +2113,10 @@ static void dump_globals(FILE *f, BOOL show_defaults)
                        print_parameter(&parm_table[i], parm_table[i].ptr, f);
                        fprintf(f, "\n");
        }
-       if (Globals.param_opt != NULL) {
-               data = Globals.param_opt;
-               while(data) {
+       if (loadparm.Globals.param_opt != NULL) {
+               for (data = loadparm.Globals.param_opt; data; 
+                    data = data->next) {
                        fprintf(f, "\t%s = %s\n", data->key, data->value);
-                       data = data->next;
                }
         }
 
@@ -2279,7 +2126,7 @@ static void dump_globals(FILE *f, BOOL show_defaults)
  Display the contents of a single services record.
 ***************************************************************************/
 
-static void dump_a_service(service * pService, FILE * f)
+static void dump_a_service(struct service * pService, FILE * f)
 {
        int i;
        struct param_opt *data;
@@ -2312,23 +2159,21 @@ static void dump_a_service(service * pService, FILE * f)
                        fprintf(f, "\n");
        }
        if (pService->param_opt != NULL) {
-               data = pService->param_opt;
-               while(data) {
+               for (data = pService->param_opt; data; data = data->next) {
                        fprintf(f, "\t%s = %s\n", data->key, data->value);
-                       data = data->next;
                }
         }
 }
 
-BOOL lp_dump_a_parameter(int snum, char *parm_name, FILE * f, BOOL isGlobal)
+bool lp_dump_a_parameter(int snum, char *parm_name, FILE * f, bool isGlobal)
 {
-       service * pService = ServicePtrs[snum];
+       struct service * pService = loadparm.ServicePtrs[snum];
        struct parm_struct *parm;
        void *ptr;
        
        parm = lp_parm_struct(parm_name);
        if (!parm) {
-               return False;
+               return false;
        }
        
        if (isGlobal)
@@ -2340,7 +2185,7 @@ BOOL lp_dump_a_parameter(int snum, char *parm_name, FILE * f, BOOL isGlobal)
        print_parameter(parm,
                        ptr, f);
        fprintf(f, "\n");
-       return True;
+       return true;
 }
 
 /***************************************************************************
@@ -2368,7 +2213,7 @@ struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters)
                        return &parm_table[(*i)++];
                }
        } else {
-               service *pService = ServicePtrs[snum];
+               struct service *pService = loadparm.ServicePtrs[snum];
 
                for (; parm_table[*i].label; (*i)++) {
                        if (parm_table[*i].class == P_SEPARATOR)
@@ -2406,16 +2251,17 @@ struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters)
  Return TRUE if the passed service number is within range.
 ***************************************************************************/
 
-BOOL lp_snum_ok(int iService)
+bool lp_snum_ok(int iService)
 {
-       return (LP_SNUM_OK(iService) && ServicePtrs[iService]->bAvailable);
+       return (LP_SNUM_OK(iService) && loadparm.ServicePtrs[iService]->bAvailable);
 }
 
 /***************************************************************************
  Auto-load some home services.
 ***************************************************************************/
 
-static void lp_add_auto_services(const char *str)
+static void lp_add_auto_services(struct loadparm_context *lp_ctx, 
+                                const char *str)
 {
        return;
 }
@@ -2424,25 +2270,25 @@ static void lp_add_auto_services(const char *str)
  Have we loaded a services file yet?
 ***************************************************************************/
 
-BOOL lp_loaded(void)
+bool lp_loaded(void)
 {
-       return (bLoaded);
+       return bLoaded;
 }
 
 /***************************************************************************
  Unload unused services.
 ***************************************************************************/
 
-void lp_killunused(struct smbsrv_connection *smb, BOOL (*snumused) (struct smbsrv_connection *, int))
+void lp_killunused(struct smbsrv_connection *smb, bool (*snumused) (struct smbsrv_connection *, int))
 {
        int i;
-       for (i = 0; i < iNumServices; i++) {
+       for (i = 0; i < loadparm.iNumServices; i++) {
                if (!VALID(i))
                        continue;
 
                if (!snumused || !snumused(smb, i)) {
-                       ServicePtrs[i]->valid = False;
-                       free_service(ServicePtrs[i]);
+                       talloc_free(loadparm.ServicePtrs[i]);
+                       loadparm.ServicePtrs[i] = NULL;
                }
        }
 }
@@ -2454,9 +2300,171 @@ void lp_killunused(struct smbsrv_connection *smb, BOOL (*snumused) (struct smbsr
 void lp_killservice(int iServiceIn)
 {
        if (VALID(iServiceIn)) {
-               ServicePtrs[iServiceIn]->valid = False;
-               free_service(ServicePtrs[iServiceIn]);
+               talloc_free(loadparm.ServicePtrs[iServiceIn]);
+               loadparm.ServicePtrs[iServiceIn] = NULL;
+       }
+}
+
+/***************************************************************************
+ Initialise the global parameter structure.
+***************************************************************************/
+bool loadparm_init(struct loadparm_context *lp_ctx)
+{
+       int i;
+       char *myname;
+
+       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, "");
+               }
+       }
+
+       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
+          the slower lp_do_global_parameter() to ensure that FLAG_CMDLINE is obeyed */
+#ifdef TCP_NODELAY
+       lp_do_global_parameter(lp_ctx, "socket options", "TCP_NODELAY");
+#endif
+       lp_do_global_parameter(lp_ctx, "workgroup", DEFAULT_WORKGROUP);
+       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, "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, "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, "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");
+       lp_do_global_parameter(lp_ctx, "wins database", "wins.ldb");
+       lp_do_global_parameter(lp_ctx, "registry:HKEY_LOCAL_MACHINE", "hklm.ldb");
+
+       /* This hive should be dynamically generated by Samba using
+          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");
+
+       /* Use codepage 850 as a default for the dos character set */
+       lp_do_global_parameter(lp_ctx, "dos charset", "CP850");
+
+       /*
+        * Allow the default PASSWD_CHAT to be overridden in local.h.
+        */
+       lp_do_global_parameter(lp_ctx, "passwd chat", DEFAULT_PASSWD_CHAT);
+
+       lp_do_global_parameter(lp_ctx, "pid directory", dyn_PIDDIR);
+       lp_do_global_parameter(lp_ctx, "lock dir", dyn_LOCKDIR);
+       lp_do_global_parameter(lp_ctx, "modules dir", dyn_MODULESDIR);
+       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", 
+                                  "Samba %s", SAMBA_VERSION_STRING);
+
+       lp_do_global_parameter_var(lp_ctx, "announce version", "%d.%d", 
+                        DEFAULT_MAJOR_VERSION,
+                        DEFAULT_MINOR_VERSION);
+
+       lp_do_global_parameter(lp_ctx, "password server", "*");
+
+       lp_do_global_parameter(lp_ctx, "max mux", "50");
+       lp_do_global_parameter(lp_ctx, "max xmit", "12288");
+       lp_do_global_parameter(lp_ctx, "password level", "0");
+       lp_do_global_parameter(lp_ctx, "LargeReadwrite", "True");
+       lp_do_global_parameter(lp_ctx, "server min protocol", "CORE");
+       lp_do_global_parameter(lp_ctx, "server max protocol", "NT1");
+       lp_do_global_parameter(lp_ctx, "client min protocol", "CORE");
+       lp_do_global_parameter(lp_ctx, "client max protocol", "NT1");
+       lp_do_global_parameter(lp_ctx, "security", "USER");
+       lp_do_global_parameter(lp_ctx, "paranoid server security", "True");
+       lp_do_global_parameter(lp_ctx, "EncryptPasswords", "True");
+       lp_do_global_parameter(lp_ctx, "ReadRaw", "True");
+       lp_do_global_parameter(lp_ctx, "WriteRaw", "True");
+       lp_do_global_parameter(lp_ctx, "NullPasswords", "False");
+       lp_do_global_parameter(lp_ctx, "ObeyPamRestrictions", "False");
+       lp_do_global_parameter(lp_ctx, "announce as", "NT SERVER");
+
+       lp_do_global_parameter(lp_ctx, "TimeServer", "False");
+       lp_do_global_parameter(lp_ctx, "BindInterfacesOnly", "False");
+       lp_do_global_parameter(lp_ctx, "Unicode", "True");
+       lp_do_global_parameter(lp_ctx, "ClientLanManAuth", "True");
+       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");
+       lp_do_global_parameter(lp_ctx, "LocalMaster", "True");
+
+       lp_do_global_parameter(lp_ctx, "wins support", "False");
+       lp_do_global_parameter(lp_ctx, "dns proxy", "True");
+
+       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, "template shell", "/bin/false");
+       lp_do_global_parameter(lp_ctx, "template homedir", "/home/%WORKGROUP%/%ACCOUNTNAME%");
+
+       lp_do_global_parameter(lp_ctx, "client signing", "Yes");
+       lp_do_global_parameter(lp_ctx, "server signing", "auto");
+
+       lp_do_global_parameter(lp_ctx, "use spnego", "True");
+
+       lp_do_global_parameter(lp_ctx, "smb ports", "445 139");
+       lp_do_global_parameter(lp_ctx, "nbt port", "137");
+       lp_do_global_parameter(lp_ctx, "dgram port", "138");
+       lp_do_global_parameter(lp_ctx, "cldap port", "389");
+       lp_do_global_parameter(lp_ctx, "krb5 port", "88");
+       lp_do_global_parameter(lp_ctx, "kpasswd port", "464");
+       lp_do_global_parameter(lp_ctx, "web port", "901");
+       lp_do_global_parameter(lp_ctx, "web application directory", dyn_WEBAPPSDIR);
+       lp_do_global_parameter(lp_ctx, "jsonrpc services directory", dyn_SERVICESDIR);
+
+       lp_do_global_parameter(lp_ctx, "nt status support", "True");
+
+       lp_do_global_parameter(lp_ctx, "max wins ttl", "518400"); /* 6 days */
+       lp_do_global_parameter(lp_ctx, "min wins ttl", "10");
+
+       lp_do_global_parameter(lp_ctx, "tls enabled", "True");
+       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", 
+                                  dyn_SETUPDIR);
+
+       for (i = 0; parm_table[i].label; i++) {
+               if (!(parm_table[i].flags & FLAG_CMDLINE)) {
+                       parm_table[i].flags |= FLAG_DEFAULT;
+               }
        }
+
+       return true;
 }
 
 /***************************************************************************
@@ -2464,69 +2472,57 @@ void lp_killservice(int iServiceIn)
  False on failure.
 ***************************************************************************/
 
-BOOL lp_load(void)
+bool lp_load(void)
 {
-       pstring n2;
-       BOOL bRetval;
+       char *n2;
+       bool bRetval;
        struct param_opt *data;
 
-       bRetval = False;
-
-       bInGlobalSection = True;
+       bRetval = false;
 
-       if (Globals.param_opt != NULL) {
+       if (loadparm.Globals.param_opt != NULL) {
                struct param_opt *next;
-               for (data=Globals.param_opt; data; data=next) {
+               for (data=loadparm.Globals.param_opt; data; data=next) {
                        next = data->next;
                        if (data->flags & FLAG_CMDLINE) continue;
-                       free(data->key);
-                       free(data->value);
-                       DLIST_REMOVE(Globals.param_opt, data);
-                       free(data);
+                       DLIST_REMOVE(loadparm.Globals.param_opt, data);
+                       talloc_free(data);
                }
        }
-       
-       init_globals();
 
-       pstrcpy(n2, lp_configfile());
-       standard_sub_basic(n2,sizeof(n2));
+       if (!loadparm_init(&loadparm))
+               return false;
+       
+       loadparm.bInGlobalSection = true;
+       n2 = standard_sub_basic(talloc_autofree_context(), lp_configfile());
        DEBUG(2, ("lp_load: refreshing parameters from %s\n", n2));
        
        add_to_file_list(lp_configfile(), n2);
 
        /* We get sections first, so have to start 'behind' to make up */
-       iServiceIndex = -1;
-       bRetval = pm_process(n2, do_section, do_parameter, NULL);
+       loadparm.currentService = NULL;
+       bRetval = pm_process(n2, do_section, do_parameter, &loadparm);
 
        /* finish up the last section */
        DEBUG(4, ("pm_process() returned %s\n", BOOLSTR(bRetval)));
        if (bRetval)
-               if (iServiceIndex >= 0)
-                       bRetval = service_ok(iServiceIndex);
+               if (loadparm.currentService != NULL)
+                       bRetval = service_ok(loadparm.currentService);
 
-       lp_add_auto_services(lp_auto_services());
+       lp_add_auto_services(&loadparm, lp_auto_services());
 
-       lp_add_hidden("IPC$", "IPC");
-       lp_add_hidden("ADMIN$", "DISK");
+       lp_add_hidden(&loadparm, "IPC$", "IPC");
+       lp_add_hidden(&loadparm, "ADMIN$", "DISK");
 
-       bLoaded = True;
+       bLoaded = true;
 
-       if (!Globals.szWINSservers && Globals.bWINSsupport) {
-               lp_do_parameter(-1, "wins server", "127.0.0.1");
+       if (!loadparm.Globals.szWINSservers && loadparm.Globals.bWINSsupport) {
+               lp_do_parameter(NULL, "wins server", "127.0.0.1");
        }
 
        init_iconv();
 
-       return (bRetval);
-}
-
-/***************************************************************************
- Reset the max number of services.
-***************************************************************************/
-
-void lp_resetnumservices(void)
-{
-       iNumServices = 0;
+       return bRetval;
 }
 
 /***************************************************************************
@@ -2535,41 +2531,54 @@ void lp_resetnumservices(void)
 
 int lp_numservices(void)
 {
-       return (iNumServices);
+       return loadparm.iNumServices;
 }
 
 /***************************************************************************
 Display the contents of the services array in human-readable form.
 ***************************************************************************/
 
-void lp_dump(FILE *f, BOOL show_defaults, int maxtoprint)
+void lp_dump(FILE *f, bool show_defaults, int maxtoprint)
 {
        int iService;
 
        if (show_defaults)
-               defaults_saved = False;
+               defaults_saved = false;
 
        dump_globals(f, show_defaults);
 
        dump_a_service(&sDefault, f);
 
        for (iService = 0; iService < maxtoprint; iService++)
-               lp_dump_one(f, show_defaults, iService);
+               lp_dump_one(f, show_defaults, loadparm.ServicePtrs[iService]);
 }
 
 /***************************************************************************
 Display the contents of one service in human-readable form.
 ***************************************************************************/
 
-void lp_dump_one(FILE * f, BOOL show_defaults, int snum)
+void lp_dump_one(FILE *f, bool show_defaults, struct service *service)
 {
-       if (VALID(snum)) {
-               if (ServicePtrs[snum]->szService[0] == '\0')
+       if (service != NULL) {
+               if (service->szService[0] == '\0')
                        return;
-               dump_a_service(ServicePtrs[snum], f);
+               dump_a_service(service, f);
        }
 }
 
+struct service *lp_servicebynum(int snum)
+{
+       return loadparm.ServicePtrs[snum];
+}
+
+struct service *lp_service(const char *service_name)
+{
+       int snum = lp_servicenumber(service_name);
+       if (snum < 0)
+               return NULL;
+       return loadparm.ServicePtrs[snum];
+}
+
 /***************************************************************************
 Return the number of the service with the given name, or -1 if it doesn't
 exist. Note that this is a DIFFERENT ANIMAL from the internal function
@@ -2580,17 +2589,17 @@ does not copy the found service.
 int lp_servicenumber(const char *pszServiceName)
 {
        int iService;
-        fstring serviceName;
+        char *serviceName;
  
  
-       for (iService = iNumServices - 1; iService >= 0; iService--) {
-               if (VALID(iService) && ServicePtrs[iService]->szService) {
+       for (iService = loadparm.iNumServices - 1; iService >= 0; iService--) {
+               if (VALID(iService) && loadparm.ServicePtrs[iService]->szService) {
                        /*
                         * The substitution here is used to support %U is
                         * service names
                         */
-                       fstrcpy(serviceName, ServicePtrs[iService]->szService);
-                       standard_sub_basic(serviceName,sizeof(serviceName));
+                       serviceName = standard_sub_basic(loadparm.ServicePtrs[iService],
+                                                        loadparm.ServicePtrs[iService]->szService);
                        if (strequal(serviceName, pszServiceName))
                                break;
                }
@@ -2599,7 +2608,7 @@ int lp_servicenumber(const char *pszServiceName)
        if (iService < 0)
                DEBUG(7,("lp_servicenumber: couldn't find %s\n", pszServiceName));
 
-       return (iService);
+       return iService;
 }
 
 int lp_find_valid_service(const char *pszServiceName)
@@ -2623,12 +2632,12 @@ int lp_find_valid_service(const char *pszServiceName)
 /*******************************************************************
  A useful volume label function. 
 ********************************************************************/
-const char *volume_label(int snum)
+const char *volume_label(struct service *service)
 {
-       const char *ret = lp_volume(snum);
+       const char *ret = lp_volume(service);
        if (!*ret)
-               return lp_servicename(snum);
-       return (ret);
+               return lp_servicename(service);
+       return ret;
 }
 
 
@@ -2636,7 +2645,7 @@ const char *volume_label(int snum)
  If we are PDC then prefer us as DMB
 ************************************************************/
 
-BOOL lp_domain_logons(void)
+bool lp_domain_logons(void)
 {
        return (lp_server_role() == ROLE_DOMAIN_CONTROLLER);
 }
@@ -2647,29 +2656,14 @@ BOOL lp_domain_logons(void)
 
 void lp_remove_service(int snum)
 {
-       ServicePtrs[snum]->valid = False;
-}
-
-/*******************************************************************
- Copy a service.
-********************************************************************/
-
-void lp_copy_service(int snum, const char *new_name)
-{
-       const char *oldname = lp_servicename(snum);
-       do_section(new_name, NULL);
-       if (snum >= 0) {
-               snum = lp_servicenumber(new_name);
-               if (snum >= 0)
-                       lp_do_parameter(snum, "copy", oldname);
-       }
+       loadparm.ServicePtrs[snum] = NULL;
 }
 
-const char *lp_printername(int snum)
+const char *lp_printername(struct service *service)
 {
-       const char *ret = _lp_printername(snum);
+       const char *ret = _lp_printername(service);
        if (ret == NULL || (ret != NULL && *ret == '\0'))
-               ret = lp_const_servicename(snum);
+               ret = lp_const_servicename(service);
 
        return ret;
 }
@@ -2681,7 +2675,7 @@ const char *lp_printername(int snum)
 
 int lp_maxprintjobs(int snum)
 {
-       int maxjobs = LP_SNUM_OK(snum) ? ServicePtrs[snum]->iMaxPrintJobs : sDefault.iMaxPrintJobs;
+       int maxjobs = LP_SNUM_OK(snum) ? loadparm.ServicePtrs[snum]->iMaxPrintJobs : sDefault.iMaxPrintJobs;
        if (maxjobs <= 0 || maxjobs >= PRINT_MAX_JOBID)
                maxjobs = PRINT_MAX_JOBID - 1;