r25041: Use context in more places, fix warnings.
[kai/samba.git] / source4 / param / loadparm.c
index 15dd070c0034bee07e9d1c11fb894eba9ea3cd76..6c3dee239b32db2b814ca79cf83112a7d724bde7 100644 (file)
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -22,8 +23,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
 #include "version.h"
 #include "dynconfig.h"
 #include "system/time.h"
-#include "system/iconv.h"
-#include "system/network.h"
-#include "system/printing.h"
-#include "librpc/gen_ndr/ndr_svcctl.h"
-#include "librpc/gen_ndr/ndr_samr.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
-#include "dlinklist.h"
-
-BOOL in_client = False;                /* Not in the client by default */
-static BOOL bLoaded = False;
-
-#ifndef GLOBAL_NAME
-#define GLOBAL_NAME "global"
-#endif
-
-#ifndef PRINTERS_NAME
-#define PRINTERS_NAME "printers"
-#endif
-
-#ifndef HOMES_NAME
-#define HOMES_NAME "homes"
-#endif
-
-/* 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 *);
-static BOOL do_parameter_var(const char *pszParmName, const char *fmt, ...);
-
-static BOOL defaults_saved = False;
+#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;
 
-#define FLAG_BASIC     0x0001 /* fundamental options */
-#define FLAG_SHARE     0x0002 /* file sharing options */
-#define FLAG_PRINT     0x0004 /* printing options */
-#define FLAG_GLOBAL    0x0008 /* local options that should be globally settable in SWAT */
-#define FLAG_WIZARD    0x0010 /* Parameters that the wizard will operate on */
-#define FLAG_ADVANCED  0x0020 /* Parameters that the wizard will operate on */
-#define FLAG_DEVELOPER         0x0040 /* Parameters that the wizard will operate on */
-#define FLAG_DEPRECATED 0x1000 /* options that should no longer be used */
-#define FLAG_HIDE      0x2000 /* options that should be hidden in SWAT */
-#define FLAG_DOS_STRING 0x4000 /* convert from UNIX to DOS codepage when reading this string. */
-#define FLAG_CMDLINE    0x8000 /* this option was set from the command line */
-
-
-/* the following are used by loadparm for option lists */
-typedef enum
-{
-  P_BOOL,P_BOOLREV,P_CHAR,P_INTEGER,P_OCTAL,P_LIST,
-  P_STRING,P_USTRING,P_ENUM,P_SEP
-} parm_type;
-
-typedef enum
-{
-  P_LOCAL,P_GLOBAL,P_SEPARATOR,P_NONE
-} parm_class;
-
-struct enum_list {
-       int value;
-       const char *name;
-};
-
-struct parm_struct
-{
-       const char *label;
-       parm_type type;
-       parm_class class;
-       void *ptr;
-       BOOL (*special)(const char *, char **);
-       const struct enum_list *enum_list;
-       uint_t flags;
-       union {
-               BOOL bvalue;
-               int ivalue;
-               char *svalue;
-               char cvalue;
-               const char **lvalue;
-       } def;
-};
+#define standard_sub_basic talloc_strdup
 
+static bool do_parameter(const char *, const char *, void *);
+static bool defaults_saved = false;
 
 struct param_opt {
        struct param_opt *prev, *next;
@@ -148,43 +82,34 @@ struct param_opt {
 /* 
  * This structure describes global (ie., server-wide) parameters.
  */
-typedef struct
+struct global
 {
+       enum server_role server_role;
+
        char **smb_ports;
-       char *dos_charset;
-       char *unix_charset;
        char *ncalrpc_dir;
-       char *display_charset;
-       char *szPrintcapname;
        char *szLockDir;
+       char *szModulesDir;
        char *szPidDir;
-       char *szRootdir;
-       char *szDefaultService;
-       char *szHostsEquiv;
+       char *szSetupDir;
        char *szServerString;
        char *szAutoServices;
-       char *szPasswdProgram;
        char *szPasswdChat;
-       char *szLogFile;
        char *szConfigFile;
-       char *szSMBPasswdFile;
+       char *szShareBackend;
        char *szSAM_URL;
+       char *szSECRETS_URL;
        char *szSPOOLSS_URL;
+       char *szWINS_CONFIG_URL;
        char *szWINS_URL;
        char *szPrivateDir;
-       char **szPreloadModules;
+       char **jsInclude;
+       char *jsonrpcServicesDir;
        char **szPasswordServers;
        char *szSocketOptions;
        char *szRealm;
-       char *szADSserver;
-       char *szLogonScript;
-       char *szLogonPath;
-       char *szLogonDrive;
-       char *szLogonHome;
        char **szWINSservers;
        char **szInterfaces;
-       char *szRemoteAnnounce;
-       char *szRemoteBrowseSync;
        char *szSocketAddress;
        char *szAnnounceVersion;        /* This is initialised in init_globals */
        char *szWorkgroup;
@@ -193,236 +118,182 @@ typedef struct
        char *szNetbiosScope;
        char *szDomainOtherSIDs;
        char **szNameResolveOrder;
-       char *szPanicAction;
-       char *szAddUserScript; 
-       char *szAddMachineScript;
-       char *szWINSHook;
-       char *szWINSPartners;
        char **dcerpc_ep_servers;
        char **server_services;
-       char *szWinbindUID;
-       char *szWinbindGID;
-       char *szNonUnixAccountRange;
-       char *szTemplateHomedir;
-       char *szTemplateShell;
+       char *ntptr_providor;
        char *szWinbindSeparator;
-       BOOL bWinbindEnumUsers;
-       BOOL bWinbindEnumGroups;
-       BOOL bWinbindUseDefaultDomain;
-       char *szIDMapBackend;
-       char *szGuestaccount;
+       char *szWinbinddSocketDirectory;
+       char *szTemplateShell;
+       char *szTemplateHomedir;
+       int bWinbindSealedPipes;
+       char *webapps_directory;
+       int tls_enabled;
+       char *tls_keyfile;
+       char *tls_certfile;
+       char *tls_cafile;
+       char *tls_crlfile;
+       char *tls_dhpfile;
        int max_mux;
        int max_xmit;
        int pwordlevel;
-       int unamelevel;
-       int maxprotocol;
-       int minprotocol;
+       int srv_maxprotocol;
+       int srv_minprotocol;
+       int cli_maxprotocol;
+       int cli_minprotocol;
        int security;
-       char **AuthMethods;
-       BOOL paranoid_server_security;
-       int lpqcachetime;
-       BOOL bDisableSpoolss;
-       int os_level;
-       int enhanced_browsing;
-       int time_offset;
-       int max_ttl;
+       int paranoid_server_security;
        int max_wins_ttl;
        int min_wins_ttl;
-       int lm_announce;
-       int lm_interval;
        int announce_as;        /* This is initialised in init_globals */
-       int machine_password_timeout;
-       int winbind_cache_time;
-       int iLockSpinCount;
-       int iLockSpinTime;
        int nbt_port;
        int dgram_port;
        int cldap_port;
+       int krb5_port;
+       int kpasswd_port;
+       int web_port;
        char *socket_options;
-       BOOL bDNSproxy;
-       BOOL bWINSsupport;
-       BOOL bWINSproxy;
-       BOOL bLocalMaster;
-       BOOL bPreferredMaster;
-       BOOL bDomainMaster;
-       BOOL bDomainLogons;
-       BOOL bEncryptPasswords;
-       BOOL bNullPasswords;
-       BOOL bObeyPamRestrictions;
-       BOOL bLoadPrinters;
-       BOOL bLargeReadwrite;
-       BOOL bReadRaw;
-       BOOL bWriteRaw;
-       BOOL bTimeServer;
-       BOOL bBindInterfacesOnly;
-       BOOL bPamPasswordChange;
-       BOOL bNTSmbSupport;
-       BOOL bNTStatusSupport;
-       BOOL bAllowTrustedDomains;
-       BOOL bLanmanAuth;
-       BOOL bNTLMAuth;
-       BOOL bUseSpnego;
-       int  server_signing;
-       int  client_signing;
-       BOOL bClientLanManAuth;
-       BOOL bClientNTLMv2Auth;
-       BOOL bHostMSDfs;
-       BOOL bHideLocalUsers;
-       BOOL bUnicode;
-       BOOL bUseMmap;
-       BOOL bHostnameLookups;
-       BOOL bUnixExtensions;
-       BOOL bDisableNetbios;
-       BOOL bRpcBigEndian;
-       int restrict_anonymous;
-       int name_cache_timeout;
+       int bWINSsupport;
+       int bWINSdnsProxy;
+       char *szWINSHook; 
+       int bLocalMaster;
+       int bPreferredMaster;
+       int bEncryptPasswords;
+       int bNullPasswords;
+       int bObeyPamRestrictions;
+       int bLargeReadwrite;
+       int bReadRaw;
+       int bWriteRaw;
+       int bTimeServer;
+       int bBindInterfacesOnly;
+       int bNTSmbSupport;
+       int bNTStatusSupport;
+       int bLanmanAuth;
+       int bNTLMAuth;
+       int bUseSpnego;
+       int server_signing;
+       int client_signing;
+       int bClientPlaintextAuth;
+       int bClientLanManAuth;
+       int bClientNTLMv2Auth;
+       int client_use_spnego_principal;
+       int bHostMSDfs;
+       int bUnicode;
+       int bUnixExtensions;
+       int bDisableNetbios;
+       int bRpcBigEndian;
        struct param_opt *param_opt;
-}
-global;
+};
 
-static global Globals;
 
 /* 
  * This structure describes a single service. 
  */
-typedef struct
+struct loadparm_service
 {
-       BOOL valid;
-       BOOL autoloaded;
        char *szService;
        char *szPath;
-       char *szUsername;
-       char **szInvalidUsers;
-       char **szValidUsers;
-       char **szAdminUsers;
        char *szCopy;
        char *szInclude;
-       char *szPrintcommand;
-       char *szLpqcommand;
-       char *szLprmcommand;
-       char *szLppausecommand;
-       char *szLpresumecommand;
-       char *szQueuepausecommand;
-       char *szQueueresumecommand;
        char *szPrintername;
        char **szHostsallow;
        char **szHostsdeny;
        char *comment;
        char *volume;
        char *fstype;
-       char *szMSDfsProxy;
        char **ntvfs_handler;
-       int iMinPrintSpace;
        int iMaxPrintJobs;
        int iMaxConnections;
-       int iPrinting;
        int iCSCPolicy;
-       BOOL bAvailable;
-       BOOL bBrowseable;
-       BOOL bRead_only;
-       BOOL bPrint_ok;
-       BOOL bMap_system;
-       BOOL bMap_hidden;
-       BOOL bMap_archive;
-       BOOL bLocking;
-       BOOL bStrictLocking;
-       BOOL bPosixLocking;
-       BOOL bOpLocks;
-       BOOL bLevel2OpLocks;
-       BOOL bOnlyUser;
-       BOOL bGuest_only;
-       BOOL bGuest_ok;
-       BOOL *copymap;
-       BOOL bMSDfsRoot;
-       BOOL bShareModes;
-       BOOL bStrictSync;
-       BOOL bCIFileSystem;
+       int bAvailable;
+       int bBrowseable;
+       int bRead_only;
+       int bPrint_ok;
+       int bMap_system;
+       int bMap_hidden;
+       int bMap_archive;
+       int bStrictLocking;
+       int iCreate_mask;
+       int iCreate_force_mode;
+       int iDir_mask;
+       int iDir_force_mode;
+       int *copymap;
+       int bMSDfsRoot;
+       int bStrictSync;
+       int bCIFileSystem;
        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 */
-       False,                  /* not autoloaded */
+static struct loadparm_service sDefault = {
        NULL,                   /* szService */
        NULL,                   /* szPath */
-       NULL,                   /* szUsername */
-       NULL,                   /* szInvalidUsers */
-       NULL,                   /* szValidUsers */
-       NULL,                   /* szAdminUsers */
        NULL,                   /* szCopy */
        NULL,                   /* szInclude */
-       NULL,                   /* szPrintcommand */
-       NULL,                   /* szLpqcommand */
-       NULL,                   /* szLprmcommand */
-       NULL,                   /* szLppausecommand */
-       NULL,                   /* szLpresumecommand */
-       NULL,                   /* szQueuepausecommand */
-       NULL,                   /* szQueueresumecommand */
        NULL,                   /* szPrintername */
        NULL,                   /* szHostsallow */
        NULL,                   /* szHostsdeny */
        NULL,                   /* comment */
        NULL,                   /* volume */
        NULL,                   /* fstype */
-       NULL,                   /* szMSDfsProxy */
        NULL,                   /* ntvfs_handler */
-       0,                      /* iMinPrintSpace */
        1000,                   /* iMaxPrintJobs */
        0,                      /* iMaxConnections */
-       DEFAULT_PRINTING,       /* iPrinting */
        0,                      /* iCSCPolicy */
-       True,                   /* bAvailable */
-       True,                   /* bBrowseable */
-       True,                   /* bRead_only */
-       False,                  /* bPrint_ok */
-       False,                  /* bMap_system */
-       False,                  /* bMap_hidden */
-       True,                   /* bMap_archive */
-       True,                   /* bLocking */
-       True,                   /* bStrictLocking */
-       True,                   /* bPosixLocking */
-       True,                   /* bOpLocks */
-       True,                   /* bLevel2OpLocks */
-       False,                  /* bOnlyUser */
-       False,                  /* bGuest_only */
-       False,                  /* bGuest_ok */
+       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 */
-       True,                   /* bShareModes */
-       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 BOOL bGlobalOnly = False;
-static int server_role;
-static int default_server_announce;
+static struct loadparm_context {
+       struct global Globals;
+       struct loadparm_service **ServicePtrs;
+       int iNumServices;
+       struct loadparm_service *currentService;
+       bool bInGlobalSection;
+       struct file_lists {
+               struct file_lists *next;
+               char *name;
+               char *subfname;
+               time_t modtime;
+       } *file_lists;
+} loadparm = {
+       .iNumServices = 0,
+       .currentService = NULL,
+       .bInGlobalSection = true,
+       .ServicePtrs = NULL,
+       .file_lists = NULL,
+};
 
 #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_winbind_uid(const char *pszParmValue, char **ptr);
-static BOOL handle_winbind_gid(const char *pszParmValue, char **ptr);
-static BOOL handle_non_unix_account_range(const char *pszParmValue, char **ptr);
-
-static void set_server_role(void);
-static void set_default_server_announce_type(void);
+static bool handle_include(struct loadparm_context *lp_ctx, 
+                          const char *pszParmValue, char **ptr);
+static bool handle_copy(struct loadparm_context *lp_ctx, 
+                       const char *pszParmValue, char **ptr);
 
 static const struct enum_list enum_protocol[] = {
+       {PROTOCOL_SMB2, "SMB2"},
        {PROTOCOL_NT1, "NT1"},
        {PROTOCOL_LANMAN2, "LANMAN2"},
        {PROTOCOL_LANMAN1, "LANMAN1"},
@@ -435,39 +306,9 @@ static const struct enum_list enum_protocol[] = {
 static const struct enum_list enum_security[] = {
        {SEC_SHARE, "SHARE"},
        {SEC_USER, "USER"},
-       {SEC_SERVER, "SERVER"},
-       {SEC_DOMAIN, "DOMAIN"},
-#ifdef HAVE_ADS
-       {SEC_ADS, "ADS"},
-#endif
-       {-1, NULL}
-};
-
-static const struct enum_list enum_printing[] = {
-       {PRINT_SYSV, "sysv"},
-       {PRINT_AIX, "aix"},
-       {PRINT_HPUX, "hpux"},
-       {PRINT_BSD, "bsd"},
-       {PRINT_QNX, "qnx"},
-       {PRINT_PLP, "plp"},
-       {PRINT_LPRNG, "lprng"},
-       {PRINT_SOFTQ, "softq"},
-       {PRINT_CUPS, "cups"},
-       {PRINT_LPRNT, "nt"},
-       {PRINT_LPROS2, "os2"},
-#ifdef DEVELOPER
-       {PRINT_TEST, "test"},
-       {PRINT_VLP, "vlp"},
-#endif /* DEVELOPER */
        {-1, NULL}
 };
 
-/* Types of machine we can announce as. */
-#define ANNOUNCE_AS_NT_SERVER 1
-#define ANNOUNCE_AS_WIN95 2
-#define ANNOUNCE_AS_WFW 3
-#define ANNOUNCE_AS_NT_WORKSTATION 4
-
 static const struct enum_list enum_announce_as[] = {
        {ANNOUNCE_AS_NT_SERVER, "NT"},
        {ANNOUNCE_AS_NT_SERVER, "NT Server"},
@@ -478,12 +319,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}
 };
@@ -523,6 +364,13 @@ static const struct enum_list enum_smb_signing_vals[] = {
        {-1, NULL}
 };
 
+static const struct enum_list enum_server_role[] = {
+       {ROLE_STANDALONE, "standalone"},
+       {ROLE_DOMAIN_MEMBER, "member server"},
+       {ROLE_DOMAIN_CONTROLLER, "domain controller"},
+       {-1, NULL}
+};
+
 
 /* Note: We do not initialise the defaults union - it is not allowed in ANSI C
  *
@@ -537,148 +385,123 @@ static const struct enum_list enum_smb_signing_vals[] = {
 static struct parm_struct parm_table[] = {
        {"Base Options", P_SEP, P_SEPARATOR},
 
-       {"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},
+       {"server role", P_ENUM, P_GLOBAL, &loadparm.Globals.server_role, NULL, enum_server_role, FLAG_BASIC},
+
+       {"dos charset", P_STRING, P_GLOBAL, &dos_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"unix charset", P_STRING, P_GLOBAL, &unix_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"ncalrpc dir", P_STRING, P_GLOBAL, &loadparm.Globals.ncalrpc_dir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"display charset", P_STRING, P_GLOBAL, &display_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
        {"path", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
        {"directory", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_HIDE},
-       {"workgroup", P_USTRING, P_GLOBAL, &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},
-       {"ADS server", P_STRING, P_GLOBAL, &Globals.szADSserver, 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},
-       {"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},
-       {"auth methods", P_LIST, P_GLOBAL, &Globals.AuthMethods, NULL, NULL, 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},
-       {"allow trusted domains", P_BOOL, P_GLOBAL, &Globals.bAllowTrustedDomains, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"hosts equiv", P_STRING, P_GLOBAL, &Globals.szHostsEquiv, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"idmap backend", P_STRING, P_GLOBAL, &Globals.szIDMapBackend, NULL, NULL, FLAG_ADVANCED | 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},
-       {"smb passwd file", P_STRING, P_GLOBAL, &Globals.szSMBPasswdFile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"sam database", P_STRING, P_GLOBAL, &Globals.szSAM_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"spoolss database", P_STRING, P_GLOBAL, &Globals.szSPOOLSS_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},
-       {"non unix account range", P_STRING, P_GLOBAL, &Globals.szNonUnixAccountRange, handle_non_unix_account_range, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"root directory", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"root dir", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"root", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, FLAG_HIDE | FLAG_DEVELOPER},
-       {"guest account", P_STRING, P_GLOBAL, &Globals.szGuestaccount, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_DEVELOPER},
-       
-       {"pam password change", P_BOOL, P_GLOBAL, &Globals.bPamPasswordChange, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"passwd program", P_STRING, P_GLOBAL, &Globals.szPasswdProgram, 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},
-       {"username level", P_INTEGER, P_GLOBAL, &Globals.unamelevel, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"restrict anonymous", P_INTEGER, P_GLOBAL, &Globals.restrict_anonymous, 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},
-       
-       {"username", P_STRING, P_LOCAL, &sDefault.szUsername, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
-       {"user", P_STRING, P_LOCAL, &sDefault.szUsername, NULL, NULL, FLAG_HIDE},
-       {"users", P_STRING, P_LOCAL, &sDefault.szUsername, NULL, NULL, FLAG_HIDE},
-       
-       {"invalid users", P_LIST, P_LOCAL, &sDefault.szInvalidUsers, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
-       {"valid users", P_LIST, P_LOCAL, &sDefault.szValidUsers, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
-       {"admin users", P_LIST, P_LOCAL, &sDefault.szAdminUsers, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
+       {"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},
 
-       {"guest only", P_BOOL, P_LOCAL, &sDefault.bGuest_only, NULL, NULL, FLAG_SHARE},
+       {"create mask", P_OCTAL, P_LOCAL, &sDefault.iCreate_mask, NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE}, 
+       {"force create mode", P_OCTAL, P_LOCAL, &sDefault.iCreate_force_mode, NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE}, 
+       {"directory mask", P_OCTAL, P_LOCAL, &sDefault.iDir_mask, NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE}, 
+       {"force directory mode", P_OCTAL, P_LOCAL, &sDefault.iDir_force_mode, NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE}, 
 
-       {"guest ok", P_BOOL, P_LOCAL, &sDefault.bGuest_ok, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
-
-       {"only user", P_BOOL, P_LOCAL, &sDefault.bOnlyUser, NULL, NULL, FLAG_SHARE},
        {"hosts allow", P_LIST, P_LOCAL, &sDefault.szHostsallow, NULL, NULL, FLAG_GLOBAL | FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
        {"hosts deny", P_LIST, P_LOCAL, &sDefault.szHostsdeny, NULL, NULL, FLAG_GLOBAL | FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
-       {"preload modules", P_LIST, P_GLOBAL, &Globals.szPreloadModules, NULL, NULL, FLAG_BASIC | FLAG_GLOBAL},
 
        {"Logging Options", P_SEP, P_SEPARATOR},
 
        {"log level", P_INTEGER, P_GLOBAL, &DEBUGLEVEL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"debuglevel", P_INTEGER, P_GLOBAL, &DEBUGLEVEL, NULL, NULL, FLAG_HIDE},
-       {"log file", P_STRING, P_GLOBAL, &Globals.szLogFile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"log file", P_STRING, P_GLOBAL, &logfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        
        {"Protocol Options", P_SEP, P_SEPARATOR},
        
-       {"smb ports", P_LIST, P_GLOBAL, &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},
-       {"large readwrite", P_BOOL, P_GLOBAL, &Globals.bLargeReadwrite, NULL, NULL, FLAG_DEVELOPER},
-       {"max protocol", P_ENUM, P_GLOBAL, &Globals.maxprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
-       {"min protocol", P_ENUM, P_GLOBAL, &Globals.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_INTEGER, 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 ttl", P_INTEGER, P_GLOBAL, &Globals.max_ttl, NULL, NULL, FLAG_ADVANCED | 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},
                
-       {"lpq cache time", P_INTEGER, P_GLOBAL, &Globals.lpqcachetime, NULL, NULL, FLAG_DEVELOPER},
        {"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},
-       {"min print space", P_INTEGER, P_LOCAL, &sDefault.iMinPrintSpace, NULL, NULL, FLAG_PRINT},
-       
-       {"socket options", P_STRING, P_GLOBAL, &Globals.socket_options, NULL, NULL, FLAG_DEVELOPER},
-       {"use mmap", P_BOOL, P_GLOBAL, &Globals.bUseMmap, NULL, NULL, FLAG_DEVELOPER},
-       {"hostname lookups", P_BOOL, P_GLOBAL, &Globals.bHostnameLookups, NULL, NULL, FLAG_ADVANCED | 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},
 
-       {"name cache timeout", P_INTEGER, P_GLOBAL, &Globals.name_cache_timeout, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"strict sync", P_BOOL, P_LOCAL, &sDefault.bStrictSync, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE}, 
        {"case insensitive filesystem", P_BOOL, P_LOCAL, &sDefault.bCIFileSystem, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE}, 
 
        {"Printing Options", P_SEP, P_SEPARATOR},
        
        {"max print jobs", P_INTEGER, P_LOCAL, &sDefault.iMaxPrintJobs, NULL, NULL, FLAG_PRINT},
-       {"load printers", P_BOOL, P_GLOBAL, &Globals.bLoadPrinters, NULL, NULL, FLAG_PRINT},
-       {"printcap name", P_STRING, P_GLOBAL, &Globals.szPrintcapname, NULL, NULL, FLAG_PRINT | FLAG_DEVELOPER},
-       {"printcap", P_STRING, P_GLOBAL, &Globals.szPrintcapname, NULL, NULL, FLAG_HIDE},
        {"printable", P_BOOL, P_LOCAL, &sDefault.bPrint_ok, NULL, NULL, FLAG_PRINT},
        {"print ok", P_BOOL, P_LOCAL, &sDefault.bPrint_ok, NULL, NULL, FLAG_HIDE},
-       {"printing", P_ENUM, P_LOCAL, &sDefault.iPrinting, NULL, enum_printing, FLAG_PRINT | FLAG_GLOBAL},
-       {"print command", P_STRING, P_LOCAL, &sDefault.szPrintcommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL},
-       {"disable spoolss", P_BOOL, P_GLOBAL, &Globals.bDisableSpoolss, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL},
-       {"lpq command", P_STRING, P_LOCAL, &sDefault.szLpqcommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL},
-       {"lprm command", P_STRING, P_LOCAL, &sDefault.szLprmcommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL},
-       {"lppause command", P_STRING, P_LOCAL, &sDefault.szLppausecommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL},
-       {"lpresume command", P_STRING, P_LOCAL, &sDefault.szLpresumecommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL},
-       {"queuepause command", P_STRING, P_LOCAL, &sDefault.szQueuepausecommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL},
-       {"queueresume command", P_STRING, P_LOCAL, &sDefault.szQueueresumecommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL},
        
        {"printer name", P_STRING, P_LOCAL, &sDefault.szPrintername, NULL, NULL, FLAG_PRINT},
        {"printer", P_STRING, P_LOCAL, &sDefault.szPrintername, NULL, NULL, FLAG_HIDE},
@@ -691,71 +514,45 @@ static struct parm_struct parm_table[] = {
 
        {"Domain Options", P_SEP, P_SEPARATOR},
        
-       {"machine password timeout", P_INTEGER, P_GLOBAL, &Globals.machine_password_timeout, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-
        {"Logon Options", P_SEP, P_SEPARATOR},
 
-       {"add user script", P_STRING, P_GLOBAL, &Globals.szAddUserScript, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"add machine script", P_STRING, P_GLOBAL, &Globals.szAddMachineScript, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-
-       {"logon script", P_STRING, P_GLOBAL, &Globals.szLogonScript, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"logon path", P_STRING, P_GLOBAL, &Globals.szLogonPath, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"logon drive", P_STRING, P_GLOBAL, &Globals.szLogonDrive, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"logon home", P_STRING, P_GLOBAL, &Globals.szLogonHome, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"domain logons", P_BOOL, P_GLOBAL, &Globals.bDomainLogons, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 
        {"Browse Options", P_SEP, P_SEPARATOR},
        
-       {"os level", P_INTEGER, P_GLOBAL, &Globals.os_level, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"lm announce", P_ENUM, P_GLOBAL, &Globals.lm_announce, NULL, enum_bool_auto, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"lm interval", P_INTEGER, P_GLOBAL, &Globals.lm_interval, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"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},
-       {"domain master", P_ENUM, P_GLOBAL, &Globals.bDomainMaster, NULL, enum_bool_auto, 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},
-       {"enhanced browsing", P_BOOL, P_GLOBAL, &Globals.enhanced_browsing, NULL, NULL, FLAG_DEVELOPER | FLAG_ADVANCED},
 
        {"WINS Options", P_SEP, P_SEPARATOR},
-       {"dns proxy", P_BOOL, P_GLOBAL, &Globals.bDNSproxy, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"wins proxy", P_BOOL, P_GLOBAL, &Globals.bWINSproxy, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        
-       {"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},
-       {"wins hook", P_STRING, P_GLOBAL, &Globals.szWINSHook, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"wins partners", P_STRING, P_GLOBAL, &Globals.szWINSPartners, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
+       {"wins server", P_LIST, P_GLOBAL, &loadparm.Globals.szWINSservers, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
+       {"wins support", P_BOOL, P_GLOBAL, &loadparm.Globals.bWINSsupport, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
+       {"dns proxy", P_BOOL, P_GLOBAL, &loadparm.Globals.bWINSdnsProxy, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
+       {"wins hook", P_STRING, P_GLOBAL, &loadparm.Globals.szWINSHook, NULL, NULL, FLAG_ADVANCED}, 
 
        {"Locking Options", P_SEP, P_SEPARATOR},
        
        {"csc policy", P_ENUM, P_LOCAL, &sDefault.iCSCPolicy, NULL, enum_csc_policy, FLAG_SHARE | FLAG_GLOBAL},
-       {"locking", P_BOOL, P_LOCAL, &sDefault.bLocking, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"lock spin count", P_INTEGER, P_GLOBAL, &Globals.iLockSpinCount, NULL, NULL, FLAG_GLOBAL},
-       {"lock spin time", P_INTEGER, P_GLOBAL, &Globals.iLockSpinTime, NULL, NULL, FLAG_GLOBAL},
        
-       {"oplocks", P_BOOL, P_LOCAL, &sDefault.bOpLocks, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"level2 oplocks", P_BOOL, P_LOCAL, &sDefault.bLevel2OpLocks, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"posix locking", P_BOOL, P_LOCAL, &sDefault.bPosixLocking, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
        {"strict locking", P_BOOL, P_LOCAL, &sDefault.bStrictLocking, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"share modes", P_BOOL, P_LOCAL,  &sDefault.bShareModes, NULL, NULL, FLAG_SHARE|FLAG_GLOBAL},
 
        {"Miscellaneous Options", P_SEP, P_SEPARATOR},
        
-       {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE},
-       {"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},
-       {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, 
-       
-       {"default service", P_STRING, P_GLOBAL, &Globals.szDefaultService, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"default", P_STRING, P_GLOBAL, &Globals.szDefaultService, NULL, NULL,  FLAG_DEVELOPER},
-       {"remote announce", P_STRING, P_GLOBAL, &Globals.szRemoteAnnounce, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"remote browse sync", P_STRING, P_GLOBAL, &Globals.szRemoteBrowseSync, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"socket address", P_STRING, P_GLOBAL, &Globals.szSocketAddress, NULL, NULL, FLAG_DEVELOPER},
-       {"time offset", P_INTEGER, P_GLOBAL, &Globals.time_offset, NULL, NULL, FLAG_ADVANCED | 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},
        
@@ -763,305 +560,26 @@ static struct parm_struct parm_table[] = {
        {"volume", P_STRING, P_LOCAL, &sDefault.volume, NULL, NULL, FLAG_SHARE },
        {"fstype", P_STRING, P_LOCAL, &sDefault.fstype, NULL, NULL, FLAG_SHARE},
 
-       {"panic action", P_STRING, P_GLOBAL, &Globals.szPanicAction, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"hide local users", P_BOOL, P_GLOBAL, &Globals.bHideLocalUsers, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"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},
-       {"msdfs proxy", P_STRING, P_LOCAL, &sDefault.szMSDfsProxy, NULL, NULL, FLAG_SHARE},
-       {"host msdfs", P_BOOL, P_GLOBAL, &Globals.bHostMSDfs, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"Winbind options", P_SEP, P_SEPARATOR},
-
-       {"winbind uid", P_STRING, P_GLOBAL, &Globals.szWinbindUID, handle_winbind_uid, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"winbind gid", P_STRING, P_GLOBAL, &Globals.szWinbindGID, handle_winbind_gid, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"template homedir", P_STRING, P_GLOBAL, &Globals.szTemplateHomedir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"template shell", P_STRING, P_GLOBAL, &Globals.szTemplateShell, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"winbind separator", P_STRING, P_GLOBAL, &Globals.szWinbindSeparator, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"winbind cache time", P_INTEGER, P_GLOBAL, &Globals.winbind_cache_time, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"winbind enum users", P_BOOL, P_GLOBAL, &Globals.bWinbindEnumUsers, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"winbind enum groups", P_BOOL, P_GLOBAL, &Globals.bWinbindEnumGroups, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"winbind use default domain", P_BOOL, P_GLOBAL, &Globals.bWinbindUseDefaultDomain, 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}
 };
 
-/***************************************************************************
- Initialise the sDefault parameter structure for the printer values.
-***************************************************************************/
-
-static void init_printer_values(void)
-{
-       /* choose defaults depending on the type of printing */
-       switch (sDefault.iPrinting) {
-               case PRINT_BSD:
-               case PRINT_AIX:
-               case PRINT_LPRNT:
-               case PRINT_LPROS2:
-                       do_parameter("Lpqcommand", "lpq -P'%p'");
-                       do_parameter("Lprmcommand", "lprm -P'%p' %j");
-                       do_parameter("Printcommand",
-                                  "lpr -r -P'%p' %s");
-                       break;
-
-               case PRINT_LPRNG:
-               case PRINT_PLP:
-                       do_parameter("Lpqcommand", "lpq -P'%p'");
-                       do_parameter("Lprmcommand", "lprm -P'%p' %j");
-                       do_parameter("Printcommand",
-                                  "lpr -r -P'%p' %s");
-                       do_parameter("Queuepausecommand",
-                                  "lpc stop '%p'");
-                       do_parameter("Queueresumecommand",
-                                  "lpc start '%p'");
-                       do_parameter("Lppausecommand",
-                                  "lpc hold '%p' %j");
-                       do_parameter("Lpresumecommand",
-                                  "lpc release '%p' %j");
-                       break;
-
-               case PRINT_CUPS:
-#ifdef HAVE_CUPS
-                       do_parameter("Lpqcommand", "");
-                       do_parameter("Lprmcommand", "");
-                       do_parameter("Printcommand", "");
-                       do_parameter("Lppausecommand", "");
-                       do_parameter("Lpresumecommand", "");
-                       do_parameter("Queuepausecommand", "");
-                       do_parameter("Queueresumecommand", "");
-
-                       do_parameter("Printcapname", "cups");
-#else
-                       do_parameter("Lpqcommand",
-                                  "/usr/bin/lpstat -o '%p'");
-                       do_parameter("Lprmcommand",
-                                  "/usr/bin/cancel '%p-%j'");
-                       do_parameter("Printcommand",
-                                  "/usr/bin/lp -d '%p' %s; rm %s");
-                       do_parameter("Lppausecommand",
-                                  "lp -i '%p-%j' -H hold");
-                       do_parameter("Lpresumecommand",
-                                  "lp -i '%p-%j' -H resume");
-                       do_parameter("Queuepausecommand",
-                                  "/usr/bin/disable '%p'");
-                       do_parameter("Queueresumecommand",
-                                  "/usr/bin/enable '%p'");
-                       do_parameter("Printcapname", "lpstat");
-#endif /* HAVE_CUPS */
-                       break;
-
-               case PRINT_SYSV:
-               case PRINT_HPUX:
-                       do_parameter("Lpqcommand", "lpstat -o%p");
-                       do_parameter("Lprmcommand", "cancel %p-%j");
-                       do_parameter("Printcommand",
-                                  "lp -c -d%p %s; rm %s");
-                       do_parameter("Queuepausecommand",
-                                  "disable %p");
-                       do_parameter("Queueresumecommand",
-                                  "enable %p");
-#ifndef HPUX
-                       do_parameter("Lppausecommand",
-                                  "lp -i %p-%j -H hold");
-                       do_parameter("Lpresumecommand",
-                                  "lp -i %p-%j -H resume");
-#endif /* HPUX */
-                       break;
-
-               case PRINT_QNX:
-                       do_parameter("Lpqcommand", "lpq -P%p");
-                       do_parameter("Lprmcommand", "lprm -P%p %j");
-                       do_parameter("Printcommand", "lp -r -P%p %s");
-                       break;
-
-               case PRINT_SOFTQ:
-                       do_parameter("Lpqcommand", "qstat -l -d%p");
-                       do_parameter("Lprmcommand",
-                                  "qstat -s -j%j -c");
-                       do_parameter("Printcommand",
-                                  "lp -d%p -s %s; rm %s");
-                       do_parameter("Lppausecommand",
-                                  "qstat -s -j%j -h");
-                       do_parameter("Lpresumecommand",
-                                  "qstat -s -j%j -r");
-                       break;
-#ifdef DEVELOPER
-       case PRINT_TEST:
-       case PRINT_VLP:
-               do_parameter("Printcommand", "vlp print %p %s");
-               do_parameter("Lpqcommand", "vlp lpq %p");
-               do_parameter("Lprmcommand", "vlp lprm %p %j");
-               do_parameter("Lppausecommand", "vlp lppause %p %j");
-               do_parameter("Lpresumecommand", "vlp lpresum %p %j");
-               do_parameter("Queuepausecommand", "vlp queuepause %p");
-               do_parameter("Queueresumecommand", "vlp queueresume %p");
-               break;
-#endif /* DEVELOPER */
-
-       }
-}
-
 
-/***************************************************************************
- Initialise the global parameter structure.
-***************************************************************************/
-static void init_globals(void)
+/*
+  return the parameter table
+*/
+struct parm_struct *lp_parm_table(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, "");
-               }
-       }
-
-       /* 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");
-#endif
-       do_parameter("workgroup", DEFAULT_WORKGROUP);
-       myname = get_myname();
-       do_parameter("netbios name", myname);
-       SAFE_FREE(myname);
-       do_parameter("max protocol", "NT1");
-       do_parameter("name resolve order", "lmhosts wins host bcast");
-
-       init_printer_values();
-
-       do_parameter("fstype", FSTYPE_STRING);
-       do_parameter("ntvfs handler", "unixuid default");
-       do_parameter("max connections", "-1");
-
-       do_parameter("dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup");
-       do_parameter("server services", "smb rpc nbt cldap");
-       do_parameter("auth methods", "anonymous sam_ignoredomain");
-       do_parameter("smb passwd file", dyn_SMB_PASSWD_FILE);
-       do_parameter("private dir", dyn_PRIVATE_DIR);
-       do_parameter_var("sam database", "tdb://%s/sam.ldb", dyn_PRIVATE_DIR);
-       do_parameter_var("spoolss database", "tdb://%s/spoolss.ldb", dyn_PRIVATE_DIR);
-       do_parameter_var("wins database", "tdb://%s/wins.ldb", dyn_PRIVATE_DIR);
-       do_parameter_var("registry:HKEY_LOCAL_MACHINE", "ldb:/%s/hklm.ldb", dyn_PRIVATE_DIR);
-       do_parameter("guest account", GUEST_ACCOUNT);
-
-       /* using UTF8 by default allows us to support all chars */
-       do_parameter("unix charset", "UTF8");
-
-       /* Use codepage 850 as a default for the dos character set */
-       do_parameter("dos charset", "CP850");
-
-       /*
-        * Allow the default PASSWD_CHAT to be overridden in local.h.
-        */
-       do_parameter("passwd chat", DEFAULT_PASSWD_CHAT);
-
-       do_parameter("passwd program", "");
-       do_parameter("printcap name", PRINTCAP_NAME);
-       
-       do_parameter("pid directory", dyn_PIDDIR);
-       do_parameter("lock dir", dyn_LOCKDIR);
-       do_parameter("ncalrpc dir", dyn_NCALRPCDIR);
-
-       do_parameter("socket address", "0.0.0.0");
-       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("logon drive", "");
-
-       do_parameter("logon home", "\\\\%N\\%U");
-       do_parameter("logon path", "\\\\%N\\%U\\profile");
-       do_parameter("password server", "*");
-
-       do_parameter("load printers", "True");
-
-       do_parameter("max mux", "50");
-       do_parameter("max xmit", "12288");
-       do_parameter("lpqcachetime", "10");
-       do_parameter("DisableSpoolss", "False");
-       do_parameter("password level", "0");
-       do_parameter("username level", "0");
-       do_parameter("LargeReadwrite", "True");
-       do_parameter("minprotocol", "CORE");
-       do_parameter("security", "USER");
-       do_parameter("paranoid server security", "True");
-       do_parameter("EncryptPasswords", "True");
-       do_parameter("ReadRaw", "True");
-       do_parameter("WriteRaw", "True");
-       do_parameter("NullPasswords", "False");
-       do_parameter("ObeyPamRestrictions", "False");
-       do_parameter("lm announce", "Auto");    
-       do_parameter("lm interval", "60");
-       do_parameter("announce as", "NT SERVER");
-
-       do_parameter("TimeServer", "False");
-       do_parameter("BindInterfacesOnly", "False");
-       do_parameter("PamPasswordChange", "False");
-       do_parameter("Unicode", "True");
-       do_parameter("restrict anonymous", "0");
-       do_parameter("ClientLanManAuth", "True");
-       do_parameter("LanmanAuth", "True");
-       do_parameter("NTLMAuth", "True");
-       
-       do_parameter("enhanced browsing", "True"); 
-       do_parameter("LockSpinCount", "3");
-       do_parameter("LockSpinTime", "10");
-#ifdef MMAP_BLACKLIST
-       do_parameter("UseMmap", "False");
-#else
-       do_parameter("UseMmap", "True");
-#endif
-       do_parameter("UnixExtensions", "False");
-
-       /* hostname lookups can be very expensive and are broken on
-          a large number of sites (tridge) */
-       do_parameter("HostnameLookups", "False");
-
-       do_parameter("PreferredMaster", "Auto");
-       do_parameter("os level", "20");
-       do_parameter("LocalMaster", "True");
-       do_parameter("DomainMaster", "Auto");   /* depending on bDomainLogons */
-       do_parameter("DomainLogons", "False");
-       do_parameter("WINSsupport", "False");
-       do_parameter("WINSproxy", "False");
-
-       do_parameter("DNSproxy", "True");
-
-       do_parameter("AllowTrustedDomains", "True");
-
-       do_parameter("TemplateShell", "/bin/false");
-       do_parameter("TemplateHomedir", "/home/%D/%U");
-       do_parameter("WinbindSeparator", "\\");
-
-       do_parameter("winbind cache time", "15");
-       do_parameter("WinbindEnumUsers", "True");
-       do_parameter("WinbindEnumGroups", "True");
-       do_parameter("WinbindUseDefaultDomain", "False");
-
-       do_parameter("IDMapBackend", "tdb");
-
-       do_parameter("name cache timeout", "660"); /* In seconds */
-
-       do_parameter("client signing", "Yes");
-       do_parameter("server signing", "auto");
-
-       do_parameter("use spnego", "True");
-
-       do_parameter("smb ports", SMB_PORTS);
-       do_parameter("nbt port", "137");
-       do_parameter("dgram port", "138");
-       do_parameter("cldap port", "389");
-
-       do_parameter("nt status support", "True");
-
-       do_parameter("max wins ttl", "432000");
-       do_parameter("min wins ttl", "10");
+       return parm_table;
 }
 
 static TALLOC_CTX *lp_talloc;
@@ -1112,11 +630,11 @@ static const char *lp_string(const char *s)
        if (!s)
                *ret = 0;
        else
-               StrnCpy(ret, s, len);
+               strlcpy(ret, s, len);
 
        if (trim_string(ret, "\"", "\"")) {
                if (strchr(ret,'"') != NULL)
-                       StrnCpy(ret, s, len);
+                       strlcpy(ret, s, len);
        }
 
        standard_sub_basic(ret,len+100);
@@ -1137,217 +655,168 @@ 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 *)(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));}
+#endif
 #define FN_GLOBAL_INTEGER(fn_name,ptr) \
  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 loadparm_service *service) {return(lp_string((const char *)((service != NULL && service->val != NULL) ? service->val : sDefault.val)));}
 #define FN_LOCAL_CONST_STRING(fn_name,val) \
- const char *fn_name(int i) {return (const char *)((LP_SNUM_OK(i) && ServicePtrs[(i)]->val) ? ServicePtrs[(i)]->val : sDefault.val);}
+ const char *fn_name(struct loadparm_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 loadparm_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);}
-#define FN_LOCAL_CHAR(fn_name,val) \
- char fn_name(int i) {return(LP_SNUM_OK(i)? ServicePtrs[(i)]->val : sDefault.val);}
+ bool fn_name(struct loadparm_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);}
-
-FN_GLOBAL_LIST(lp_smb_ports, &Globals.smb_ports)
-FN_GLOBAL_INTEGER(lp_nbt_port, &Globals.nbt_port)
-FN_GLOBAL_INTEGER(lp_dgram_port, &Globals.dgram_port)
-FN_GLOBAL_INTEGER(lp_cldap_port, &Globals.cldap_port)
-FN_GLOBAL_STRING(lp_dos_charset, &Globals.dos_charset)
-FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset)
-FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset)
-FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile)
-FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile)
-FN_GLOBAL_STRING(lp_smb_passwd_file, &Globals.szSMBPasswdFile)
-FN_GLOBAL_STRING(lp_sam_url, &Globals.szSAM_URL)
-FN_GLOBAL_STRING(lp_spoolss_url, &Globals.szSPOOLSS_URL)
-FN_GLOBAL_STRING(lp_wins_url, &Globals.szWINS_URL)
-FN_GLOBAL_STRING(lp_private_dir, &Globals.szPrivateDir)
-FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString)
-FN_GLOBAL_STRING(lp_printcapname, &Globals.szPrintcapname)
-FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
-FN_GLOBAL_STRING(lp_ncalrpc_dir, &Globals.ncalrpc_dir)
-FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
-FN_GLOBAL_LIST(lp_dcerpc_endpoint_servers, &Globals.dcerpc_ep_servers)
-FN_GLOBAL_LIST(lp_server_services, &Globals.server_services)
-FN_GLOBAL_STRING(lp_rootdir, &Globals.szRootdir)
-FN_GLOBAL_STRING(lp_defaultservice, &Globals.szDefaultService)
-FN_GLOBAL_STRING(lp_hosts_equiv, &Globals.szHostsEquiv)
-FN_GLOBAL_STRING(lp_auto_services, &Globals.szAutoServices)
-FN_GLOBAL_STRING(lp_passwd_program, &Globals.szPasswdProgram)
-FN_GLOBAL_STRING(lp_passwd_chat, &Globals.szPasswdChat)
-FN_GLOBAL_LIST(lp_passwordserver, &Globals.szPasswordServers)
-FN_GLOBAL_LIST(lp_name_resolve_order, &Globals.szNameResolveOrder)
-FN_GLOBAL_STRING(lp_realm, &Globals.szRealm)
-FN_GLOBAL_STRING(lp_ads_server, &Globals.szADSserver)
-FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
-FN_GLOBAL_STRING(lp_workgroup, &Globals.szWorkgroup)
-FN_GLOBAL_STRING(lp_netbios_name, &Globals.szNetbiosName)
-FN_GLOBAL_STRING(lp_netbios_scope, &Globals.szNetbiosScope)
-FN_GLOBAL_CONST_STRING(lp_logon_script, &Globals.szLogonScript)
-FN_GLOBAL_CONST_STRING(lp_logon_path, &Globals.szLogonPath)
-FN_GLOBAL_CONST_STRING(lp_logon_drive, &Globals.szLogonDrive)
-FN_GLOBAL_CONST_STRING(lp_logon_home, &Globals.szLogonHome)
-FN_GLOBAL_STRING(lp_remote_announce, &Globals.szRemoteAnnounce)
-FN_GLOBAL_STRING(lp_remote_browse_sync, &Globals.szRemoteBrowseSync)
-FN_GLOBAL_LIST(lp_wins_server_list, &Globals.szWINSservers)
-FN_GLOBAL_LIST(lp_interfaces, &Globals.szInterfaces)
-FN_GLOBAL_STRING(lp_socket_address, &Globals.szSocketAddress)
-FN_GLOBAL_LIST(lp_netbios_aliases, &Globals.szNetbiosAliases)
-FN_GLOBAL_LIST(lp_preload_modules, &Globals.szPreloadModules)
-FN_GLOBAL_STRING(lp_panic_action, &Globals.szPanicAction)
-FN_GLOBAL_STRING(lp_adduser_script, &Globals.szAddUserScript)
-
-FN_GLOBAL_CONST_STRING(lp_guestaccount, &Globals.szGuestaccount)
-
-FN_GLOBAL_STRING(lp_addmachine_script, &Globals.szAddMachineScript)
-
-FN_GLOBAL_STRING(lp_wins_hook, &Globals.szWINSHook)
-FN_GLOBAL_STRING(lp_wins_partners, &Globals.szWINSPartners)
-FN_GLOBAL_STRING(lp_template_homedir, &Globals.szTemplateHomedir)
-FN_GLOBAL_STRING(lp_template_shell, &Globals.szTemplateShell)
-FN_GLOBAL_CONST_STRING(lp_winbind_separator, &Globals.szWinbindSeparator)
-FN_GLOBAL_BOOL(lp_winbind_enum_users, &Globals.bWinbindEnumUsers)
-FN_GLOBAL_BOOL(lp_winbind_enum_groups, &Globals.bWinbindEnumGroups)
-FN_GLOBAL_BOOL(lp_winbind_use_default_domain, &Globals.bWinbindUseDefaultDomain)
-FN_GLOBAL_STRING(lp_idmap_backend, &Globals.szIDMapBackend)
-
-FN_GLOBAL_BOOL(lp_disable_netbios, &Globals.bDisableNetbios)
-FN_GLOBAL_BOOL(lp_dns_proxy, &Globals.bDNSproxy)
-FN_GLOBAL_BOOL(lp_wins_support, &Globals.bWINSsupport)
-FN_GLOBAL_BOOL(lp_we_are_a_wins_server, &Globals.bWINSsupport)
-FN_GLOBAL_BOOL(lp_wins_proxy, &Globals.bWINSproxy)
-FN_GLOBAL_BOOL(lp_local_master, &Globals.bLocalMaster)
-FN_GLOBAL_BOOL(lp_domain_logons, &Globals.bDomainLogons)
-FN_GLOBAL_BOOL(lp_load_printers, &Globals.bLoadPrinters)
-FN_GLOBAL_BOOL(lp_readraw, &Globals.bReadRaw)
-FN_GLOBAL_BOOL(lp_large_readwrite, &Globals.bLargeReadwrite)
-FN_GLOBAL_BOOL(lp_writeraw, &Globals.bWriteRaw)
-FN_GLOBAL_BOOL(lp_null_passwords, &Globals.bNullPasswords)
-FN_GLOBAL_BOOL(lp_obey_pam_restrictions, &Globals.bObeyPamRestrictions)
-FN_GLOBAL_BOOL(lp_encrypted_passwords, &Globals.bEncryptPasswords)
-static FN_GLOBAL_BOOL(lp_time_server, &Globals.bTimeServer)
-FN_GLOBAL_BOOL(lp_bind_interfaces_only, &Globals.bBindInterfacesOnly)
-FN_GLOBAL_BOOL(lp_pam_password_change, &Globals.bPamPasswordChange)
-FN_GLOBAL_BOOL(lp_unicode, &Globals.bUnicode)
-FN_GLOBAL_BOOL(lp_nt_status_support, &Globals.bNTStatusSupport)
-FN_GLOBAL_BOOL(lp_allow_trusted_domains, &Globals.bAllowTrustedDomains)
-FN_GLOBAL_INTEGER(lp_restrict_anonymous, &Globals.restrict_anonymous)
-FN_GLOBAL_BOOL(lp_lanman_auth, &Globals.bLanmanAuth)
-FN_GLOBAL_BOOL(lp_ntlm_auth, &Globals.bNTLMAuth)
-FN_GLOBAL_BOOL(lp_client_lanman_auth, &Globals.bClientLanManAuth)
-FN_GLOBAL_BOOL(lp_client_ntlmv2_auth, &Globals.bClientNTLMv2Auth)
-FN_GLOBAL_BOOL(lp_host_msdfs, &Globals.bHostMSDfs)
-FN_GLOBAL_BOOL(lp_enhanced_browsing, &Globals.enhanced_browsing)
-FN_GLOBAL_BOOL(lp_use_mmap, &Globals.bUseMmap)
-FN_GLOBAL_BOOL(lp_unix_extensions, &Globals.bUnixExtensions)
-FN_GLOBAL_BOOL(lp_use_spnego, &Globals.bUseSpnego)
-FN_GLOBAL_BOOL(lp_hostname_lookups, &Globals.bHostnameLookups)
-FN_GLOBAL_BOOL(lp_rpc_big_endian, &Globals.bRpcBigEndian)
-FN_GLOBAL_INTEGER(lp_os_level, &Globals.os_level)
-FN_GLOBAL_INTEGER(lp_max_ttl, &Globals.max_ttl)
-FN_GLOBAL_INTEGER(lp_max_wins_ttl, &Globals.max_wins_ttl)
-FN_GLOBAL_INTEGER(lp_min_wins_ttl, &Globals.min_wins_ttl)
-FN_GLOBAL_INTEGER(lp_time_offset, &Globals.time_offset)
-FN_GLOBAL_INTEGER(lp_maxmux, &Globals.max_mux)
-FN_GLOBAL_INTEGER(lp_max_xmit, &Globals.max_xmit)
-FN_GLOBAL_INTEGER(lp_passwordlevel, &Globals.pwordlevel)
-FN_GLOBAL_INTEGER(lp_usernamelevel, &Globals.unamelevel)
-FN_GLOBAL_INTEGER(lp_maxprotocol, &Globals.maxprotocol)
-FN_GLOBAL_INTEGER(lp_minprotocol, &Globals.minprotocol)
-FN_GLOBAL_INTEGER(lp_security, &Globals.security)
-FN_GLOBAL_LIST(lp_auth_methods, &Globals.AuthMethods)
-FN_GLOBAL_BOOL(lp_paranoid_server_security, &Globals.paranoid_server_security)
-FN_GLOBAL_INTEGER(lp_lpqcachetime, &Globals.lpqcachetime)
-FN_GLOBAL_INTEGER(lp_disable_spoolss, &Globals.bDisableSpoolss)
-static FN_GLOBAL_INTEGER(lp_announce_as, &Globals.announce_as)
-FN_GLOBAL_INTEGER(lp_lm_announce, &Globals.lm_announce)
-FN_GLOBAL_INTEGER(lp_lm_interval, &Globals.lm_interval)
-FN_GLOBAL_INTEGER(lp_machine_password_timeout, &Globals.machine_password_timeout)
-FN_GLOBAL_INTEGER(lp_lock_spin_count, &Globals.iLockSpinCount)
-FN_GLOBAL_INTEGER(lp_lock_sleep_time, &Globals.iLockSpinTime)
-FN_LOCAL_STRING(lp_servicename, szService)
-FN_LOCAL_CONST_STRING(lp_const_servicename, szService)
-FN_LOCAL_STRING(lp_pathname, szPath)
-FN_LOCAL_STRING(lp_username, szUsername)
-FN_LOCAL_LIST(lp_invalid_users, szInvalidUsers)
-FN_LOCAL_LIST(lp_valid_users, szValidUsers)
-FN_LOCAL_LIST(lp_admin_users, szAdminUsers)
-FN_LOCAL_STRING(lp_printcommand, szPrintcommand)
-FN_LOCAL_STRING(lp_lpqcommand, szLpqcommand)
-FN_LOCAL_STRING(lp_lprmcommand, szLprmcommand)
-FN_LOCAL_STRING(lp_lppausecommand, szLppausecommand)
-FN_LOCAL_STRING(lp_lpresumecommand, szLpresumecommand)
-FN_LOCAL_STRING(lp_queuepausecommand, szQueuepausecommand)
-FN_LOCAL_STRING(lp_queueresumecommand, szQueueresumecommand)
+ int fn_name(struct loadparm_service *service) {return((service != NULL)? service->val : sDefault.val);}
+
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_server_role, &loadparm.Globals.server_role)
+_PUBLIC_ FN_GLOBAL_LIST(lp_smb_ports, &loadparm.Globals.smb_ports)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_nbt_port, &loadparm.Globals.nbt_port)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_dgram_port, &loadparm.Globals.dgram_port)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_cldap_port, &loadparm.Globals.cldap_port)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_krb5_port, &loadparm.Globals.krb5_port)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_kpasswd_port, &loadparm.Globals.kpasswd_port)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_web_port, &loadparm.Globals.web_port)
+_PUBLIC_ FN_GLOBAL_STRING(lp_dos_charset, &dos_charset)
+_PUBLIC_ FN_GLOBAL_STRING(lp_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)
 static FN_LOCAL_STRING(_lp_printername, szPrintername)
-FN_LOCAL_LIST(lp_hostsallow, szHostsallow)
-FN_LOCAL_LIST(lp_hostsdeny, szHostsdeny)
-FN_LOCAL_STRING(lp_comment, comment)
-FN_LOCAL_STRING(lp_fstype, fstype)
-FN_LOCAL_STRING(lp_msdfs_proxy, szMSDfsProxy)
+_PUBLIC_ FN_LOCAL_LIST(lp_hostsallow, szHostsallow)
+_PUBLIC_ FN_LOCAL_LIST(lp_hostsdeny, szHostsdeny)
+_PUBLIC_ FN_LOCAL_STRING(lp_comment, comment)
+_PUBLIC_ FN_LOCAL_STRING(lp_fstype, fstype)
 static FN_LOCAL_STRING(lp_volume, volume)
-FN_LOCAL_LIST(lp_ntvfs_handler, ntvfs_handler)
-FN_LOCAL_BOOL(lp_msdfs_root, bMSDfsRoot)
-FN_LOCAL_BOOL(lp_autoloaded, autoloaded)
-FN_LOCAL_BOOL(lp_browseable, bBrowseable)
-FN_LOCAL_BOOL(lp_readonly, bRead_only)
-FN_LOCAL_BOOL(lp_guest_ok, bGuest_ok)
-FN_LOCAL_BOOL(lp_guest_only, bGuest_only)
-FN_LOCAL_BOOL(lp_print_ok, bPrint_ok)
-FN_LOCAL_BOOL(lp_map_hidden, bMap_hidden)
-FN_LOCAL_BOOL(lp_map_archive, bMap_archive)
-FN_LOCAL_BOOL(lp_locking, bLocking)
-FN_LOCAL_BOOL(lp_strict_locking, bStrictLocking)
-FN_LOCAL_BOOL(lp_posix_locking, bPosixLocking)
-FN_LOCAL_BOOL(lp_strict_sync, bStrictSync)
-FN_LOCAL_BOOL(lp_ci_filesystem, bCIFileSystem)
-FN_LOCAL_BOOL(lp_share_modes, bShareModes)
-FN_LOCAL_BOOL(lp_oplocks, bOpLocks)
-FN_LOCAL_BOOL(lp_level2_oplocks, bLevel2OpLocks)
-FN_LOCAL_BOOL(lp_onlyuser, bOnlyUser)
-FN_LOCAL_BOOL(lp_map_system, bMap_system)
-FN_LOCAL_INTEGER(lp_max_connections, iMaxConnections)
-FN_LOCAL_INTEGER(lp_minprintspace, iMinPrintSpace)
-FN_LOCAL_INTEGER(lp_printing, iPrinting)
-FN_LOCAL_INTEGER(lp_csc_policy, iCSCPolicy)
-FN_GLOBAL_INTEGER(lp_winbind_cache_time, &Globals.winbind_cache_time)
-FN_GLOBAL_BOOL(lp_hide_local_users, &Globals.bHideLocalUsers)
-FN_GLOBAL_INTEGER(lp_name_cache_timeout, &Globals.name_cache_timeout)
-FN_GLOBAL_INTEGER(lp_server_signing, &Globals.server_signing)
-FN_GLOBAL_INTEGER(lp_client_signing, &Globals.client_signing)
+_PUBLIC_ FN_LOCAL_LIST(lp_ntvfs_handler, ntvfs_handler)
+_PUBLIC_ FN_LOCAL_BOOL(lp_msdfs_root, bMSDfsRoot)
+_PUBLIC_ FN_LOCAL_BOOL(lp_browseable, bBrowseable)
+_PUBLIC_ FN_LOCAL_BOOL(lp_readonly, bRead_only)
+_PUBLIC_ FN_LOCAL_BOOL(lp_print_ok, bPrint_ok)
+_PUBLIC_ FN_LOCAL_BOOL(lp_map_hidden, bMap_hidden)
+_PUBLIC_ FN_LOCAL_BOOL(lp_map_archive, bMap_archive)
+_PUBLIC_ FN_LOCAL_BOOL(lp_strict_locking, bStrictLocking)
+_PUBLIC_ FN_LOCAL_BOOL(lp_strict_sync, bStrictSync)
+_PUBLIC_ FN_LOCAL_BOOL(lp_ci_filesystem, bCIFileSystem)
+_PUBLIC_ FN_LOCAL_BOOL(lp_map_system, bMap_system)
+_PUBLIC_ FN_LOCAL_INTEGER(lp_max_connections, iMaxConnections)
+_PUBLIC_ FN_LOCAL_INTEGER(lp_csc_policy, iCSCPolicy)
+_PUBLIC_ FN_LOCAL_INTEGER(lp_create_mask, iCreate_mask)
+_PUBLIC_ FN_LOCAL_INTEGER(lp_force_create_mode, iCreate_force_mode)
+_PUBLIC_ FN_LOCAL_INTEGER(lp_dir_mask, iDir_mask)
+_PUBLIC_ FN_LOCAL_INTEGER(lp_force_dir_mode, iDir_force_mode)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_server_signing, &loadparm.Globals.server_signing)
+_PUBLIC_ FN_GLOBAL_INTEGER(lp_client_signing, &loadparm.Globals.client_signing)
 
 /* local prototypes */
-
 static int map_parameter(const char *pszParmName);
-static BOOL set_boolean(BOOL *pb, const char *pszParmValue);
-static int getservicebyname(const char *pszServiceName,
-                           service * pserviceDest);
-static void copy_service(service * pserviceDest,
-                        service * pserviceSource, BOOL *pcopymapDest);
-static BOOL service_ok(int iService);
-static BOOL do_section(const char *pszSectionName);
-static void init_copymap(service * pservice);
+static struct loadparm_service *getservicebyname(struct loadparm_context *lp_ctx, 
+                                       const char *pszServiceName);
+static void copy_service(struct loadparm_service *pserviceDest,
+                        struct loadparm_service *pserviceSource, 
+                        int *pcopymapDest);
+static bool service_ok(struct loadparm_service *service);
+static bool do_section(const char *pszSectionName, void *);
+static void init_copymap(struct loadparm_service *pservice);
 
 /* This is a helper function for parametrical options support. */
 /* It returns a pointer to parametrical option value if it exists or NULL otherwise */
 /* Actual parametrical functions are quite simple */
-static const char *get_parametrics(int lookup_service, const char *type, const char *option)
+const char *lp_get_parametric(struct loadparm_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);
@@ -1360,16 +829,15 @@ static const char *get_parametrics(int lookup_service, const char *type, const c
                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;
                }
        }
 
@@ -1387,10 +855,10 @@ 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 atoi(s); 
+       return strtol(s, NULL, 0); 
 }
 
 /*******************************************************************
@@ -1401,27 +869,41 @@ 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);
+}
+
+/*******************************************************************
+convenience routine to return unsigned long parameters.
+********************************************************************/
+static double lp_double(const char *s)
+{
+
+       if (!s) {
+               DEBUG(0,("lp_double(%s): is called with NULL!\n",s));
+               return -1;
        }
 
-       return strtoul(s, NULL, 10);
+       return strtod(s, NULL);
 }
 
 /*******************************************************************
 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(&ret,s)) {
+       if (!set_boolean(s, &ret)) {
                DEBUG(0,("lp_bool(%s): value is not boolean!\n",s));
-               return False;
+               return false;
        }
 
        return ret;
@@ -1432,9 +914,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 loadparm_service *service, const char *type, 
+                          const char *option)
 {
-       const char *value = get_parametrics(lookup_service, type, option);
+       const char *value = lp_get_parametric(service, type, option);
 
        if (value)
                return lp_string(value);
@@ -1446,13 +929,15 @@ 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 loadparm_service *service, 
+                                const char *type, 
+                                const char *option, const char *separator)
 {
-       const char *value = get_parametrics(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;
 }
@@ -1460,9 +945,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 loadparm_service *service, const char *type, 
+               const char *option, int default_v)
 {
-       const char *value = get_parametrics(lookup_service, type, option);
+       const char *value = lp_get_parametric(service, type, option);
        
        if (value)
                return lp_int(value);
@@ -1470,12 +956,34 @@ int lp_parm_int(int lookup_service, const char *type, const char *option, int de
        return default_v;
 }
 
+/* Return parametric option from a given service. Type is a part of
+ * option before ':'.
+ * Parametric option has following syntax: 'Type: option = value'.
+ */
+
+int lp_parm_bytes(struct loadparm_service *service, const char *type, 
+                 const char *option, int default_v)
+{
+       uint64_t bval;
+
+       const char *value = lp_get_parametric(service, type, option);
+
+       if (value && conv_str_size(value, &bval)) {
+               if (bval <= INT_MAX) {
+                       return (int)bval;
+               }
+       }
+
+       return default_v;
+}
+
 /* Return parametric option from a given service. Type is a part of option before ':' */
 /* Parametric option has following syntax: 'Type: option = value' */
 
-unsigned long lp_parm_ulong(int lookup_service, const char *type, const char *option, unsigned long default_v)
+unsigned long lp_parm_ulong(struct loadparm_service *service, const char *type, 
+                           const char *option, unsigned long default_v)
 {
-       const char *value = get_parametrics(lookup_service, type, option);
+       const char *value = lp_get_parametric(service, type, option);
        
        if (value)
                return lp_ulong(value);
@@ -1483,12 +991,25 @@ unsigned long lp_parm_ulong(int lookup_service, const char *type, const char *op
        return default_v;
 }
 
+
+double lp_parm_double(struct loadparm_service *service, const char *type, 
+                     const char *option, double default_v)
+{
+       const char *value = lp_get_parametric(service, type, option);
+       
+       if (value)
+               return lp_double(value);
+
+       return default_v;
+}
+
 /* Return parametric option from a given service. Type is a part of option before ':' */
 /* Parametric option has following syntax: 'Type: option = value' */
 
-BOOL lp_parm_bool(int lookup_service, const char *type, const char *option, BOOL default_v)
+bool lp_parm_bool(struct loadparm_service *service, const char *type, 
+                 const char *option, bool default_v)
 {
-       const char *value = get_parametrics(lookup_service, type, option);
+       const char *value = lp_get_parametric(service, type, option);
        
        if (value)
                return lp_bool(value);
@@ -1501,58 +1022,12 @@ 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 loadparm_service *init_service(TALLOC_CTX *mem_ctx)
 {
-       memset((char *)pservice, '\0', sizeof(service));
+       struct loadparm_service *pservice = 
+               talloc_zero(mem_ctx, struct loadparm_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;
 }
 
 /***************************************************************************
@@ -1560,69 +1035,68 @@ static void free_service(service *pservice)
  service. 
 ***************************************************************************/
 
-static int add_a_service(const service *pservice, const char *name)
+static struct loadparm_service *add_a_service(struct loadparm_context *lp_ctx, 
+                                    const struct loadparm_service *pservice, 
+                                    const char *name)
 {
        int i;
-       service tservice;
-       int num_to_alloc = iNumServices + 1;
+       struct loadparm_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 loadparm_service *service = getservicebyname(lp_ctx, 
+                                                                   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 loadparm_service **tsp;
                
-               tsp = realloc_p(ServicePtrs, service *, num_to_alloc);
+               tsp = realloc_p(lp_ctx->ServicePtrs, struct loadparm_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);
+                       lp_ctx->ServicePtrs = tsp;
+                       lp_ctx->ServicePtrs[lp_ctx->iNumServices] = NULL;
                }
-               if (!ServicePtrs[iNumServices]) {
-                       DEBUG(0,("add_a_service: out of memory!\n"));
-                       return (-1);
-               }
-
-               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];
 }
 
 /***************************************************************************
@@ -1630,98 +1104,99 @@ 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 loadparm_service *default_service,
                 const char *user, const char *pszHomedir)
 {
-       int i;
+       struct loadparm_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 loadparm_service *lp_add_service(struct loadparm_context *lp_ctx, 
+                              const char *pszService, 
+                              struct loadparm_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, BOOL guest_ok)
+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 loadparm_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]->szUsername, "");
-       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]->bGuest_only = False;
-       ServicePtrs[i]->bGuest_ok = guest_ok;
-       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(lp_ctx, 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 loadparm_service *default_service)
 {
        const char *comment = "From Printcap";
-       int i = add_a_service(ServicePtrs[iDefaultService], pszPrintername);
+       struct loadparm_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 */
@@ -1729,23 +1204,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;
-       /* No share modes on printer services. */
-       ServicePtrs[i]->bShareModes = False;
-       /* No oplocks on printer services. */
-       ServicePtrs[i]->bOpLocks = 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));
 
-       update_server_announce_as_printserver();
-
-       return (True);
+       return true;
 }
 
 /***************************************************************************
@@ -1758,11 +1227,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)
@@ -1770,54 +1239,47 @@ 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;
 }
 
-/***************************************************************************
- Set a boolean variable from the text value stored in the passed string.
- Returns True in success, False if the passed string does not correctly 
- represent a boolean.
-***************************************************************************/
 
-static BOOL set_boolean(BOOL *pb, const char *pszParmValue)
+/*
+  return the parameter structure for a parameter
+*/
+struct parm_struct *lp_parm_struct(const char *name)
 {
-       BOOL bRetval;
+       int parmnum = map_parameter(name);
+       if (parmnum == -1) return NULL;
+       return &parm_table[parmnum];
+}
 
-       bRetval = True;
-       if (strwicmp(pszParmValue, "yes") == 0 ||
-           strwicmp(pszParmValue, "true") == 0 ||
-           strwicmp(pszParmValue, "1") == 0)
-               *pb = True;
-       else if (strwicmp(pszParmValue, "no") == 0 ||
-                   strwicmp(pszParmValue, "False") == 0 ||
-                   strwicmp(pszParmValue, "0") == 0)
-               *pb = False;
-       else {
-               DEBUG(0,
-                     ("ERROR: Badly formed boolean in configuration file: \"%s\".\n",
-                      pszParmValue));
-               bRetval = False;
-       }
-       return (bRetval);
+/*
+  return the parameter pointer for a parameter
+*/
+void *lp_parm_ptr(struct loadparm_service *service, struct parm_struct *parm)
+{
+       if (service == NULL)
+               return parm->ptr;
+
+       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 loadparm_service *getservicebyname(struct loadparm_context *lp_ctx, 
+                                       const char *pszServiceName)
 {
        int iService;
 
-       for (iService = iNumServices - 1; iService >= 0; iService--)
-               if (VALID(iService) &&
-                   strwicmp(ServicePtrs[iService]->szService, pszServiceName) == 0) {
-                       if (pserviceDest != NULL)
-                               copy_service(pserviceDest, ServicePtrs[iService], NULL);
-                       break;
+       for (iService = lp_ctx->iNumServices - 1; iService >= 0; iService--)
+               if (lp_ctx->ServicePtrs[iService] != NULL &&
+                   strwicmp(lp_ctx->ServicePtrs[iService]->szService, pszServiceName) == 0) {
+                       return lp_ctx->ServicePtrs[iService];
                }
 
-       return (iService);
+       return NULL;
 }
 
 /***************************************************************************
@@ -1825,12 +1287,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, BOOL *pcopymapDest)
+static void copy_service(struct loadparm_service *pserviceDest, 
+                        struct loadparm_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 &&
@@ -1845,27 +1309,24 @@ static void copy_service(service * pserviceDest, service * pserviceSource, BOOL
 
                        switch (parm_table[i].type) {
                                case P_BOOL:
-                               case P_BOOLREV:
-                                       *(BOOL *)dest_ptr = *(BOOL *)src_ptr;
+                                       *(int *)dest_ptr = *(int *)src_ptr;
                                        break;
 
                                case P_INTEGER:
-                               case P_ENUM:
                                case P_OCTAL:
+                               case P_ENUM:
                                        *(int *)dest_ptr = *(int *)src_ptr;
                                        break;
 
-                               case P_CHAR:
-                                       *(char *)dest_ptr = *(char *)src_ptr;
-                                       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;
@@ -1883,28 +1344,31 @@ static void copy_service(service * pserviceDest, service * pserviceSource, BOOL
                if (pserviceSource->copymap)
                        memcpy((void *)pserviceDest->copymap,
                               (void *)pserviceSource->copymap,
-                              sizeof(BOOL) * NUMPARAMETERS);
+                              sizeof(int) * NUMPARAMETERS);
        }
        
        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 = smb_xmalloc_p(struct param_opt);
-                       paramo->key = strdup(data->key);
-                       paramo->value = strdup(data->value);
+                       paramo = talloc(pserviceDest, struct param_opt);
+                       if (paramo == NULL)
+                               smb_panic("OOM");
+                       paramo->key = talloc_reference(paramo, data->key);
+                       paramo->value = talloc_reference(paramo, data->value);
                        DLIST_ADD(pserviceDest->param_opt, paramo);
                }
                data = data->next;
@@ -1916,54 +1380,48 @@ 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 loadparm_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;
-                       update_server_announce_as_printserver();
+                              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 {
-       struct file_lists *next;
-       char *name;
-       char *subfname;
-       time_t modtime;
-} *file_lists = NULL;
 
 /*******************************************************************
  Keep a linked list of all config files so we know when one has changed 
  it's date and needs to be reloaded.
 ********************************************************************/
 
-static void add_to_file_list(const char *fname, const char *subfname)
+static void add_to_file_list(struct loadparm_context *lp_ctx, 
+                            const char *fname, const char *subfname)
 {
-       struct file_lists *f = file_lists;
+       struct file_lists *f = lp_ctx->file_lists;
 
        while (f) {
                if (f->name && !strcmp(f->name, fname))
@@ -1972,21 +1430,21 @@ 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->next = lp_ctx->file_lists;
+               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;
+               lp_ctx->file_lists = f;
                f->modtime = file_modtime(subfname);
        } else {
                time_t t = file_modtime(subfname);
@@ -1999,17 +1457,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(struct loadparm_context *lp_ctx)
 {
-       struct file_lists *f = file_lists;
+       struct file_lists *f;
        DEBUG(6, ("lp_file_list_changed()\n"));
 
-       while (f) {
-               pstring n2;
+       for (f = lp_ctx->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)));
@@ -2017,301 +1474,298 @@ 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(struct loadparm_context *lp_ctx, 
+                          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);
+       add_to_file_list(lp_ctx, 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));
+               return pm_process(fname, do_section, do_parameter, lp_ctx);
 
        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(struct loadparm_context *lp_ctx, 
+                       const char *pszParmValue, char **ptr)
 {
-       BOOL bRetval;
-       int iTemp;
-       service serviceTemp;
+       bool bRetval;
+       struct loadparm_service *serviceTemp;
 
-       string_set(ptr, pszParmValue);
+       string_set(talloc_autofree_context(), ptr, pszParmValue);
 
-       init_service(&serviceTemp);
-
-       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(lp_ctx, pszParmValue)) != NULL) {
+               if (serviceTemp == lp_ctx->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(lp_ctx->currentService,
+                                    serviceTemp,
+                                    lp_ctx->currentService->copymap);
+                       bRetval = true;
                }
        } else {
-               DEBUG(0, ("Unable to copy service - source not found: %s\n", pszParmValue));
-               bRetval = False;
+               DEBUG(0, ("Unable to copy service - source not found: %s\n", 
+                         pszParmValue));
+               bRetval = false;
        }
 
-       free_service(&serviceTemp);
-       return (bRetval);
+       return bRetval;
 }
 
 /***************************************************************************
- Handle winbind/non unix account uid and gid allocation parameters.  The format of these
- parameters is:
-
- [global]
-
-        winbind uid = 1000-1999
-        winbind gid = 700-899
-
- We only do simple parsing checks here.  The strings are parsed into useful
- structures in the winbind daemon code.
-
+ Initialise a copymap.
 ***************************************************************************/
 
-/* Some lp_ routines to return winbind [ug]id information */
-
-static uid_t winbind_uid_low, winbind_uid_high;
-static gid_t winbind_gid_low, winbind_gid_high;
-static uint32_t non_unix_account_low, non_unix_account_high;
-
-BOOL lp_winbind_uid(uid_t *low, uid_t *high)
-{
-        if (winbind_uid_low == 0 || winbind_uid_high == 0)
-                return False;
-
-        if (low)
-                *low = winbind_uid_low;
-
-        if (high)
-                *high = winbind_uid_high;
-
-        return True;
-}
-
-BOOL lp_winbind_gid(gid_t *low, gid_t *high)
+static void init_copymap(struct loadparm_service *pservice)
 {
-        if (winbind_gid_low == 0 || winbind_gid_high == 0)
-                return False;
-
-        if (low)
-                *low = winbind_gid_low;
-
-        if (high)
-                *high = winbind_gid_high;
-
-        return True;
+       int i;
+       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));
+               return;
+       }
+       for (i = 0; i < NUMPARAMETERS; i++)
+               pservice->copymap[i] = true;
 }
 
-BOOL lp_non_unix_account_range(uint32_t *low, uint32_t *high)
+/***************************************************************************
+ Process a parametric option
+***************************************************************************/
+static bool lp_do_parameter_parametric(struct loadparm_service *service, 
+                                      const char *pszParmName, 
+                                      const char *pszParmValue, int flags)
 {
-        if (non_unix_account_low == 0 || non_unix_account_high == 0)
-                return False;
-
-        if (low)
-                *low = non_unix_account_low;
-
-        if (high)
-                *high = non_unix_account_high;
+       struct param_opt *paramo, *data;
+       char *name;
+       TALLOC_CTX *mem_ctx;
 
-        return True;
-}
+       while (isspace((unsigned char)*pszParmName)) {
+               pszParmName++;
+       }
 
-/* Do some simple checks on "winbind [ug]id" parameter values */
+       name = strdup(pszParmName);
+       if (!name) return false;
 
-static BOOL handle_winbind_uid(const char *pszParmValue, char **ptr)
-{
-       uint32_t low, high;
+       strlower(name);
 
-       if (sscanf(pszParmValue, "%u-%u", &low, &high) != 2 || high < low)
-               return False;
+       if (service == NULL) {
+               data = loadparm.Globals.param_opt;
+               mem_ctx = talloc_autofree_context();
+       } else {
+               data = service->param_opt;
+               mem_ctx = service;
+       }
 
-       /* Parse OK */
+       /* Traverse destination */
+       for (paramo=data; paramo; paramo=paramo->next) {
+               /* If we already have the option set, override it unless
+                  it was a command line option and the new one isn't */
+               if (strcmp(paramo->key, name) == 0) {
+                       if ((paramo->flags & FLAG_CMDLINE) &&
+                           !(flags & FLAG_CMDLINE)) {
+                               return true;
+                       }
 
-       string_set(ptr, pszParmValue);
+                       talloc_free(paramo->value);
+                       paramo->value = talloc_strdup(paramo, pszParmValue);
+                       paramo->flags = flags;
+                       free(name);
+                       return true;
+               }
+       }
 
-        winbind_uid_low = low;
-        winbind_uid_high = high;
+       paramo = talloc(mem_ctx, struct param_opt);
+       if (!paramo)
+               smb_panic("OOM");
+       paramo->key = talloc_strdup(paramo, name);
+       paramo->value = talloc_strdup(paramo, pszParmValue);
+       paramo->flags = flags;
+       if (service == NULL) {
+               DLIST_ADD(loadparm.Globals.param_opt, paramo);
+       } else {
+               DLIST_ADD(service->param_opt, paramo);
+       }
 
-       return True;
+       free(name);
+       
+       return true;
 }
 
-static BOOL handle_winbind_gid(const char *pszParmValue, char **ptr)
+static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr, 
+                        const char *pszParmName, const char *pszParmValue,
+                        struct loadparm_context *lp_ctx)
 {
-       uint32_t low, high;
-
-       if (sscanf(pszParmValue, "%u-%u", &low, &high) != 2 || high < low)
-               return False;
-
-       /* Parse OK */
-
-       string_set(ptr, pszParmValue);
-
-        winbind_gid_low = low;
-        winbind_gid_high = high;
-
-       return True;
-}
-
-/***************************************************************************
- Do some simple checks on "non unix account range" parameter values.
-***************************************************************************/
-
-static BOOL handle_non_unix_account_range(const char *pszParmValue, char **ptr)
-{
-       uint32_t low, high;
+       int i;
+       /* if it is a special case then go ahead */
+       if (parm_table[parmnum].special) {
+               parm_table[parmnum].special(lp_ctx, pszParmValue, 
+                                           (char **)parm_ptr);
+               return true;
+       }
 
-       if (sscanf(pszParmValue, "%u-%u", &low, &high) != 2 || high < low)
-               return False;
+       /* now switch on the type of variable it is */
+       switch (parm_table[parmnum].type)
+       {
+               case P_BOOL: {
+                       bool b;
+                       if (!set_boolean(pszParmValue, &b)) {
+                               DEBUG(0,("lp_do_parameter(%s): value is not boolean!\n", pszParmValue));
+                               return false;
+                       }
+                       *(int *)parm_ptr = b;
+                       }
+                       break;
 
-       /* Parse OK */
+               case P_INTEGER:
+                       *(int *)parm_ptr = atoi(pszParmValue);
+                       break;
 
-       string_set(ptr, pszParmValue);
+               case P_OCTAL:
+                       *(int *)parm_ptr = strtol(pszParmValue, NULL, 8);
+                       break;
 
-        non_unix_account_low = low;
-        non_unix_account_high = high;
+               case P_BYTES:
+               {
+                       uint64_t val;
+                       if (conv_str_size(pszParmValue, &val)) {
+                               if (val <= INT_MAX) {
+                                       *(int *)parm_ptr = (int)val;
+                                       break;
+                               }
+                       }
 
-       return True;
-}
+                       DEBUG(0,("lp_do_parameter(%s): value is not "
+                           "a valid size specifier!\n", pszParmValue));
+                       return false;
+               }
 
+               case P_LIST:
+                       *(const char ***)parm_ptr = str_list_make(mem_ctx, 
+                                                                 pszParmValue, NULL);
+                       break;
 
-/***************************************************************************
- Initialise a copymap.
-***************************************************************************/
+               case P_STRING:
+                       string_set(mem_ctx, (char **)parm_ptr, pszParmValue);
+                       break;
 
-static void init_copymap(service * pservice)
-{
-       int i;
-       SAFE_FREE(pservice->copymap);
-       pservice->copymap = malloc_array_p(BOOL, NUMPARAMETERS);
-       if (!pservice->copymap)
-               DEBUG(0,
-                     ("Couldn't allocate copymap!! (size %d)\n",
-                      (int)NUMPARAMETERS));
-       else
-               for (i = 0; i < NUMPARAMETERS; i++)
-                       pservice->copymap[i] = True;
-}
+               case P_USTRING:
+                       string_set(mem_ctx, (char **)parm_ptr, pszParmValue);
+                       strupper(*(char **)parm_ptr);
+                       break;
 
-/***************************************************************************
- Return the local pointer to a parameter given the service number and the 
- pointer into the default structure.
-***************************************************************************/
+               case P_ENUM:
+                       for (i = 0; parm_table[parmnum].enum_list[i].name; i++) {
+                               if (strequal
+                                   (pszParmValue,
+                                    parm_table[parmnum].enum_list[i].name)) {
+                                       *(int *)parm_ptr =
+                                               parm_table[parmnum].
+                                               enum_list[i].value;
+                                       break;
+                               }
+                       }
+                       if (!parm_table[parmnum].enum_list[i].name) {
+                               DEBUG(0,("Unknown enumerated value '%s' for '%s'\n", 
+                                        pszParmValue, pszParmName));
+                               return false;
+                       }
+                       break;
+               case P_SEP:
+                       break;
+       }
 
-void *lp_local_ptr(int snum, void *ptr)
-{
-       return (void *)(((char *)ServicePtrs[snum]) + PTR_DIFF(ptr, &sDefault));
+       if (parm_table[parmnum].flags & FLAG_DEFAULT) {
+               parm_table[parmnum].flags &= ~FLAG_DEFAULT;
+               /* we have to also unset FLAG_DEFAULT on aliases */
+               for (i=parmnum-1;i>=0 && parm_table[i].ptr == parm_table[parmnum].ptr;i--) {
+                       parm_table[i].flags &= ~FLAG_DEFAULT;
+               }
+               for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].ptr == parm_table[parmnum].ptr;i++) {
+                       parm_table[i].flags &= ~FLAG_DEFAULT;
+               }
+       }
+       return true;
 }
 
 
-/***************************************************************************
- Process a parametric option
-***************************************************************************/
-static BOOL lp_do_parameter_parametric(int snum, const char *pszParmName, const char *pszParmValue, int flags)
+bool lp_do_global_parameter(struct loadparm_context *lp_ctx, 
+                           const char *pszParmName, const char *pszParmValue)
 {
-       struct param_opt *paramo, *data;
-       char *name;
+       int parmnum = map_parameter(pszParmName);
+       void *parm_ptr;
 
-       while (isspace(*pszParmName)) {
-               pszParmName++;
+       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;
        }
 
-       name = strdup(pszParmName);
-       if (!name) return False;
-
-       strlower(name);
-
-       if (snum < 0) {
-               data = Globals.param_opt;
-       } else {
-               data = ServicePtrs[snum]->param_opt;
+       if (parm_table[parmnum].flags & FLAG_DEPRECATED) {
+               DEBUG(1, ("WARNING: The \"%s\" option is deprecated\n",
+                         pszParmName));
        }
 
-       /* Traverse destination */
-       for (paramo=data; paramo; paramo=paramo->next) {
-               /* If we already have the option set, override it unless
-                  it was a command line option and the new one isn't */
-               if (strcmp(paramo->key, name) == 0) {
-                       if ((paramo->flags & FLAG_CMDLINE) &&
-                           !(flags & FLAG_CMDLINE)) {
-                               return True;
-                       }
-
-                       free(paramo->value);
-                       paramo->value = strdup(pszParmValue);
-                       paramo->flags = flags;
-                       free(name);
-                       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;
        }
 
-       paramo = smb_xmalloc_p(struct param_opt);
-       paramo->key = strdup(name);
-       paramo->value = strdup(pszParmValue);
-       paramo->flags = flags;
-       if (snum < 0) {
-               DLIST_ADD(Globals.param_opt, paramo);
-       } else {
-               DLIST_ADD(ServicePtrs[snum]->param_opt, paramo);
-       }
+       parm_ptr = parm_table[parmnum].ptr;
 
-       free(name);
-       
-       return True;
+       return set_variable(talloc_autofree_context(), parmnum, parm_ptr, 
+                           pszParmName, pszParmValue, lp_ctx);
 }
 
-/***************************************************************************
- 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)
+bool lp_do_service_parameter(struct loadparm_context *lp_ctx, 
+                            struct loadparm_service *service, 
+                            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);
+       void *parm_ptr;
+       int i;
+       int parmnum = map_parameter(pszParmName);
 
        if (parmnum < 0) {
                if (strchr(pszParmName, ':')) {
-                       return lp_do_parameter_parametric(snum, pszParmName, pszParmValue, 0);
+                       return lp_do_parameter_parametric(service, pszParmName, pszParmValue, 0);
                }
                DEBUG(0, ("Ignoring unknown parameter \"%s\"\n", pszParmName));
-               return (True);
+               return true;
        }
 
        if (parm_table[parmnum].flags & FLAG_DEPRECATED) {
@@ -2322,133 +1776,64 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
        /* 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;
+               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;
-       }
-
-       /* if it is a special case then go ahead */
-       if (parm_table[parmnum].special) {
-               parm_table[parmnum].special(pszParmValue, (char **)parm_ptr);
-               return (True);
+       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);
 
-       /* now switch on the type of variable it is */
-       switch (parm_table[parmnum].type)
-       {
-               case P_BOOL:
-                       set_boolean(parm_ptr, pszParmValue);
-                       break;
-
-               case P_BOOLREV:
-                       set_boolean(parm_ptr, pszParmValue);
-                       *(BOOL *)parm_ptr = !*(BOOL *)parm_ptr;
-                       break;
-
-               case P_INTEGER:
-                       *(int *)parm_ptr = atoi(pszParmValue);
-                       break;
-
-               case P_CHAR:
-                       *(char *)parm_ptr = *pszParmValue;
-                       break;
-
-               case P_OCTAL:
-                       sscanf(pszParmValue, "%o", (int *)parm_ptr);
-                       break;
-
-               case P_LIST:
-                       *(const char ***)parm_ptr = str_list_make(talloc_autofree_context(), 
-                                                                 pszParmValue, NULL);
-                       break;
+       if (!service->copymap)
+               init_copymap(service);
 
-               case P_STRING:
-                       string_set(parm_ptr, pszParmValue);
-                       break;
-
-               case P_USTRING:
-                       string_set(parm_ptr, pszParmValue);
-                       strupper(*(char **)parm_ptr);
-                       break;
-
-               case P_ENUM:
-                       for (i = 0; parm_table[parmnum].enum_list[i].name; i++) {
-                               if (strequal
-                                   (pszParmValue,
-                                    parm_table[parmnum].enum_list[i].name)) {
-                                       *(int *)parm_ptr =
-                                               parm_table[parmnum].
-                                               enum_list[i].value;
-                                       break;
-                               }
-                       }
-                       if (!parm_table[parmnum].enum_list[i].name) {
-                               DEBUG(0,("Unknown enumerated value '%s' for '%s'\n", 
-                                        pszParmValue, pszParmName));
-                               return False;
-                       }
-                       break;
-               case P_SEP:
-                       break;
-       }
+       /* 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 (True);
+       return set_variable(service, parmnum, parm_ptr, pszParmName, 
+                           pszParmValue, lp_ctx);
 }
 
 /***************************************************************************
  Process a parameter.
 ***************************************************************************/
 
-static BOOL do_parameter(const char *pszParmName, const char *pszParmValue)
+static bool do_parameter(const char *pszParmName, const char *pszParmValue, 
+                        void *userdata)
 {
-       if (!bInGlobalSection && bGlobalOnly)
-               return (True);
+       struct loadparm_context *lp_ctx = (struct loadparm_context *)userdata;
 
-       return (lp_do_parameter(bInGlobalSection ? -2 : iServiceIndex,
-                               pszParmName, pszParmValue));
+       if (lp_ctx->bInGlobalSection) 
+               return lp_do_global_parameter(lp_ctx, pszParmName, 
+                                             pszParmValue);
+       else 
+               return lp_do_service_parameter(lp_ctx, lp_ctx->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);
+       ret = lp_do_global_parameter(lp_ctx, pszParmName, s);
        talloc_free(s);
        return ret;
 }
@@ -2459,29 +1844,29 @@ 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;
 
-       while (isspace(*pszParmValue)) pszParmValue++;
+       while (isspace((unsigned char)*pszParmValue)) 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_global_parameter(&loadparm, pszParmName, pszParmValue)) {
+               return false;
        }
 
        parm_table[parmnum].flags |= FLAG_CMDLINE;
@@ -2494,26 +1879,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;
@@ -2546,27 +1931,16 @@ static void print_parameter(struct parm_struct *p, void *ptr, FILE * f)
                        break;
 
                case P_BOOL:
-                       fprintf(f, "%s", BOOLSTR(*(BOOL *)ptr));
-                       break;
-
-               case P_BOOLREV:
-                       fprintf(f, "%s", BOOLSTR(!*(BOOL *)ptr));
+                       fprintf(f, "%s", BOOLSTR((bool)*(int *)ptr));
                        break;
 
                case P_INTEGER:
+               case P_BYTES:
                        fprintf(f, "%d", *(int *)ptr);
                        break;
 
-               case P_CHAR:
-                       fprintf(f, "%c", *(char *)ptr);
-                       break;
-
                case P_OCTAL:
-                       if (*(int *)ptr == -1) {
-                               fprintf(f, "-1");
-                       } else {
-                               fprintf(f, "0%o", *(int *)ptr);
-                       }
+                       fprintf(f, "0%o", *(int *)ptr);
                        break;
 
                case P_LIST:
@@ -2594,21 +1968,18 @@ 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:
-               case P_BOOLREV:
-                       return (*((BOOL *)ptr1) == *((BOOL *)ptr2));
+                       return (*((int *)ptr1) == *((int *)ptr2));
 
                case P_INTEGER:
-               case P_ENUM:
                case P_OCTAL:
+               case P_BYTES:
+               case P_ENUM:
                        return (*((int *)ptr1) == *((int *)ptr2));
 
-               case P_CHAR:
-                       return (*((char *)ptr1) == *((char *)ptr2));
-               
                case P_LIST:
                        return str_list_equal((const char **)(*(char ***)ptr1), 
                                              (const char **)(*(char ***)ptr2));
@@ -2626,7 +1997,7 @@ static BOOL equal_parameter(parm_type type, void *ptr1, void *ptr2)
                case P_SEP:
                        break;
        }
-       return (False);
+       return false;
 }
 
 /***************************************************************************
@@ -2635,30 +2006,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)
+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 (!bInGlobalSection && bGlobalOnly)
-               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) {
@@ -2666,14 +2035,15 @@ static BOOL do_section(const char *pszSectionName)
                /* 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;
 }
 
 
@@ -2681,10 +2051,10 @@ static BOOL do_section(const char *pszSectionName)
  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, 
@@ -2694,28 +2064,25 @@ static BOOL is_default(int i)
                        return strequal(parm_table[i].def.svalue,
                                        *(char **)parm_table[i].ptr);
                case P_BOOL:
-               case P_BOOLREV:
                        return parm_table[i].def.bvalue ==
-                               *(BOOL *)parm_table[i].ptr;
-               case P_CHAR:
-                       return parm_table[i].def.cvalue ==
-                               *(char *)parm_table[i].ptr;
+                               *(int *)parm_table[i].ptr;
                case P_INTEGER:
                case P_OCTAL:
+               case P_BYTES:
                case P_ENUM:
                        return parm_table[i].def.ivalue ==
                                *(int *)parm_table[i].ptr;
                case P_SEP:
                        break;
        }
-       return False;
+       return false;
 }
 
 /***************************************************************************
 Display the contents of the global structure.
 ***************************************************************************/
 
-static void dump_globals(FILE *f)
+static void dump_globals(FILE *f, bool show_defaults)
 {
        int i;
        struct param_opt *data;
@@ -2726,17 +2093,16 @@ static void dump_globals(FILE *f)
                if (parm_table[i].class == P_GLOBAL &&
                    parm_table[i].ptr &&
                    (i == 0 || (parm_table[i].ptr != parm_table[i - 1].ptr))) {
-                       if (defaults_saved && is_default(i))
+                       if (!show_defaults && (parm_table[i].flags & FLAG_DEFAULT)) 
                                continue;
                        fprintf(f, "\t%s = ", parm_table[i].label);
                        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;
                }
         }
 
@@ -2746,7 +2112,7 @@ static void dump_globals(FILE *f)
  Display the contents of a single services record.
 ***************************************************************************/
 
-static void dump_a_service(service * pService, FILE * f)
+static void dump_a_service(struct loadparm_service * pService, FILE * f)
 {
        int i;
        struct param_opt *data;
@@ -2779,14 +2145,34 @@ 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)
+{
+       struct loadparm_service * pService = loadparm.ServicePtrs[snum];
+       struct parm_struct *parm;
+       void *ptr;
+       
+       parm = lp_parm_struct(parm_name);
+       if (!parm) {
+               return false;
+       }
+       
+       if (isGlobal)
+               ptr = parm->ptr;
+       else
+               ptr = ((char *)pService) +
+                       PTR_DIFF(parm->ptr, &sDefault);
+       
+       print_parameter(parm,
+                       ptr, f);
+       fprintf(f, "\n");
+       return true;
+}
 
 /***************************************************************************
  Return info about the next service  in a service. snum==-1 gives the globals.
@@ -2813,7 +2199,7 @@ struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters)
                        return &parm_table[(*i)++];
                }
        } else {
-               service *pService = ServicePtrs[snum];
+               struct loadparm_service *pService = loadparm.ServicePtrs[snum];
 
                for (; parm_table[*i].label; (*i)++) {
                        if (parm_table[*i].class == P_SEPARATOR)
@@ -2847,192 +2233,203 @@ 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)
-{
-       return (LP_SNUM_OK(iService) && 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;
 }
 
-/***************************************************************************
- Auto-load one printer.
-***************************************************************************/
-
-void lp_add_one_printer(char *name, char *comment)
-{
-       int printers = lp_servicenumber(PRINTERS_NAME);
-       int i;
-
-       if (lp_servicenumber(name) < 0) {
-               lp_add_printer(name, printers);
-               if ((i = lp_servicenumber(name)) >= 0) {
-                       string_set(&ServicePtrs[i]->comment, comment);
-                       ServicePtrs[i]->autoloaded = True;
-               }
-       }
-}
-
-/***************************************************************************
- Announce ourselves as a print server.
-***************************************************************************/
-
-void update_server_announce_as_printserver(void)
-{
-       default_server_announce |= SV_TYPE_PRINTQ_SERVER;       
-}
-
 /***************************************************************************
  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++) {
-               if (!VALID(i))
+       for (i = 0; i < loadparm.iNumServices; i++) {
+               if (loadparm.ServicePtrs[i] == NULL)
                        continue;
 
                if (!snumused || !snumused(smb, i)) {
-                       ServicePtrs[i]->valid = False;
-                       free_service(ServicePtrs[i]);
+                       talloc_free(loadparm.ServicePtrs[i]);
+                       loadparm.ServicePtrs[i] = NULL;
                }
        }
 }
 
 /***************************************************************************
Unload a service.
Initialise the global parameter structure.
 ***************************************************************************/
-
-void lp_killservice(int iServiceIn)
+bool loadparm_init(struct loadparm_context *lp_ctx)
 {
-       if (VALID(iServiceIn)) {
-               ServicePtrs[iServiceIn]->valid = False;
-               free_service(ServicePtrs[iServiceIn]);
-       }
-}
+       int i;
+       char *myname;
 
-/***************************************************************************
- Save the curent values of all global and sDefault parameters into the 
- defaults union. This allows swat and testparm to show only the
- changed (ie. non-default) parameters.
-***************************************************************************/
+       DEBUG(3, ("Initialising global parameters\n"));
 
-static void lp_save_defaults(void)
-{
-       int i;
        for (i = 0; parm_table[i].label; i++) {
-               if (i > 0 && parm_table[i].ptr == parm_table[i - 1].ptr)
-                       continue;
-               switch (parm_table[i].type) {
-                       case P_LIST:
-                               parm_table[i].def.lvalue = str_list_copy(talloc_autofree_context(), 
-                                                                        *(const char ***)parm_table[i].ptr);
-                               break;
-                       case P_STRING:
-                       case P_USTRING:
-                               if (parm_table[i].ptr) {
-                                       parm_table[i].def.svalue = strdup(*(char **)parm_table[i].ptr);
-                               } else {
-                                       parm_table[i].def.svalue = NULL;
-                               }
-                               break;
-                       case P_BOOL:
-                       case P_BOOLREV:
-                               parm_table[i].def.bvalue =
-                                       *(BOOL *)parm_table[i].ptr;
-                               break;
-                       case P_CHAR:
-                               parm_table[i].def.cvalue =
-                                       *(char *)parm_table[i].ptr;
-                               break;
-                       case P_INTEGER:
-                       case P_OCTAL:
-                       case P_ENUM:
-                               parm_table[i].def.ivalue =
-                                       *(int *)parm_table[i].ptr;
-                               break;
-                       case P_SEP:
-                               break;
+               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, "");
                }
        }
-       defaults_saved = True;
-}
 
-/*******************************************************************
- Set the server type we will announce as via nmbd.
-********************************************************************/
+       lp_do_global_parameter(lp_ctx, "config file", dyn_CONFIGFILE);
 
-static void set_server_role(void)
-{
-       server_role = ROLE_STANDALONE;
+       lp_do_global_parameter(lp_ctx, "share backend", "classic");
+       
+       lp_do_global_parameter(lp_ctx, "server role", "standalone");
 
-       switch (lp_security()) {
-               case SEC_SHARE:
-                       if (lp_domain_logons())
-                               DEBUG(0, ("Server's Role (logon server) conflicts with share-level security\n"));
-                       break;
-               case SEC_SERVER:
-               case SEC_DOMAIN:
-               case SEC_ADS:
-                       if (lp_domain_logons()) {
-                               if (Globals.bDomainMaster) /* auto or yes */ 
-                                       server_role = ROLE_DOMAIN_PDC;
-                               else
-                                       server_role = ROLE_DOMAIN_BDC;
-                               break;
-                       }
-                       server_role = ROLE_DOMAIN_MEMBER;
-                       break;
-               case SEC_USER:
-                       if (lp_domain_logons()) {
+       /* 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");
 
-                               if (Globals.bDomainMaster) /* auto or yes */ 
-                                       server_role = ROLE_DOMAIN_PDC;
-                               else
-                                       server_role = ROLE_DOMAIN_BDC;
-                       }
-                       break;
-               default:
-                       DEBUG(0, ("Server's Role undefined due to unknown security mode\n"));
-                       break;
-       }
+       /* 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");
 
-       DEBUG(10, ("set_server_role: role = "));
-
-       switch(server_role) {
-       case ROLE_STANDALONE:
-               DEBUGADD(10, ("ROLE_STANDALONE\n"));
-               break;
-       case ROLE_DOMAIN_MEMBER:
-               DEBUGADD(10, ("ROLE_DOMAIN_MEMBER\n"));
-               break;
-       case ROLE_DOMAIN_BDC:
-               DEBUGADD(10, ("ROLE_DOMAIN_BDC\n"));
-               break;
-       case ROLE_DOMAIN_PDC:
-               DEBUGADD(10, ("ROLE_DOMAIN_PDC\n"));
-               break;
+       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;
 }
 
 /***************************************************************************
@@ -3040,129 +2437,115 @@ static void set_server_role(void)
  False on failure.
 ***************************************************************************/
 
-BOOL lp_load(const char *pszFname, BOOL global_only, BOOL save_defaults,
-            BOOL add_ipc)
+bool lp_load(void)
 {
-       pstring n2;
-       BOOL bRetval;
+       char *n2;
+       bool bRetval;
        struct param_opt *data;
+       struct loadparm_context *lp_ctx = &loadparm;
 
-       pstrcpy(n2, pszFname);
-       standard_sub_basic(n2,sizeof(n2));
-
-       add_to_file_list(pszFname, n2);
+       bRetval = false;
 
-       bRetval = False;
-
-       DEBUG(2, ("lp_load: refreshing parameters from %s\n", pszFname));
-       
-       bInGlobalSection = True;
-       bGlobalOnly = global_only;
-
-       if (Globals.param_opt != NULL) {
+       if (lp_ctx->Globals.param_opt != NULL) {
                struct param_opt *next;
-               for (data=Globals.param_opt; data; data=next) {
+               for (data = lp_ctx->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(lp_ctx->Globals.param_opt, data);
+                       talloc_free(data);
                }
        }
-       
-       init_globals();
 
-       if (save_defaults)
-       {
-               lp_save_defaults();
-       }
+       if (!loadparm_init(lp_ctx))
+               return false;
+       
+       lp_ctx->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_ctx, 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);
+       lp_ctx->currentService = NULL;
+       bRetval = pm_process(n2, do_section, do_parameter, lp_ctx);
 
        /* finish up the last section */
        DEBUG(4, ("pm_process() returned %s\n", BOOLSTR(bRetval)));
        if (bRetval)
-               if (iServiceIndex >= 0)
-                       bRetval = service_ok(iServiceIndex);
+               if (lp_ctx->currentService != NULL)
+                       bRetval = service_ok(lp_ctx->currentService);
 
-       lp_add_auto_services(lp_auto_services());
+       lp_add_auto_services(lp_ctx, lp_auto_services());
 
-       if (add_ipc) {
-               /* When 'restrict anonymous = 2' guest connections to ipc$
-                  are denied */
-               lp_add_hidden("IPC$", "IPC", (lp_restrict_anonymous() < 2));
-               lp_add_hidden("ADMIN$", "DISK", False);
-       }
+       lp_add_hidden(lp_ctx, "IPC$", "IPC");
+       lp_add_hidden(lp_ctx, "ADMIN$", "DISK");
 
-       set_server_role();
-       set_default_server_announce_type();
+       bLoaded = true;
 
-       bLoaded = True;
-
-       /* Now we check bWINSsupport and set szWINSserver to 127.0.0.1 */
-       /* if bWINSsupport is true and we are in the client            */
-       if (in_client && Globals.bWINSsupport) {
-               lp_do_parameter(-1, "wins server", "127.0.0.1");
+       if (!lp_ctx->Globals.szWINSservers && lp_ctx->Globals.bWINSsupport) {
+               lp_do_global_parameter(lp_ctx, "wins server", "127.0.0.1");
        }
 
        init_iconv();
 
-       return (bRetval);
-}
-
-/***************************************************************************
- Reset the max number of services.
-***************************************************************************/
-
-void lp_resetnumservices(void)
-{
-       iNumServices = 0;
+       return bRetval;
 }
 
 /***************************************************************************
  Return the max number of services.
 ***************************************************************************/
 
-int lp_numservices(void)
+int lp_numservices(struct loadparm_context *lp_ctx)
 {
-       return (iNumServices);
+       return lp_ctx->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, 
+            struct loadparm_context *lp_ctx)
 {
        int iService;
 
        if (show_defaults)
-               defaults_saved = False;
+               defaults_saved = false;
 
-       dump_globals(f);
+       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, lp_ctx->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 loadparm_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 loadparm_service *lp_servicebynum(int snum)
+{
+       return loadparm.ServicePtrs[snum];
+}
+
+struct loadparm_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
@@ -3173,17 +2556,18 @@ 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 (loadparm.ServicePtrs[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;
                }
@@ -3192,144 +2576,35 @@ int lp_servicenumber(const char *pszServiceName)
        if (iService < 0)
                DEBUG(7,("lp_servicenumber: couldn't find %s\n", pszServiceName));
 
-       return (iService);
+       return iService;
 }
 
 /*******************************************************************
  A useful volume label function. 
 ********************************************************************/
-const char *volume_label(int snum)
+const char *volume_label(struct loadparm_service *service)
 {
-       const char *ret = lp_volume(snum);
+       const char *ret = lp_volume(service);
        if (!*ret)
-               return lp_servicename(snum);
-       return (ret);
-}
-
-
-/*******************************************************************
- Set the server type we will announce as via nmbd.
-********************************************************************/
-
-static void set_default_server_announce_type(void)
-{
-       default_server_announce = 0;
-       default_server_announce |= SV_TYPE_WORKSTATION;
-       default_server_announce |= SV_TYPE_SERVER;
-       default_server_announce |= SV_TYPE_SERVER_UNIX;
-
-       switch (lp_announce_as()) {
-               case ANNOUNCE_AS_NT_SERVER:
-                       default_server_announce |= SV_TYPE_SERVER_NT;
-                       /* fall through... */
-               case ANNOUNCE_AS_NT_WORKSTATION:
-                       default_server_announce |= SV_TYPE_NT;
-                       break;
-               case ANNOUNCE_AS_WIN95:
-                       default_server_announce |= SV_TYPE_WIN95_PLUS;
-                       break;
-               case ANNOUNCE_AS_WFW:
-                       default_server_announce |= SV_TYPE_WFW;
-                       break;
-               default:
-                       break;
-       }
-
-       switch (lp_server_role()) {
-               case ROLE_DOMAIN_MEMBER:
-                       default_server_announce |= SV_TYPE_DOMAIN_MEMBER;
-                       break;
-               case ROLE_DOMAIN_PDC:
-                       default_server_announce |= SV_TYPE_DOMAIN_CTRL;
-                       break;
-               case ROLE_DOMAIN_BDC:
-                       default_server_announce |= SV_TYPE_DOMAIN_BAKCTRL;
-                       break;
-               case ROLE_STANDALONE:
-               default:
-                       break;
-       }
-       if (lp_time_server())
-               default_server_announce |= SV_TYPE_TIME_SOURCE;
-
-       if (lp_host_msdfs())
-               default_server_announce |= SV_TYPE_DFS_SERVER;
-
-       /* TODO: only announce us as print server when we are a print server */
-       default_server_announce |= SV_TYPE_PRINTQ_SERVER;
+               return lp_servicename(service);
+       return ret;
 }
 
-/***********************************************************
- returns role of Samba server
-************************************************************/
-
-int lp_server_role(void)
-{
-       return server_role;
-}
 
 /***********************************************************
  If we are PDC then prefer us as DMB
 ************************************************************/
 
-BOOL lp_domain_master(void)
-{
-       if (Globals.bDomainMaster == Auto)
-               return (lp_server_role() == ROLE_DOMAIN_PDC);
-
-       return Globals.bDomainMaster;
-}
-
-/***********************************************************
- If we are DMB then prefer us as LMB
-************************************************************/
-
-BOOL lp_preferred_master(void)
-{
-       if (Globals.bPreferredMaster == Auto)
-               return (lp_local_master() && lp_domain_master());
-
-       return Globals.bPreferredMaster;
-}
-
-/*******************************************************************
- Remove a service.
-********************************************************************/
-
-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);
-       if (snum >= 0) {
-               snum = lp_servicenumber(new_name);
-               if (snum >= 0)
-                       lp_do_parameter(snum, "copy", oldname);
-       }
-}
-
-
-/*******************************************************************
- Get the default server type we will announce as via nmbd.
-********************************************************************/
-int lp_default_server_announce(void)
+bool lp_domain_logons(void)
 {
-       return default_server_announce;
+       return (lp_server_role() == ROLE_DOMAIN_CONTROLLER);
 }
 
-const char *lp_printername(int snum)
+const char *lp_printername(struct loadparm_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;
 }
@@ -3339,9 +2614,9 @@ const char *lp_printername(int snum)
  Return the max print jobs per queue.
 ********************************************************************/
 
-int lp_maxprintjobs(int snum)
+int lp_maxprintjobs(struct loadparm_service *service)
 {
-       int maxjobs = LP_SNUM_OK(snum) ? ServicePtrs[snum]->iMaxPrintJobs : sDefault.iMaxPrintJobs;
+       int maxjobs = (service != NULL) ? service->iMaxPrintJobs : sDefault.iMaxPrintJobs;
        if (maxjobs <= 0 || maxjobs >= PRINT_MAX_JOBID)
                maxjobs = PRINT_MAX_JOBID - 1;