s3-param Remove lp_set_passdb_backend()
[samba.git] / source3 / param / loadparm.c
index 2ee5988336b090357443ffae42a0242c888ae34a..4f8dd425d96553e0a7887e9c33c2b3a1785c55f0 100644 (file)
@@ -10,6 +10,8 @@
    Copyright (C) Stefan (metze) Metzmacher 2002
    Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2003
    Copyright (C) Michael Adam 2008
+   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007
+   Copyright (C) Andrew Bartlett 2011
 
    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
@@ -57,6 +59,7 @@
 #include "printing.h"
 #include "lib/smbconf/smbconf.h"
 #include "lib/smbconf/smbconf_init.h"
+#include "lib/param/loadparm.h"
 
 #include "ads.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include <cups/http.h>
 #endif
 
-bool bLoaded = False;
+bool bLoaded = false;
 
 extern userdom_struct current_user_info;
 
-#ifndef GLOBAL_NAME
-#define GLOBAL_NAME "global"
-#endif
-
-#ifndef PRINTERS_NAME
-#define PRINTERS_NAME "printers"
-#endif
-
-#ifndef HOMES_NAME
-#define HOMES_NAME "homes"
-#endif
-
 /* the special value for the include parameter
  * to be interpreted not as a file name but to
  * trigger loading of the global smb.conf options
@@ -97,7 +88,7 @@ extern userdom_struct current_user_info;
 #define INCLUDE_REGISTRY_NAME "registry"
 #endif
 
-static bool in_client = False;         /* Not in the client by default */
+static bool in_client = false;         /* Not in the client by default */
 static struct smbconf_csn conf_last_csn;
 
 #define CONFIG_BACKEND_FILE 0
@@ -112,7 +103,7 @@ static int config_backend = CONFIG_BACKEND_FILE;
 #define USERSHARE_VALID 1
 #define USERSHARE_PENDING_DELETE 2
 
-static bool defaults_saved = False;
+static bool defaults_saved = false;
 
 struct param_opt_struct {
        struct param_opt_struct *prev, *next;
@@ -122,601 +113,223 @@ struct param_opt_struct {
        unsigned flags;
 };
 
-/*
- * This structure describes global (ie., server-wide) parameters.
- */
-struct global {
-       int ConfigBackend;
-       char *smb_ports;
-       char *dos_charset;
-       char *unix_charset;
-       char *display_charset;
-       char *szPrintcapname;
-       char *szAddPortCommand;
-       char *szEnumPortsCommand;
-       char *szAddPrinterCommand;
-       char *szDeletePrinterCommand;
-       char *szOs2DriverMap;
-       char *szLockDir;
-       char *szStateDir;
-       char *szCacheDir;
-       char *szPidDir;
-       char *szRootdir;
-       char *szDefaultService;
-       char *szGetQuota;
-       char *szSetQuota;
-       char *szMsgCommand;
-       char *szServerString;
-       char *szAutoServices;
-       char *szPasswdProgram;
-       char *szPasswdChat;
-       char *szLogFile;
-       char *szConfigFile;
-       char *szSMBPasswdFile;
-       char *szPrivateDir;
-       char *szPassdbBackend;
-       char **szPreloadModules;
-       char *szPasswordServer;
-       char *szSocketOptions;
-       char *szRealm;
-       char *szAfsUsernameMap;
-       int iAfsTokenLifetime;
-       char *szLogNtTokenCommand;
-       char *szUsernameMap;
-       char *szLogonScript;
-       char *szLogonPath;
-       char *szLogonDrive;
-       char *szLogonHome;
-       char **szWINSservers;
-       char **szInterfaces;
-       char *szRemoteAnnounce;
-       char *szRemoteBrowseSync;
-       char *szSocketAddress;
-       bool bNmbdBindExplicitBroadcast;
-       char *szNISHomeMapName;
-       char *szAnnounceVersion;        /* This is initialised in init_globals */
-       char *szWorkgroup;
-       char *szNetbiosName;
-       char **szNetbiosAliases;
-       char *szNetbiosScope;
-       char *szNameResolveOrder;
-       char *szPanicAction;
-       char *szAddUserScript;
-       char *szRenameUserScript;
-       char *szDelUserScript;
-       char *szAddGroupScript;
-       char *szDelGroupScript;
-       char *szAddUserToGroupScript;
-       char *szDelUserFromGroupScript;
-       char *szSetPrimaryGroupScript;
-       char *szAddMachineScript;
-       char *szShutdownScript;
-       char *szAbortShutdownScript;
-       char *szUsernameMapScript;
-       int iUsernameMapCacheTime;
-       char *szCheckPasswordScript;
-       char *szWINSHook;
-       char *szUtmpDir;
-       char *szWtmpDir;
-       bool bUtmp;
-       char *szIdmapUID;
-       char *szIdmapGID;
-       bool bPassdbExpandExplicit;
-       int AlgorithmicRidBase;
-       char *szTemplateHomedir;
-       char *szTemplateShell;
-       char *szWinbindSeparator;
-       bool bWinbindEnumUsers;
-       bool bWinbindEnumGroups;
-       bool bWinbindUseDefaultDomain;
-       bool bWinbindTrustedDomainsOnly;
-       bool bWinbindNestedGroups;
-       int  winbind_expand_groups;
-       bool bWinbindRefreshTickets;
-       bool bWinbindOfflineLogon;
-       bool bWinbindNormalizeNames;
-       bool bWinbindRpcOnly;
-       bool bCreateKrb5Conf;
-       int winbindMaxDomainConnections;
-       char *szIdmapBackend;
-       bool bIdmapReadOnly;
-       char *szAddShareCommand;
-       char *szChangeShareCommand;
-       char *szDeleteShareCommand;
-       char **szEventLogs;
-       char *szGuestaccount;
-       char *szManglingMethod;
-       char **szServicesList;
-       char *szUsersharePath;
-       char *szUsershareTemplateShare;
-       char **szUsersharePrefixAllowList;
-       char **szUsersharePrefixDenyList;
-       int mangle_prefix;
-       int max_log_size;
-       char *szLogLevel;
-       int max_xmit;
-       int max_mux;
-       int max_open_files;
-       int open_files_db_hash_size;
-       int pwordlevel;
-       int unamelevel;
-       int deadtime;
-       bool getwd_cache;
-       int maxprotocol;
-       int minprotocol;
-       int security;
-       char **AuthMethods;
-       bool paranoid_server_security;
-       int maxdisksize;
-       int lpqcachetime;
-       int iMaxSmbdProcesses;
-       bool bDisableSpoolss;
-       int syslog;
-       int os_level;
-       bool enhanced_browsing;
-       int max_ttl;
-       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 map_to_guest;
-       int oplock_break_wait_time;
-       int winbind_cache_time;
-       int winbind_reconnect_delay;
-       int winbind_max_clients;
-       char **szWinbindNssInfo;
-       int iLockSpinTime;
-       char *szLdapMachineSuffix;
-       char *szLdapUserSuffix;
-       char *szLdapIdmapSuffix;
-       char *szLdapGroupSuffix;
-       int ldap_ssl;
-       bool ldap_ssl_ads;
-       int ldap_deref;
-       int ldap_follow_referral;
-       char *szLdapSuffix;
-       char *szLdapAdminDn;
-       int ldap_debug_level;
-       int ldap_debug_threshold;
-       int iAclCompat;
-       char *szCupsServer;
-       int CupsEncrypt;
-       char *szIPrintServer;
-       char *ctdbdSocket;
-       char **szClusterAddresses;
-       bool clustering;
-       int ctdb_timeout;
-       int ctdb_locktime_warn_threshold;
-       int ldap_passwd_sync;
-       int ldap_replication_sleep;
-       int ldap_timeout; /* This is initialised in init_globals */
-       int ldap_connection_timeout;
-       int ldap_page_size;
-       bool ldap_delete_dn;
-       bool bMsAddPrinterWizard;
-       bool bDNSproxy;
-       bool bWINSsupport;
-       bool bWINSproxy;
-       bool bLocalMaster;
-       int  iPreferredMaster;
-       int iDomainMaster;
-       bool bDomainLogons;
-       char **szInitLogonDelayedHosts;
-       int InitLogonDelay;
-       bool bEncryptPasswords;
-       bool bUpdateEncrypt;
-       int  clientSchannel;
-       int  serverSchannel;
-       bool bNullPasswords;
-       bool bObeyPamRestrictions;
-       bool bLoadPrinters;
-       int PrintcapCacheTime;
-       bool bLargeReadwrite;
-       bool bReadRaw;
-       bool bWriteRaw;
-       bool bSyslogOnly;
-       bool bBrowseList;
-       bool bNISHomeMap;
-       bool bTimeServer;
-       bool bBindInterfacesOnly;
-       bool bPamPasswordChange;
-       bool bUnixPasswdSync;
-       bool bPasswdChatDebug;
-       int iPasswdChatTimeout;
-       bool bTimestampLogs;
-       bool bNTSmbSupport;
-       bool bNTPipeSupport;
-       bool bNTStatusSupport;
-       bool bStatCache;
-       int iMaxStatCacheSize;
-       bool bKernelOplocks;
-       bool bAllowTrustedDomains;
-       bool bLanmanAuth;
-       bool bNTLMAuth;
-       bool bUseSpnego;
-       bool bClientLanManAuth;
-       bool bClientNTLMv2Auth;
-       bool bClientPlaintextAuth;
-       bool bClientUseSpnego;
-       bool client_use_spnego_principal;
-       bool send_spnego_principal;
-       bool bDebugPrefixTimestamp;
-       bool bDebugHiresTimestamp;
-       bool bDebugPid;
-       bool bDebugUid;
-       bool bDebugClass;
-       bool bEnableCoreFiles;
-       bool bHostMSDfs;
-       bool bUseMmap;
-       bool bHostnameLookups;
-       bool bUnixExtensions;
-       bool bDisableNetbios;
-       char * szDedicatedKeytabFile;
-       int  iKerberosMethod;
-       bool bDeferSharingViolations;
-       bool bEnablePrivileges;
-       bool bASUSupport;
-       bool bUsershareOwnerOnly;
-       bool bUsershareAllowGuests;
-       bool bRegistryShares;
-       int restrict_anonymous;
-       int name_cache_timeout;
-       int client_signing;
-       int server_signing;
-       int client_ldap_sasl_wrapping;
-       int iUsershareMaxShares;
-       int iIdmapCacheTime;
-       int iIdmapNegativeCacheTime;
-       bool bResetOnZeroVC;
-       bool bLogWriteableFilesOnExit;
-       int iKeepalive;
-       int iminreceivefile;
-       struct param_opt_struct *param_opt;
-       int cups_connection_timeout;
-       char *szSMBPerfcountModule;
-       bool bMapUntrustedToDomain;
-       bool bAsyncSMBEchoHandler;
-       bool bMulticastDnsRegister;
-       int ismb2_max_read;
-       int ismb2_max_write;
-       int ismb2_max_trans;
+#define LOADPARM_EXTRA_GLOBALS \
+       struct param_opt_struct *param_opt; \
+       char *szRealm;                                                  \
+       char *szLogLevel;                                               \
+       int iminreceivefile;                                            \
+       char *szPrintcapname;                                           \
+       int CupsEncrypt;                                                \
+       int  iPreferredMaster;                                          \
+       int iDomainMaster;                                              \
+       char *szLdapMachineSuffix;                                      \
+       char *szLdapUserSuffix;                                         \
+       char *szLdapIdmapSuffix;                                        \
+       char *szLdapGroupSuffix;                                        \
+       char *szStateDir;                                               \
+       char *szCacheDir;                                               \
+       char *szSocketAddress;                                          \
+       char *szUsershareTemplateShare;                                 \
+       char *szIdmapUID;                                               \
+       char *szIdmapGID;                                               \
+       int winbindMaxDomainConnections;                                \
        int ismb2_max_credits;
-       char *ncalrpc_dir;
-};
-
-static struct global Globals;
-
-/*
- * This structure describes a single service.
- */
-struct service {
-       bool valid;
-       bool autoloaded;
-       int usershare;
-       struct timespec usershare_last_mod;
-       char *szService;
-       char *szPath;
-       char *szUsername;
-       char **szInvalidUsers;
-       char **szValidUsers;
-       char **szAdminUsers;
-       char *szCopy;
-       char *szInclude;
-       char *szPreExec;
-       char *szPostExec;
-       char *szRootPreExec;
-       char *szRootPostExec;
-       char *szCupsOptions;
-       char *szPrintcommand;
-       char *szLpqcommand;
-       char *szLprmcommand;
-       char *szLppausecommand;
-       char *szLpresumecommand;
-       char *szQueuepausecommand;
-       char *szQueueresumecommand;
-       char *szPrintername;
-       char *szPrintjobUsername;
-       char *szDontdescend;
-       char **szHostsallow;
-       char **szHostsdeny;
-       char *szMagicScript;
-       char *szMagicOutput;
-       char *szVetoFiles;
-       char *szHideFiles;
-       char *szVetoOplockFiles;
-       char *comment;
-       char *force_user;
-       char *force_group;
-       char **readlist;
-       char **writelist;
-       char **printer_admin;
-       char *volume;
-       char *fstype;
-       char **szVfsObjects;
-       char *szMSDfsProxy;
-       char *szAioWriteBehind;
-       char *szDfree;
-       int iMinPrintSpace;
-       int iMaxPrintJobs;
-       int iMaxReportedPrintJobs;
-       int iWriteCacheSize;
-       int iCreate_mask;
-       int iCreate_force_mode;
-       int iSecurity_mask;
-       int iSecurity_force_mode;
-       int iDir_mask;
-       int iDir_force_mode;
-       int iDir_Security_mask;
-       int iDir_Security_force_mode;
-       int iMaxConnections;
-       int iDefaultCase;
-       int iPrinting;
-       int iOplockContentionLimit;
-       int iCSCPolicy;
-       int iBlock_size;
-       int iDfreeCacheTime;
-       bool bPreexecClose;
-       bool bRootpreexecClose;
-       int  iCaseSensitive;
-       bool bCasePreserve;
-       bool bShortCasePreserve;
-       bool bHideDotFiles;
-       bool bHideSpecialFiles;
-       bool bHideUnReadable;
-       bool bHideUnWriteableFiles;
-       bool bBrowseable;
-       bool bAccessBasedShareEnum;
-       bool bAvailable;
-       bool bRead_only;
-       bool bNo_set_dir;
-       bool bGuest_only;
-       bool bAdministrative_share;
-       bool bGuest_ok;
-       bool bPrint_ok;
-       bool bPrintNotifyBackchannel;
-       bool bMap_system;
-       bool bMap_hidden;
-       bool bMap_archive;
-       bool bStoreDosAttributes;
-       bool bDmapiSupport;
-       bool bLocking;
-       int iStrictLocking;
-       bool bPosixLocking;
-       bool bShareModes;
-       bool bOpLocks;
-       bool bLevel2OpLocks;
-       bool bOnlyUser;
-       bool bMangledNames;
-       bool bWidelinks;
-       bool bSymlinks;
-       bool bSyncAlways;
-       bool bStrictAllocate;
-       bool bStrictSync;
-       char magic_char;
-       struct bitmap *copymap;
-       bool bDeleteReadonly;
-       bool bFakeOplocks;
-       bool bDeleteVetoFiles;
-       bool bDosFilemode;
-       bool bDosFiletimes;
-       bool bDosFiletimeResolution;
-       bool bFakeDirCreateTimes;
-       bool bBlockingLocks;
-       bool bInheritPerms;
-       bool bInheritACLS;
-       bool bInheritOwner;
-       bool bMSDfsRoot;
-       bool bUseClientDriver;
-       bool bDefaultDevmode;
-       bool bForcePrintername;
-       bool bNTAclSupport;
-       bool bForceUnknownAclUser;
-       bool bUseSendfile;
-       bool bProfileAcls;
-       bool bMap_acl_inherit;
-       bool bAfs_Share;
-       bool bEASupport;
-       bool bAclCheckPermissions;
-       bool bAclMapFullControl;
-       bool bAclGroupControl;
-       bool bChangeNotify;
-       bool bKernelChangeNotify;
-       int iallocation_roundup_size;
-       int iAioReadSize;
-       int iAioWriteSize;
-       int iMap_readonly;
-       int iDirectoryNameCacheSize;
-       int ismb_encrypt;
-       struct param_opt_struct *param_opt;
-
+#define LOADPARM_EXTRA_LOCALS                                          \
+       bool valid;                                                     \
+       int usershare;                                                  \
+       struct timespec usershare_last_mod;                             \
+       int iMaxPrintJobs;                                              \
+       char *szCopy;                                                   \
+       char *szInclude;                                                \
+       bool bAvailable;                                                \
+       bool bWidelinks;                                                \
+       struct param_opt_struct *param_opt;                             \
+       struct bitmap *copymap;                                         \
        char dummy[3];          /* for alignment */
-};
 
+#include "param/param_global.h"
+#include "param/param_local.h"
+
+static struct loadparm_global Globals;
 
 /* This is a default service used to prime a services structure */
-static struct service sDefault = {
-       True,                   /* valid */
-       False,                  /* not autoloaded */
-       0,                      /* not a usershare */
-       {0, },                  /* No last mod time */
-       NULL,                   /* szService */
-       NULL,                   /* szPath */
-       NULL,                   /* szUsername */
-       NULL,                   /* szInvalidUsers */
-       NULL,                   /* szValidUsers */
-       NULL,                   /* szAdminUsers */
-       NULL,                   /* szCopy */
-       NULL,                   /* szInclude */
-       NULL,                   /* szPreExec */
-       NULL,                   /* szPostExec */
-       NULL,                   /* szRootPreExec */
-       NULL,                   /* szRootPostExec */
-       NULL,                   /* szCupsOptions */
-       NULL,                   /* szPrintcommand */
-       NULL,                   /* szLpqcommand */
-       NULL,                   /* szLprmcommand */
-       NULL,                   /* szLppausecommand */
-       NULL,                   /* szLpresumecommand */
-       NULL,                   /* szQueuepausecommand */
-       NULL,                   /* szQueueresumecommand */
-       NULL,                   /* szPrintername */
-       NULL,                   /* szPrintjobUsername */
-       NULL,                   /* szDontdescend */
-       NULL,                   /* szHostsallow */
-       NULL,                   /* szHostsdeny */
-       NULL,                   /* szMagicScript */
-       NULL,                   /* szMagicOutput */
-       NULL,                   /* szVetoFiles */
-       NULL,                   /* szHideFiles */
-       NULL,                   /* szVetoOplockFiles */
-       NULL,                   /* comment */
-       NULL,                   /* force user */
-       NULL,                   /* force group */
-       NULL,                   /* readlist */
-       NULL,                   /* writelist */
-       NULL,                   /* printer admin */
-       NULL,                   /* volume */
-       NULL,                   /* fstype */
-       NULL,                   /* vfs objects */
-       NULL,                   /* szMSDfsProxy */
-       NULL,                   /* szAioWriteBehind */
-       NULL,                   /* szDfree */
-       0,                      /* iMinPrintSpace */
-       1000,                   /* iMaxPrintJobs */
-       0,                      /* iMaxReportedPrintJobs */
-       0,                      /* iWriteCacheSize */
-       0744,                   /* iCreate_mask */
-       0000,                   /* iCreate_force_mode */
-       0777,                   /* iSecurity_mask */
-       0,                      /* iSecurity_force_mode */
-       0755,                   /* iDir_mask */
-       0000,                   /* iDir_force_mode */
-       0777,                   /* iDir_Security_mask */
-       0,                      /* iDir_Security_force_mode */
-       0,                      /* iMaxConnections */
-       CASE_LOWER,             /* iDefaultCase */
-       DEFAULT_PRINTING,       /* iPrinting */
-       2,                      /* iOplockContentionLimit */
-       0,                      /* iCSCPolicy */
-       1024,                   /* iBlock_size */
-       0,                      /* iDfreeCacheTime */
-       False,                  /* bPreexecClose */
-       False,                  /* bRootpreexecClose */
-       Auto,                   /* case sensitive */
-       True,                   /* case preserve */
-       True,                   /* short case preserve */
-       True,                   /* bHideDotFiles */
-       False,                  /* bHideSpecialFiles */
-       False,                  /* bHideUnReadable */
-       False,                  /* bHideUnWriteableFiles */
-       True,                   /* bBrowseable */
-       False,                  /* bAccessBasedShareEnum */
-       True,                   /* bAvailable */
-       True,                   /* bRead_only */
-       True,                   /* bNo_set_dir */
-       False,                  /* bGuest_only */
-       False,                  /* bAdministrative_share */
-       False,                  /* bGuest_ok */
-       False,                  /* bPrint_ok */
-       True,                   /* bPrintNotifyBackchannel */
-       False,                  /* bMap_system */
-       False,                  /* bMap_hidden */
-       True,                   /* bMap_archive */
-       False,                  /* bStoreDosAttributes */
-       False,                  /* bDmapiSupport */
-       True,                   /* bLocking */
-       Auto,                   /* iStrictLocking */
-       True,                   /* bPosixLocking */
-       True,                   /* bShareModes */
-       True,                   /* bOpLocks */
-       True,                   /* bLevel2OpLocks */
-       False,                  /* bOnlyUser */
-       True,                   /* bMangledNames */
-       false,                  /* bWidelinks */
-       True,                   /* bSymlinks */
-       False,                  /* bSyncAlways */
-       False,                  /* bStrictAllocate */
-       False,                  /* bStrictSync */
-       '~',                    /* magic char */
-       NULL,                   /* copymap */
-       False,                  /* bDeleteReadonly */
-       False,                  /* bFakeOplocks */
-       False,                  /* bDeleteVetoFiles */
-       False,                  /* bDosFilemode */
-       True,                   /* bDosFiletimes */
-       False,                  /* bDosFiletimeResolution */
-       False,                  /* bFakeDirCreateTimes */
-       True,                   /* bBlockingLocks */
-       False,                  /* bInheritPerms */
-       False,                  /* bInheritACLS */
-       False,                  /* bInheritOwner */
-       False,                  /* bMSDfsRoot */
-       False,                  /* bUseClientDriver */
-       True,                   /* bDefaultDevmode */
-       False,                  /* bForcePrintername */
-       True,                   /* bNTAclSupport */
-       False,                  /* bForceUnknownAclUser */
-       False,                  /* bUseSendfile */
-       False,                  /* bProfileAcls */
-       False,                  /* bMap_acl_inherit */
-       False,                  /* bAfs_Share */
-       False,                  /* bEASupport */
-       True,                   /* bAclCheckPermissions */
-       True,                   /* bAclMapFullControl */
-       False,                  /* bAclGroupControl */
-       True,                   /* bChangeNotify */
-       True,                   /* bKernelChangeNotify */
-       SMB_ROUNDUP_ALLOCATION_SIZE,            /* iallocation_roundup_size */
-       0,                      /* iAioReadSize */
-       0,                      /* iAioWriteSize */
-       MAP_READONLY_YES,       /* iMap_readonly */
+static struct loadparm_service sDefault =
+{
+       .valid = true,
+       .autoloaded = false,
+       .usershare = 0,
+       .usershare_last_mod = {0, 0},
+       .szService = NULL,
+       .szPath = NULL,
+       .szUsername = NULL,
+       .szInvalidUsers = NULL,
+       .szValidUsers = NULL,
+       .szAdminUsers = NULL,
+       .szCopy = NULL,
+       .szInclude = NULL,
+       .szPreExec = NULL,
+       .szPostExec = NULL,
+       .szRootPreExec = NULL,
+       .szRootPostExec = NULL,
+       .szCupsOptions = NULL,
+       .szPrintcommand = NULL,
+       .szLpqcommand = NULL,
+       .szLprmcommand = NULL,
+       .szLppausecommand = NULL,
+       .szLpresumecommand = NULL,
+       .szQueuepausecommand = NULL,
+       .szQueueresumecommand = NULL,
+       .szPrintername = NULL,
+       .szPrintjobUsername = NULL,
+       .szDontdescend = NULL,
+       .szHostsallow = NULL,
+       .szHostsdeny = NULL,
+       .szMagicScript = NULL,
+       .szMagicOutput = NULL,
+       .szVetoFiles = NULL,
+       .szHideFiles = NULL,
+       .szVetoOplockFiles = NULL,
+       .comment = NULL,
+       .force_user = NULL,
+       .force_group = NULL,
+       .readlist = NULL,
+       .writelist = NULL,
+       .printer_admin = NULL,
+       .volume = NULL,
+       .fstype = NULL,
+       .szVfsObjects = NULL,
+       .szMSDfsProxy = NULL,
+       .szAioWriteBehind = NULL,
+       .szDfree = NULL,
+       .iMinPrintSpace = 0,
+       .iMaxPrintJobs = 1000,
+       .iMaxReportedPrintJobs = 0,
+       .iWriteCacheSize = 0,
+       .iCreate_mask = 0744,
+       .iCreate_force_mode = 0,
+       .iSecurity_mask = 0777,
+       .iSecurity_force_mode = 0,
+       .iDir_mask = 0755,
+       .iDir_force_mode = 0,
+       .iDir_Security_mask = 0777,
+       .iDir_Security_force_mode = 0,
+       .iMaxConnections = 0,
+       .iDefaultCase = CASE_LOWER,
+       .iPrinting = DEFAULT_PRINTING,
+       .iOplockContentionLimit = 2,
+       .iCSCPolicy = 0,
+       .iBlock_size = 1024,
+       .iDfreeCacheTime = 0,
+       .bPreexecClose = false,
+       .bRootpreexecClose = false,
+       .iCaseSensitive = Auto,
+       .bCasePreserve = true,
+       .bShortCasePreserve = true,
+       .bHideDotFiles = true,
+       .bHideSpecialFiles = false,
+       .bHideUnReadable = false,
+       .bHideUnWriteableFiles = false,
+       .bBrowseable = true,
+       .bAccessBasedShareEnum = false,
+       .bAvailable = true,
+       .bRead_only = true,
+       .bNo_set_dir = true,
+       .bGuest_only = false,
+       .bAdministrative_share = false,
+       .bGuest_ok = false,
+       .bPrint_ok = false,
+       .bPrintNotifyBackchannel = true,
+       .bMap_system = false,
+       .bMap_hidden = false,
+       .bMap_archive = true,
+       .bStoreDosAttributes = false,
+       .bDmapiSupport = false,
+       .bLocking = true,
+       .iStrictLocking = Auto,
+       .bPosixLocking = true,
+       .bShareModes = true,
+       .bOpLocks = true,
+       .bLevel2OpLocks = true,
+       .bOnlyUser = false,
+       .bMangledNames = true,
+       .bWidelinks = false,
+       .bSymlinks = true,
+       .bSyncAlways = false,
+       .bStrictAllocate = false,
+       .bStrictSync = false,
+       .magic_char = '~',
+       .copymap = NULL,
+       .bDeleteReadonly = false,
+       .bFakeOplocks = false,
+       .bDeleteVetoFiles = false,
+       .bDosFilemode = false,
+       .bDosFiletimes = true,
+       .bDosFiletimeResolution = false,
+       .bFakeDirCreateTimes = false,
+       .bBlockingLocks = true,
+       .bInheritPerms = false,
+       .bInheritACLS = false,
+       .bInheritOwner = false,
+       .bMSDfsRoot = false,
+       .bUseClientDriver = false,
+       .bDefaultDevmode = true,
+       .bForcePrintername = false,
+       .bNTAclSupport = true,
+       .bForceUnknownAclUser = false,
+       .bUseSendfile = false,
+       .bProfileAcls = false,
+       .bMap_acl_inherit = false,
+       .bAfs_Share = false,
+       .bEASupport = false,
+       .bAclCheckPermissions = true,
+       .bAclMapFullControl = true,
+       .bAclGroupControl = false,
+       .bChangeNotify = true,
+       .bKernelChangeNotify = true,
+       .iallocation_roundup_size = SMB_ROUNDUP_ALLOCATION_SIZE,
+       .iAioReadSize = 0,
+       .iAioWriteSize = 0,
+       .iMap_readonly = MAP_READONLY_YES,
 #ifdef BROKEN_DIRECTORY_HANDLING
-       0,                      /* iDirectoryNameCacheSize */
+       .iDirectoryNameCacheSize = 0,
 #else
-       100,                    /* iDirectoryNameCacheSize */
+       .iDirectoryNameCacheSize = 100,
 #endif
-       Auto,                   /* ismb_encrypt */
-       NULL,                   /* Parametric options */
-
-       ""                      /* dummy */
+       .ismb_encrypt = Auto,
+       .param_opt = NULL,
+       .dummy = ""
 };
 
 /* local variables */
-static struct service **ServicePtrs = NULL;
+static struct loadparm_service **ServicePtrs = NULL;
 static int iNumServices = 0;
 static int iServiceIndex = 0;
 static struct db_context *ServiceHash;
 static int *invalid_services = NULL;
 static int num_invalid_services = 0;
-static bool bInGlobalSection = True;
-static bool bGlobalOnly = False;
+static bool bInGlobalSection = true;
+static bool bGlobalOnly = false;
 static int default_server_announce;
 
 #define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct))
 
 /* prototypes for the special type handlers */
-static bool handle_include( int snum, const char *pszParmValue, char **ptr);
-static bool handle_copy( int snum, const char *pszParmValue, char **ptr);
-static bool handle_netbios_name( int snum, const char *pszParmValue, char **ptr);
-static bool handle_idmap_backend(int snum, const char *pszParmValue, char **ptr);
-static bool handle_idmap_uid( int snum, const char *pszParmValue, char **ptr);
-static bool handle_idmap_gid( int snum, const char *pszParmValue, char **ptr);
-static bool handle_debug_list( int snum, const char *pszParmValue, char **ptr );
-static bool handle_workgroup( int snum, const char *pszParmValue, char **ptr );
-static bool handle_netbios_aliases( int snum, const char *pszParmValue, char **ptr );
-static bool handle_netbios_scope( int snum, const char *pszParmValue, char **ptr );
-static bool handle_charset( int snum, const char *pszParmValue, char **ptr );
-static bool handle_dos_charset( int snum, const char *pszParmValue, char **ptr );
-static bool handle_printing( int snum, const char *pszParmValue, char **ptr);
-static bool handle_ldap_debug_level( int snum, const char *pszParmValue, char **ptr);
+static bool handle_include(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr);
+static bool handle_copy(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr);
+static bool handle_idmap_backend(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr);
+static bool handle_idmap_uid(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr);
+static bool handle_idmap_gid(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr);
+static bool handle_debug_list(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr );
+static bool handle_realm(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr );
+static bool handle_netbios_aliases(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr );
+static bool handle_charset(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr );
+static bool handle_dos_charset(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr );
+static bool handle_printing(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr);
+static bool handle_ldap_debug_level(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr);
 
 static void set_default_server_announce_type(void);
 static void set_allowed_client_auth(void);
 
-static void *lp_local_ptr(struct service *service, void *ptr);
-
 static void add_to_file_list(const char *fname, const char *subfname);
 static bool lp_set_cmdline_helper(const char *pszParmName, const char *pszParmValue, bool store_values);
 
@@ -799,21 +412,6 @@ static const struct enum_list enum_ldap_passwd_sync[] = {
        {-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"},
-       {ANNOUNCE_AS_NT_WORKSTATION, "NT Workstation"},
-       {ANNOUNCE_AS_WIN95, "win95"},
-       {ANNOUNCE_AS_WFW, "WfW"},
-       {-1, NULL}
-};
-
 static const struct enum_list enum_map_readonly[] = {
        {MAP_READONLY_NO, "no"},
        {MAP_READONLY_NO, "false"},
@@ -835,12 +433,12 @@ static const struct enum_list enum_case[] = {
 
 
 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}
 };
@@ -855,16 +453,16 @@ static const struct enum_list enum_csc_policy[] = {
 
 /* SMB signing types. */
 static const struct enum_list enum_smb_signing_vals[] = {
-       {False, "No"},
-       {False, "False"},
-       {False, "0"},
-       {False, "Off"},
-       {False, "disabled"},
-       {True, "Yes"},
-       {True, "True"},
-       {True, "1"},
-       {True, "On"},
-       {True, "enabled"},
+       {false, "No"},
+       {false, "False"},
+       {false, "0"},
+       {false, "Off"},
+       {false, "disabled"},
+       {true, "Yes"},
+       {true, "True"},
+       {true, "1"},
+       {true, "On"},
+       {true, "enabled"},
        {Auto, "auto"},
        {Required, "required"},
        {Required, "mandatory"},
@@ -948,6 +546,9 @@ static const struct enum_list enum_kerberos_method[] = {
  *     name first, and all synonyms must follow it with the FLAG_HIDE attribute.
  */
 
+#define GLOBAL_VAR(name) offsetof(struct loadparm_global, name)
+#define LOCAL_VAR(name) offsetof(struct loadparm_service, name)
+
 static struct parm_struct parm_table[] = {
        {N_("Base Options"), P_SEP, P_SEPARATOR},
 
@@ -955,7 +556,7 @@ static struct parm_struct parm_table[] = {
                .label          = "dos charset",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.dos_charset,
+               .offset         = GLOBAL_VAR(dos_charset),
                .special        = handle_dos_charset,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED
@@ -964,16 +565,7 @@ static struct parm_struct parm_table[] = {
                .label          = "unix charset",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.unix_charset,
-               .special        = handle_charset,
-               .enum_list      = NULL,
-               .flags          = FLAG_ADVANCED
-       },
-       {
-               .label          = "display charset",
-               .type           = P_STRING,
-               .p_class        = P_GLOBAL,
-               .ptr            = &Globals.display_charset,
+               .offset         = GLOBAL_VAR(unix_charset),
                .special        = handle_charset,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED
@@ -982,7 +574,7 @@ static struct parm_struct parm_table[] = {
                .label          = "comment",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.comment,
+               .offset         = LOCAL_VAR(comment),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT
@@ -991,7 +583,7 @@ static struct parm_struct parm_table[] = {
                .label          = "path",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szPath,
+               .offset         = LOCAL_VAR(szPath),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -1000,7 +592,7 @@ static struct parm_struct parm_table[] = {
                .label          = "directory",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szPath,
+               .offset         = LOCAL_VAR(szPath),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1009,28 +601,26 @@ static struct parm_struct parm_table[] = {
                .label          = "workgroup",
                .type           = P_USTRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szWorkgroup,
-               .special        = handle_workgroup,
+               .offset         = GLOBAL_VAR(szWorkgroup),
+               .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
        },
-#ifdef WITH_ADS
        {
                .label          = "realm",
                .type           = P_USTRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szRealm,
-               .special        = NULL,
+               .offset         = GLOBAL_VAR(szRealm),
+               .special        = handle_realm,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
        },
-#endif
        {
                .label          = "netbios name",
                .type           = P_USTRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szNetbiosName,
-               .special        = handle_netbios_name,
+               .offset         = GLOBAL_VAR(szNetbiosName),
+               .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
        },
@@ -1038,7 +628,7 @@ static struct parm_struct parm_table[] = {
                .label          = "netbios aliases",
                .type           = P_LIST,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szNetbiosAliases,
+               .offset         = GLOBAL_VAR(szNetbiosAliases),
                .special        = handle_netbios_aliases,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1047,8 +637,8 @@ static struct parm_struct parm_table[] = {
                .label          = "netbios scope",
                .type           = P_USTRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szNetbiosScope,
-               .special        = handle_netbios_scope,
+               .offset         = GLOBAL_VAR(szNetbiosScope),
+               .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
        },
@@ -1056,7 +646,7 @@ static struct parm_struct parm_table[] = {
                .label          = "server string",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szServerString,
+               .offset         = GLOBAL_VAR(szServerString),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED,
@@ -1065,7 +655,7 @@ static struct parm_struct parm_table[] = {
                .label          = "interfaces",
                .type           = P_LIST,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szInterfaces,
+               .offset         = GLOBAL_VAR(szInterfaces),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
@@ -1074,7 +664,7 @@ static struct parm_struct parm_table[] = {
                .label          = "bind interfaces only",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bBindInterfacesOnly,
+               .offset         = GLOBAL_VAR(bBindInterfacesOnly),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_WIZARD,
@@ -1083,7 +673,7 @@ static struct parm_struct parm_table[] = {
                .label          = "config backend",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ConfigBackend,
+               .offset         = GLOBAL_VAR(ConfigBackend),
                .special        = NULL,
                .enum_list      = enum_config_backend,
                .flags          = FLAG_HIDE|FLAG_ADVANCED|FLAG_META,
@@ -1095,7 +685,7 @@ static struct parm_struct parm_table[] = {
                .label          = "security",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.security,
+               .offset         = GLOBAL_VAR(security),
                .special        = NULL,
                .enum_list      = enum_security,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
@@ -1104,7 +694,7 @@ static struct parm_struct parm_table[] = {
                .label          = "auth methods",
                .type           = P_LIST,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.AuthMethods,
+               .offset         = GLOBAL_VAR(AuthMethods),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1113,7 +703,7 @@ static struct parm_struct parm_table[] = {
                .label          = "encrypt passwords",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bEncryptPasswords,
+               .offset         = GLOBAL_VAR(bEncryptPasswords),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
@@ -1122,7 +712,7 @@ static struct parm_struct parm_table[] = {
                .label          = "client schannel",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.clientSchannel,
+               .offset         = GLOBAL_VAR(clientSchannel),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_BASIC | FLAG_ADVANCED,
@@ -1131,7 +721,7 @@ static struct parm_struct parm_table[] = {
                .label          = "server schannel",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.serverSchannel,
+               .offset         = GLOBAL_VAR(serverSchannel),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_BASIC | FLAG_ADVANCED,
@@ -1140,7 +730,7 @@ static struct parm_struct parm_table[] = {
                .label          = "allow trusted domains",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bAllowTrustedDomains,
+               .offset         = GLOBAL_VAR(bAllowTrustedDomains),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1149,7 +739,7 @@ static struct parm_struct parm_table[] = {
                .label          = "map to guest",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.map_to_guest,
+               .offset         = GLOBAL_VAR(map_to_guest),
                .special        = NULL,
                .enum_list      = enum_map_to_guest,
                .flags          = FLAG_ADVANCED,
@@ -1158,7 +748,7 @@ static struct parm_struct parm_table[] = {
                .label          = "null passwords",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bNullPasswords,
+               .offset         = GLOBAL_VAR(bNullPasswords),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
@@ -1167,7 +757,7 @@ static struct parm_struct parm_table[] = {
                .label          = "obey pam restrictions",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bObeyPamRestrictions,
+               .offset         = GLOBAL_VAR(bObeyPamRestrictions),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1176,7 +766,7 @@ static struct parm_struct parm_table[] = {
                .label          = "password server",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szPasswordServer,
+               .offset         = GLOBAL_VAR(szPasswordServer),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_WIZARD,
@@ -1185,7 +775,7 @@ static struct parm_struct parm_table[] = {
                .label          = "smb passwd file",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szSMBPasswdFile,
+               .offset         = GLOBAL_VAR(szSMBPasswdFile),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1194,7 +784,7 @@ static struct parm_struct parm_table[] = {
                .label          = "private dir",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szPrivateDir,
+               .offset         = GLOBAL_VAR(szPrivateDir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1203,7 +793,7 @@ static struct parm_struct parm_table[] = {
                .label          = "passdb backend",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szPassdbBackend,
+               .offset         = GLOBAL_VAR(szPassdbBackend),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_WIZARD,
@@ -1212,7 +802,7 @@ static struct parm_struct parm_table[] = {
                .label          = "algorithmic rid base",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.AlgorithmicRidBase,
+               .offset         = GLOBAL_VAR(AlgorithmicRidBase),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1221,7 +811,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szRootdir,
+               .offset         = GLOBAL_VAR(szRootdir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1230,7 +820,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root dir",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szRootdir,
+               .offset         = GLOBAL_VAR(szRootdir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1239,7 +829,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szRootdir,
+               .offset         = GLOBAL_VAR(szRootdir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1248,7 +838,7 @@ static struct parm_struct parm_table[] = {
                .label          = "guest account",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szGuestaccount,
+               .offset         = GLOBAL_VAR(szGuestaccount),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED,
@@ -1257,7 +847,7 @@ static struct parm_struct parm_table[] = {
                .label          = "enable privileges",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bEnablePrivileges,
+               .offset         = GLOBAL_VAR(bEnablePrivileges),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
@@ -1267,7 +857,7 @@ static struct parm_struct parm_table[] = {
                .label          = "pam password change",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bPamPasswordChange,
+               .offset         = GLOBAL_VAR(bPamPasswordChange),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1276,7 +866,7 @@ static struct parm_struct parm_table[] = {
                .label          = "passwd program",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szPasswdProgram,
+               .offset         = GLOBAL_VAR(szPasswdProgram),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1285,7 +875,7 @@ static struct parm_struct parm_table[] = {
                .label          = "passwd chat",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szPasswdChat,
+               .offset         = GLOBAL_VAR(szPasswdChat),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1294,7 +884,7 @@ static struct parm_struct parm_table[] = {
                .label          = "passwd chat debug",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bPasswdChatDebug,
+               .offset         = GLOBAL_VAR(bPasswdChatDebug),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1303,7 +893,7 @@ static struct parm_struct parm_table[] = {
                .label          = "passwd chat timeout",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iPasswdChatTimeout,
+               .offset         = GLOBAL_VAR(iPasswdChatTimeout),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1312,7 +902,7 @@ static struct parm_struct parm_table[] = {
                .label          = "check password script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szCheckPasswordScript,
+               .offset         = GLOBAL_VAR(szCheckPasswordScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1321,7 +911,7 @@ static struct parm_struct parm_table[] = {
                .label          = "username map",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szUsernameMap,
+               .offset         = GLOBAL_VAR(szUsernameMap),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1330,7 +920,7 @@ static struct parm_struct parm_table[] = {
                .label          = "password level",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.pwordlevel,
+               .offset         = GLOBAL_VAR(pwordlevel),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
@@ -1339,7 +929,7 @@ static struct parm_struct parm_table[] = {
                .label          = "username level",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.unamelevel,
+               .offset         = GLOBAL_VAR(unamelevel),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1348,7 +938,7 @@ static struct parm_struct parm_table[] = {
                .label          = "unix password sync",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bUnixPasswdSync,
+               .offset         = GLOBAL_VAR(bUnixPasswdSync),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1357,7 +947,7 @@ static struct parm_struct parm_table[] = {
                .label          = "restrict anonymous",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.restrict_anonymous,
+               .offset         = GLOBAL_VAR(restrict_anonymous),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1366,7 +956,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lanman auth",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bLanmanAuth,
+               .offset         = GLOBAL_VAR(bLanmanAuth),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1375,7 +965,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ntlm auth",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bNTLMAuth,
+               .offset         = GLOBAL_VAR(bNTLMAuth),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1384,7 +974,7 @@ static struct parm_struct parm_table[] = {
                .label          = "client NTLMv2 auth",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bClientNTLMv2Auth,
+               .offset         = GLOBAL_VAR(bClientNTLMv2Auth),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1393,7 +983,7 @@ static struct parm_struct parm_table[] = {
                .label          = "client lanman auth",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bClientLanManAuth,
+               .offset         = GLOBAL_VAR(bClientLanManAuth),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1402,7 +992,7 @@ static struct parm_struct parm_table[] = {
                .label          = "client plaintext auth",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bClientPlaintextAuth,
+               .offset         = GLOBAL_VAR(bClientPlaintextAuth),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1411,7 +1001,7 @@ static struct parm_struct parm_table[] = {
                .label          = "client use spnego principal",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.client_use_spnego_principal,
+               .offset         = GLOBAL_VAR(client_use_spnego_principal),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1420,7 +1010,7 @@ static struct parm_struct parm_table[] = {
                .label          = "send spnego principal",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.send_spnego_principal,
+               .offset         = GLOBAL_VAR(send_spnego_principal),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1429,7 +1019,7 @@ static struct parm_struct parm_table[] = {
                .label          = "username",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szUsername,
+               .offset         = LOCAL_VAR(szUsername),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE | FLAG_DEPRECATED,
@@ -1438,7 +1028,7 @@ static struct parm_struct parm_table[] = {
                .label          = "user",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szUsername,
+               .offset         = LOCAL_VAR(szUsername),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1447,7 +1037,7 @@ static struct parm_struct parm_table[] = {
                .label          = "users",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szUsername,
+               .offset         = LOCAL_VAR(szUsername),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1456,7 +1046,7 @@ static struct parm_struct parm_table[] = {
                .label          = "invalid users",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szInvalidUsers,
+               .offset         = LOCAL_VAR(szInvalidUsers),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1465,7 +1055,7 @@ static struct parm_struct parm_table[] = {
                .label          = "valid users",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szValidUsers,
+               .offset         = LOCAL_VAR(szValidUsers),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1474,7 +1064,7 @@ static struct parm_struct parm_table[] = {
                .label          = "admin users",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szAdminUsers,
+               .offset         = LOCAL_VAR(szAdminUsers),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1483,7 +1073,7 @@ static struct parm_struct parm_table[] = {
                .label          = "read list",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.readlist,
+               .offset         = LOCAL_VAR(readlist),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1492,7 +1082,7 @@ static struct parm_struct parm_table[] = {
                .label          = "write list",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.writelist,
+               .offset         = LOCAL_VAR(writelist),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1501,7 +1091,7 @@ static struct parm_struct parm_table[] = {
                .label          = "printer admin",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.printer_admin,
+               .offset         = LOCAL_VAR(printer_admin),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_PRINT | FLAG_DEPRECATED,
@@ -1510,7 +1100,7 @@ static struct parm_struct parm_table[] = {
                .label          = "force user",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.force_user,
+               .offset         = LOCAL_VAR(force_user),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -1519,7 +1109,7 @@ static struct parm_struct parm_table[] = {
                .label          = "force group",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.force_group,
+               .offset         = LOCAL_VAR(force_group),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -1528,7 +1118,7 @@ static struct parm_struct parm_table[] = {
                .label          = "group",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.force_group,
+               .offset         = LOCAL_VAR(force_group),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1537,7 +1127,7 @@ static struct parm_struct parm_table[] = {
                .label          = "read only",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bRead_only,
+               .offset         = LOCAL_VAR(bRead_only),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE,
@@ -1546,7 +1136,7 @@ static struct parm_struct parm_table[] = {
                .label          = "write ok",
                .type           = P_BOOLREV,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bRead_only,
+               .offset         = LOCAL_VAR(bRead_only),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1555,7 +1145,7 @@ static struct parm_struct parm_table[] = {
                .label          = "writeable",
                .type           = P_BOOLREV,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bRead_only,
+               .offset         = LOCAL_VAR(bRead_only),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1564,7 +1154,7 @@ static struct parm_struct parm_table[] = {
                .label          = "writable",
                .type           = P_BOOLREV,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bRead_only,
+               .offset         = LOCAL_VAR(bRead_only),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1573,7 +1163,7 @@ static struct parm_struct parm_table[] = {
                .label          = "acl check permissions",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bAclCheckPermissions,
+               .offset         = LOCAL_VAR(bAclCheckPermissions),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1582,7 +1172,7 @@ static struct parm_struct parm_table[] = {
                .label          = "acl group control",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bAclGroupControl,
+               .offset         = LOCAL_VAR(bAclGroupControl),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1591,7 +1181,7 @@ static struct parm_struct parm_table[] = {
                .label          = "acl map full control",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bAclMapFullControl,
+               .offset         = LOCAL_VAR(bAclMapFullControl),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1600,7 +1190,7 @@ static struct parm_struct parm_table[] = {
                .label          = "create mask",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iCreate_mask,
+               .offset         = LOCAL_VAR(iCreate_mask),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1609,7 +1199,7 @@ static struct parm_struct parm_table[] = {
                .label          = "create mode",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iCreate_mask,
+               .offset         = LOCAL_VAR(iCreate_mask),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1618,7 +1208,7 @@ static struct parm_struct parm_table[] = {
                .label          = "force create mode",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iCreate_force_mode,
+               .offset         = LOCAL_VAR(iCreate_force_mode),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1627,7 +1217,7 @@ static struct parm_struct parm_table[] = {
                .label          = "security mask",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iSecurity_mask,
+               .offset         = LOCAL_VAR(iSecurity_mask),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1636,7 +1226,7 @@ static struct parm_struct parm_table[] = {
                .label          = "force security mode",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iSecurity_force_mode,
+               .offset         = LOCAL_VAR(iSecurity_force_mode),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1645,7 +1235,7 @@ static struct parm_struct parm_table[] = {
                .label          = "directory mask",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iDir_mask,
+               .offset         = LOCAL_VAR(iDir_mask),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1654,7 +1244,7 @@ static struct parm_struct parm_table[] = {
                .label          = "directory mode",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iDir_mask,
+               .offset         = LOCAL_VAR(iDir_mask),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -1663,7 +1253,7 @@ static struct parm_struct parm_table[] = {
                .label          = "force directory mode",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iDir_force_mode,
+               .offset         = LOCAL_VAR(iDir_force_mode),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1672,7 +1262,7 @@ static struct parm_struct parm_table[] = {
                .label          = "directory security mask",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iDir_Security_mask,
+               .offset         = LOCAL_VAR(iDir_Security_mask),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1681,7 +1271,7 @@ static struct parm_struct parm_table[] = {
                .label          = "force directory security mode",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iDir_Security_force_mode,
+               .offset         = LOCAL_VAR(iDir_Security_force_mode),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1690,7 +1280,7 @@ static struct parm_struct parm_table[] = {
                .label          = "force unknown acl user",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bForceUnknownAclUser,
+               .offset         = LOCAL_VAR(bForceUnknownAclUser),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -1699,7 +1289,7 @@ static struct parm_struct parm_table[] = {
                .label          = "inherit permissions",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bInheritPerms,
+               .offset         = LOCAL_VAR(bInheritPerms),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -1708,7 +1298,7 @@ static struct parm_struct parm_table[] = {
                .label          = "inherit acls",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bInheritACLS,
+               .offset         = LOCAL_VAR(bInheritACLS),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -1717,7 +1307,7 @@ static struct parm_struct parm_table[] = {
                .label          = "inherit owner",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bInheritOwner,
+               .offset         = LOCAL_VAR(bInheritOwner),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -1726,7 +1316,7 @@ static struct parm_struct parm_table[] = {
                .label          = "guest only",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bGuest_only,
+               .offset         = LOCAL_VAR(bGuest_only),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -1735,7 +1325,7 @@ static struct parm_struct parm_table[] = {
                .label          = "only guest",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bGuest_only,
+               .offset         = LOCAL_VAR(bGuest_only),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1744,7 +1334,7 @@ static struct parm_struct parm_table[] = {
                .label          = "administrative share",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bAdministrative_share,
+               .offset         = LOCAL_VAR(bAdministrative_share),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -1754,7 +1344,7 @@ static struct parm_struct parm_table[] = {
                .label          = "guest ok",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bGuest_ok,
+               .offset         = LOCAL_VAR(bGuest_ok),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -1763,7 +1353,7 @@ static struct parm_struct parm_table[] = {
                .label          = "public",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bGuest_ok,
+               .offset         = LOCAL_VAR(bGuest_ok),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1772,7 +1362,7 @@ static struct parm_struct parm_table[] = {
                .label          = "only user",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bOnlyUser,
+               .offset         = LOCAL_VAR(bOnlyUser),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_DEPRECATED,
@@ -1781,7 +1371,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hosts allow",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szHostsallow,
+               .offset         = LOCAL_VAR(szHostsallow),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_GLOBAL | FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -1790,7 +1380,7 @@ static struct parm_struct parm_table[] = {
                .label          = "allow hosts",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szHostsallow,
+               .offset         = LOCAL_VAR(szHostsallow),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1799,7 +1389,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hosts deny",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szHostsdeny,
+               .offset         = LOCAL_VAR(szHostsdeny),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_GLOBAL | FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -1808,7 +1398,7 @@ static struct parm_struct parm_table[] = {
                .label          = "deny hosts",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szHostsdeny,
+               .offset         = LOCAL_VAR(szHostsdeny),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1817,7 +1407,7 @@ static struct parm_struct parm_table[] = {
                .label          = "preload modules",
                .type           = P_LIST,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szPreloadModules,
+               .offset         = GLOBAL_VAR(szPreloadModules),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -1826,7 +1416,7 @@ static struct parm_struct parm_table[] = {
                .label          = "dedicated keytab file",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szDedicatedKeytabFile,
+               .offset         = GLOBAL_VAR(szDedicatedKeytabFile),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1835,7 +1425,7 @@ static struct parm_struct parm_table[] = {
                .label          = "kerberos method",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iKerberosMethod,
+               .offset         = GLOBAL_VAR(iKerberosMethod),
                .special        = NULL,
                .enum_list      = enum_kerberos_method,
                .flags          = FLAG_ADVANCED,
@@ -1844,7 +1434,7 @@ static struct parm_struct parm_table[] = {
                .label          = "map untrusted to domain",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bMapUntrustedToDomain,
+               .offset         = GLOBAL_VAR(bMapUntrustedToDomain),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -1857,7 +1447,7 @@ static struct parm_struct parm_table[] = {
                .label          = "log level",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLogLevel,
+               .offset         = GLOBAL_VAR(szLogLevel),
                .special        = handle_debug_list,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1866,7 +1456,7 @@ static struct parm_struct parm_table[] = {
                .label          = "debuglevel",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLogLevel,
+               .offset         = GLOBAL_VAR(szLogLevel),
                .special        = handle_debug_list,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -1875,7 +1465,7 @@ static struct parm_struct parm_table[] = {
                .label          = "syslog",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.syslog,
+               .offset         = GLOBAL_VAR(syslog),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1884,7 +1474,7 @@ static struct parm_struct parm_table[] = {
                .label          = "syslog only",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bSyslogOnly,
+               .offset         = GLOBAL_VAR(bSyslogOnly),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1893,7 +1483,7 @@ static struct parm_struct parm_table[] = {
                .label          = "log file",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLogFile,
+               .offset         = GLOBAL_VAR(szLogFile),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1902,7 +1492,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max log size",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.max_log_size,
+               .offset         = GLOBAL_VAR(max_log_size),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1911,7 +1501,7 @@ static struct parm_struct parm_table[] = {
                .label          = "debug timestamp",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bTimestampLogs,
+               .offset         = GLOBAL_VAR(bTimestampLogs),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1920,7 +1510,7 @@ static struct parm_struct parm_table[] = {
                .label          = "timestamp logs",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bTimestampLogs,
+               .offset         = GLOBAL_VAR(bTimestampLogs),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1929,7 +1519,7 @@ static struct parm_struct parm_table[] = {
                .label          = "debug prefix timestamp",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bDebugPrefixTimestamp,
+               .offset         = GLOBAL_VAR(bDebugPrefixTimestamp),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1938,7 +1528,7 @@ static struct parm_struct parm_table[] = {
                .label          = "debug hires timestamp",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bDebugHiresTimestamp,
+               .offset         = GLOBAL_VAR(bDebugHiresTimestamp),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1947,7 +1537,7 @@ static struct parm_struct parm_table[] = {
                .label          = "debug pid",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bDebugPid,
+               .offset         = GLOBAL_VAR(bDebugPid),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1956,7 +1546,7 @@ static struct parm_struct parm_table[] = {
                .label          = "debug uid",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bDebugUid,
+               .offset         = GLOBAL_VAR(bDebugUid),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1965,7 +1555,7 @@ static struct parm_struct parm_table[] = {
                .label          = "debug class",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bDebugClass,
+               .offset         = GLOBAL_VAR(bDebugClass),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1974,7 +1564,7 @@ static struct parm_struct parm_table[] = {
                .label          = "enable core files",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bEnableCoreFiles,
+               .offset         = GLOBAL_VAR(bEnableCoreFiles),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1986,7 +1576,7 @@ static struct parm_struct parm_table[] = {
                .label          = "allocation roundup size",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iallocation_roundup_size,
+               .offset         = LOCAL_VAR(iallocation_roundup_size),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -1995,7 +1585,7 @@ static struct parm_struct parm_table[] = {
                .label          = "aio read size",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iAioReadSize,
+               .offset         = LOCAL_VAR(iAioReadSize),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2004,7 +1594,7 @@ static struct parm_struct parm_table[] = {
                .label          = "aio write size",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iAioWriteSize,
+               .offset         = LOCAL_VAR(iAioWriteSize),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2013,7 +1603,7 @@ static struct parm_struct parm_table[] = {
                .label          = "aio write behind",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szAioWriteBehind,
+               .offset         = LOCAL_VAR(szAioWriteBehind),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2022,7 +1612,7 @@ static struct parm_struct parm_table[] = {
                .label          = "smb ports",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.smb_ports,
+               .offset         = GLOBAL_VAR(smb_ports),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2031,7 +1621,7 @@ static struct parm_struct parm_table[] = {
                .label          = "large readwrite",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bLargeReadwrite,
+               .offset         = GLOBAL_VAR(bLargeReadwrite),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2040,7 +1630,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.maxprotocol,
+               .offset         = GLOBAL_VAR(maxprotocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
                .flags          = FLAG_ADVANCED,
@@ -2049,7 +1639,7 @@ static struct parm_struct parm_table[] = {
                .label          = "protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.maxprotocol,
+               .offset         = GLOBAL_VAR(maxprotocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
                .flags          = FLAG_ADVANCED,
@@ -2058,7 +1648,7 @@ static struct parm_struct parm_table[] = {
                .label          = "min protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.minprotocol,
+               .offset         = GLOBAL_VAR(minprotocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
                .flags          = FLAG_ADVANCED,
@@ -2067,7 +1657,7 @@ static struct parm_struct parm_table[] = {
                .label          = "min receivefile size",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iminreceivefile,
+               .offset         = GLOBAL_VAR(iminreceivefile),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2076,7 +1666,7 @@ static struct parm_struct parm_table[] = {
                .label          = "read raw",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bReadRaw,
+               .offset         = GLOBAL_VAR(bReadRaw),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2085,7 +1675,7 @@ static struct parm_struct parm_table[] = {
                .label          = "write raw",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bWriteRaw,
+               .offset         = GLOBAL_VAR(bWriteRaw),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2094,7 +1684,7 @@ static struct parm_struct parm_table[] = {
                .label          = "disable netbios",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bDisableNetbios,
+               .offset         = GLOBAL_VAR(bDisableNetbios),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2103,7 +1693,7 @@ static struct parm_struct parm_table[] = {
                .label          = "reset on zero vc",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bResetOnZeroVC,
+               .offset         = GLOBAL_VAR(bResetOnZeroVC),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2112,7 +1702,7 @@ static struct parm_struct parm_table[] = {
                .label          = "log writeable files on exit",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bLogWriteableFilesOnExit,
+               .offset         = GLOBAL_VAR(bLogWriteableFilesOnExit),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2121,7 +1711,7 @@ static struct parm_struct parm_table[] = {
                .label          = "acl compatibility",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iAclCompat,
+               .offset         = GLOBAL_VAR(iAclCompat),
                .special        = NULL,
                .enum_list      = enum_acl_compat_vals,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2130,7 +1720,7 @@ static struct parm_struct parm_table[] = {
                .label          = "defer sharing violations",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bDeferSharingViolations,
+               .offset         = GLOBAL_VAR(bDeferSharingViolations),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -2139,7 +1729,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ea support",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bEASupport,
+               .offset         = LOCAL_VAR(bEASupport),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2148,7 +1738,7 @@ static struct parm_struct parm_table[] = {
                .label          = "nt acl support",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bNTAclSupport,
+               .offset         = LOCAL_VAR(bNTAclSupport),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2157,7 +1747,7 @@ static struct parm_struct parm_table[] = {
                .label          = "nt pipe support",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bNTPipeSupport,
+               .offset         = GLOBAL_VAR(bNTPipeSupport),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2166,7 +1756,7 @@ static struct parm_struct parm_table[] = {
                .label          = "nt status support",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bNTStatusSupport,
+               .offset         = GLOBAL_VAR(bNTStatusSupport),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2175,34 +1765,16 @@ static struct parm_struct parm_table[] = {
                .label          = "profile acls",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bProfileAcls,
+               .offset         = LOCAL_VAR(bProfileAcls),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
        },
-       {
-               .label          = "announce version",
-               .type           = P_STRING,
-               .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szAnnounceVersion,
-               .special        = NULL,
-               .enum_list      = NULL,
-               .flags          = FLAG_ADVANCED,
-       },
-       {
-               .label          = "announce as",
-               .type           = P_ENUM,
-               .p_class        = P_GLOBAL,
-               .ptr            = &Globals.announce_as,
-               .special        = NULL,
-               .enum_list      = enum_announce_as,
-               .flags          = FLAG_ADVANCED,
-       },
        {
                .label          = "map acl inherit",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bMap_acl_inherit,
+               .offset         = LOCAL_VAR(bMap_acl_inherit),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2211,7 +1783,7 @@ static struct parm_struct parm_table[] = {
                .label          = "afs share",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bAfs_Share,
+               .offset         = LOCAL_VAR(bAfs_Share),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2220,7 +1792,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max mux",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.max_mux,
+               .offset         = GLOBAL_VAR(max_mux),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2229,7 +1801,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max xmit",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.max_xmit,
+               .offset         = GLOBAL_VAR(max_xmit),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2238,7 +1810,7 @@ static struct parm_struct parm_table[] = {
                .label          = "name resolve order",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szNameResolveOrder,
+               .offset         = GLOBAL_VAR(szNameResolveOrder),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_WIZARD,
@@ -2247,7 +1819,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max ttl",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.max_ttl,
+               .offset         = GLOBAL_VAR(max_ttl),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2256,7 +1828,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max wins ttl",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.max_wins_ttl,
+               .offset         = GLOBAL_VAR(max_wins_ttl),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2265,7 +1837,7 @@ static struct parm_struct parm_table[] = {
                .label          = "min wins ttl",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.min_wins_ttl,
+               .offset         = GLOBAL_VAR(min_wins_ttl),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2274,7 +1846,7 @@ static struct parm_struct parm_table[] = {
                .label          = "time server",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bTimeServer,
+               .offset         = GLOBAL_VAR(bTimeServer),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2283,7 +1855,7 @@ static struct parm_struct parm_table[] = {
                .label          = "unix extensions",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bUnixExtensions,
+               .offset         = GLOBAL_VAR(bUnixExtensions),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2292,7 +1864,7 @@ static struct parm_struct parm_table[] = {
                .label          = "use spnego",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bUseSpnego,
+               .offset         = GLOBAL_VAR(bUseSpnego),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
@@ -2301,7 +1873,7 @@ static struct parm_struct parm_table[] = {
                .label          = "client signing",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.client_signing,
+               .offset         = GLOBAL_VAR(client_signing),
                .special        = NULL,
                .enum_list      = enum_smb_signing_vals,
                .flags          = FLAG_ADVANCED,
@@ -2310,7 +1882,7 @@ static struct parm_struct parm_table[] = {
                .label          = "server signing",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.server_signing,
+               .offset         = GLOBAL_VAR(server_signing),
                .special        = NULL,
                .enum_list      = enum_smb_signing_vals,
                .flags          = FLAG_ADVANCED,
@@ -2319,7 +1891,7 @@ static struct parm_struct parm_table[] = {
                .label          = "smb encrypt",
                .type           = P_ENUM,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.ismb_encrypt,
+               .offset         = LOCAL_VAR(ismb_encrypt),
                .special        = NULL,
                .enum_list      = enum_smb_signing_vals,
                .flags          = FLAG_ADVANCED,
@@ -2328,7 +1900,7 @@ static struct parm_struct parm_table[] = {
                .label          = "client use spnego",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bClientUseSpnego,
+               .offset         = GLOBAL_VAR(bClientUseSpnego),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2337,7 +1909,7 @@ static struct parm_struct parm_table[] = {
                .label          = "client ldap sasl wrapping",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.client_ldap_sasl_wrapping,
+               .offset         = GLOBAL_VAR(client_ldap_sasl_wrapping),
                .special        = NULL,
                .enum_list      = enum_ldap_sasl_wrapping,
                .flags          = FLAG_ADVANCED,
@@ -2346,7 +1918,7 @@ static struct parm_struct parm_table[] = {
                .label          = "enable asu support",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bASUSupport,
+               .offset         = GLOBAL_VAR(bASUSupport),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2355,7 +1927,7 @@ static struct parm_struct parm_table[] = {
                .label          = "svcctl list",
                .type           = P_LIST,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szServicesList,
+               .offset         = GLOBAL_VAR(szServicesList),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2367,7 +1939,7 @@ static struct parm_struct parm_table[] = {
                .label          = "block size",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iBlock_size,
+               .offset         = LOCAL_VAR(iBlock_size),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -2376,7 +1948,7 @@ static struct parm_struct parm_table[] = {
                .label          = "deadtime",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.deadtime,
+               .offset         = GLOBAL_VAR(deadtime),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2385,7 +1957,7 @@ static struct parm_struct parm_table[] = {
                .label          = "getwd cache",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.getwd_cache,
+               .offset         = GLOBAL_VAR(getwd_cache),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2394,7 +1966,7 @@ static struct parm_struct parm_table[] = {
                .label          = "keepalive",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iKeepalive,
+               .offset         = GLOBAL_VAR(iKeepalive),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2403,7 +1975,7 @@ static struct parm_struct parm_table[] = {
                .label          = "change notify",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bChangeNotify,
+               .offset         = LOCAL_VAR(bChangeNotify),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -2412,7 +1984,7 @@ static struct parm_struct parm_table[] = {
                .label          = "directory name cache size",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iDirectoryNameCacheSize,
+               .offset         = LOCAL_VAR(iDirectoryNameCacheSize),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -2421,7 +1993,7 @@ static struct parm_struct parm_table[] = {
                .label          = "kernel change notify",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bKernelChangeNotify,
+               .offset         = LOCAL_VAR(bKernelChangeNotify),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -2430,7 +2002,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lpq cache time",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.lpqcachetime,
+               .offset         = GLOBAL_VAR(lpqcachetime),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2439,7 +2011,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max smbd processes",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iMaxSmbdProcesses,
+               .offset         = GLOBAL_VAR(iMaxSmbdProcesses),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2448,7 +2020,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max connections",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iMaxConnections,
+               .offset         = LOCAL_VAR(iMaxConnections),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -2457,7 +2029,7 @@ static struct parm_struct parm_table[] = {
                .label          = "paranoid server security",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.paranoid_server_security,
+               .offset         = GLOBAL_VAR(paranoid_server_security),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2466,7 +2038,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max disk size",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.maxdisksize,
+               .offset         = GLOBAL_VAR(maxdisksize),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2475,7 +2047,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max open files",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.max_open_files,
+               .offset         = GLOBAL_VAR(max_open_files),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2484,7 +2056,7 @@ static struct parm_struct parm_table[] = {
                .label          = "min print space",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iMinPrintSpace,
+               .offset         = LOCAL_VAR(iMinPrintSpace),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2493,7 +2065,7 @@ static struct parm_struct parm_table[] = {
                .label          = "socket options",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szSocketOptions,
+               .offset         = GLOBAL_VAR(szSocketOptions),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2502,7 +2074,7 @@ static struct parm_struct parm_table[] = {
                .label          = "strict allocate",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bStrictAllocate,
+               .offset         = LOCAL_VAR(bStrictAllocate),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -2511,7 +2083,7 @@ static struct parm_struct parm_table[] = {
                .label          = "strict sync",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bStrictSync,
+               .offset         = LOCAL_VAR(bStrictSync),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -2520,7 +2092,7 @@ static struct parm_struct parm_table[] = {
                .label          = "sync always",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bSyncAlways,
+               .offset         = LOCAL_VAR(bSyncAlways),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -2529,7 +2101,7 @@ static struct parm_struct parm_table[] = {
                .label          = "use mmap",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bUseMmap,
+               .offset         = GLOBAL_VAR(bUseMmap),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2538,7 +2110,7 @@ static struct parm_struct parm_table[] = {
                .label          = "use sendfile",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bUseSendfile,
+               .offset         = LOCAL_VAR(bUseSendfile),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -2547,7 +2119,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hostname lookups",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bHostnameLookups,
+               .offset         = GLOBAL_VAR(bHostnameLookups),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2556,7 +2128,7 @@ static struct parm_struct parm_table[] = {
                .label          = "write cache size",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iWriteCacheSize,
+               .offset         = LOCAL_VAR(iWriteCacheSize),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -2565,7 +2137,7 @@ static struct parm_struct parm_table[] = {
                .label          = "name cache timeout",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.name_cache_timeout,
+               .offset         = GLOBAL_VAR(name_cache_timeout),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2574,7 +2146,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ctdbd socket",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ctdbdSocket,
+               .offset         = GLOBAL_VAR(ctdbdSocket),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -2583,7 +2155,7 @@ static struct parm_struct parm_table[] = {
                .label          = "cluster addresses",
                .type           = P_LIST,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szClusterAddresses,
+               .offset         = GLOBAL_VAR(szClusterAddresses),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -2592,7 +2164,7 @@ static struct parm_struct parm_table[] = {
                .label          = "clustering",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.clustering,
+               .offset         = GLOBAL_VAR(clustering),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -2601,7 +2173,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ctdb timeout",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ctdb_timeout,
+               .offset         = GLOBAL_VAR(ctdb_timeout),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -2610,7 +2182,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ctdb locktime warn threshold",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ctdb_locktime_warn_threshold,
+               .offset         = GLOBAL_VAR(ctdb_locktime_warn_threshold),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -2619,7 +2191,7 @@ static struct parm_struct parm_table[] = {
                .label          = "smb2 max read",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ismb2_max_read,
+               .offset         = GLOBAL_VAR(ismb2_max_read),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2628,7 +2200,7 @@ static struct parm_struct parm_table[] = {
                .label          = "smb2 max write",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ismb2_max_write,
+               .offset         = GLOBAL_VAR(ismb2_max_write),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2637,7 +2209,7 @@ static struct parm_struct parm_table[] = {
                .label          = "smb2 max trans",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ismb2_max_trans,
+               .offset         = GLOBAL_VAR(ismb2_max_trans),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2646,7 +2218,7 @@ static struct parm_struct parm_table[] = {
                .label          = "smb2 max credits",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ismb2_max_credits,
+               .offset         = GLOBAL_VAR(ismb2_max_credits),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2658,7 +2230,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max reported print jobs",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iMaxReportedPrintJobs,
+               .offset         = LOCAL_VAR(iMaxReportedPrintJobs),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2667,7 +2239,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max print jobs",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iMaxPrintJobs,
+               .offset         = LOCAL_VAR(iMaxPrintJobs),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2676,7 +2248,7 @@ static struct parm_struct parm_table[] = {
                .label          = "load printers",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bLoadPrinters,
+               .offset         = GLOBAL_VAR(bLoadPrinters),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2685,7 +2257,7 @@ static struct parm_struct parm_table[] = {
                .label          = "printcap cache time",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.PrintcapCacheTime,
+               .offset         = GLOBAL_VAR(PrintcapCacheTime),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2694,7 +2266,7 @@ static struct parm_struct parm_table[] = {
                .label          = "printcap name",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szPrintcapname,
+               .offset         = GLOBAL_VAR(szPrintcapname),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2703,7 +2275,7 @@ static struct parm_struct parm_table[] = {
                .label          = "printcap",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szPrintcapname,
+               .offset         = GLOBAL_VAR(szPrintcapname),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -2712,7 +2284,7 @@ static struct parm_struct parm_table[] = {
                .label          = "printable",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bPrint_ok,
+               .offset         = LOCAL_VAR(bPrint_ok),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2721,7 +2293,7 @@ static struct parm_struct parm_table[] = {
                .label          = "print notify backchannel",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bPrintNotifyBackchannel,
+               .offset         = LOCAL_VAR(bPrintNotifyBackchannel),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2730,7 +2302,7 @@ static struct parm_struct parm_table[] = {
                .label          = "print ok",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bPrint_ok,
+               .offset         = LOCAL_VAR(bPrint_ok),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -2739,7 +2311,7 @@ static struct parm_struct parm_table[] = {
                .label          = "printing",
                .type           = P_ENUM,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iPrinting,
+               .offset         = LOCAL_VAR(iPrinting),
                .special        = handle_printing,
                .enum_list      = enum_printing,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2748,7 +2320,7 @@ static struct parm_struct parm_table[] = {
                .label          = "cups options",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szCupsOptions,
+               .offset         = LOCAL_VAR(szCupsOptions),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2757,7 +2329,7 @@ static struct parm_struct parm_table[] = {
                .label          = "cups server",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szCupsServer,
+               .offset         = GLOBAL_VAR(szCupsServer),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2766,7 +2338,7 @@ static struct parm_struct parm_table[] = {
                .label          = "cups encrypt",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.CupsEncrypt,
+               .offset            = GLOBAL_VAR(CupsEncrypt),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2776,7 +2348,7 @@ static struct parm_struct parm_table[] = {
                .label          = "cups connection timeout",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.cups_connection_timeout,
+               .offset         = GLOBAL_VAR(cups_connection_timeout),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2785,7 +2357,7 @@ static struct parm_struct parm_table[] = {
                .label          = "iprint server",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szIPrintServer,
+               .offset         = GLOBAL_VAR(szIPrintServer),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2794,7 +2366,7 @@ static struct parm_struct parm_table[] = {
                .label          = "print command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szPrintcommand,
+               .offset         = LOCAL_VAR(szPrintcommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2803,7 +2375,7 @@ static struct parm_struct parm_table[] = {
                .label          = "disable spoolss",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bDisableSpoolss,
+               .offset         = GLOBAL_VAR(bDisableSpoolss),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2812,7 +2384,7 @@ static struct parm_struct parm_table[] = {
                .label          = "enable spoolss",
                .type           = P_BOOLREV,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bDisableSpoolss,
+               .offset         = GLOBAL_VAR(bDisableSpoolss),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -2821,7 +2393,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lpq command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szLpqcommand,
+               .offset         = LOCAL_VAR(szLpqcommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2830,7 +2402,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lprm command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szLprmcommand,
+               .offset         = LOCAL_VAR(szLprmcommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2839,7 +2411,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lppause command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szLppausecommand,
+               .offset         = LOCAL_VAR(szLppausecommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2848,7 +2420,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lpresume command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szLpresumecommand,
+               .offset         = LOCAL_VAR(szLpresumecommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2857,7 +2429,7 @@ static struct parm_struct parm_table[] = {
                .label          = "queuepause command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szQueuepausecommand,
+               .offset         = LOCAL_VAR(szQueuepausecommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2866,7 +2438,7 @@ static struct parm_struct parm_table[] = {
                .label          = "queueresume command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szQueueresumecommand,
+               .offset         = LOCAL_VAR(szQueueresumecommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL,
@@ -2875,7 +2447,7 @@ static struct parm_struct parm_table[] = {
                .label          = "addport command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szAddPortCommand,
+               .offset         = GLOBAL_VAR(szAddPortCommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2884,7 +2456,7 @@ static struct parm_struct parm_table[] = {
                .label          = "enumports command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szEnumPortsCommand,
+               .offset         = GLOBAL_VAR(szEnumPortsCommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2893,7 +2465,7 @@ static struct parm_struct parm_table[] = {
                .label          = "addprinter command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szAddPrinterCommand,
+               .offset         = GLOBAL_VAR(szAddPrinterCommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2902,7 +2474,7 @@ static struct parm_struct parm_table[] = {
                .label          = "deleteprinter command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szDeletePrinterCommand,
+               .offset         = GLOBAL_VAR(szDeletePrinterCommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2911,7 +2483,7 @@ static struct parm_struct parm_table[] = {
                .label          = "show add printer wizard",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bMsAddPrinterWizard,
+               .offset         = GLOBAL_VAR(bMsAddPrinterWizard),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2920,7 +2492,7 @@ static struct parm_struct parm_table[] = {
                .label          = "os2 driver map",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szOs2DriverMap,
+               .offset         = GLOBAL_VAR(szOs2DriverMap),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2930,7 +2502,7 @@ static struct parm_struct parm_table[] = {
                .label          = "printer name",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szPrintername,
+               .offset         = LOCAL_VAR(szPrintername),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2939,7 +2511,7 @@ static struct parm_struct parm_table[] = {
                .label          = "printer",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szPrintername,
+               .offset         = LOCAL_VAR(szPrintername),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -2948,7 +2520,7 @@ static struct parm_struct parm_table[] = {
                .label          = "use client driver",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bUseClientDriver,
+               .offset         = LOCAL_VAR(bUseClientDriver),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2957,7 +2529,7 @@ static struct parm_struct parm_table[] = {
                .label          = "default devmode",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bDefaultDevmode,
+               .offset         = LOCAL_VAR(bDefaultDevmode),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2966,7 +2538,7 @@ static struct parm_struct parm_table[] = {
                .label          = "force printername",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bForcePrintername,
+               .offset         = LOCAL_VAR(bForcePrintername),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2975,7 +2547,7 @@ static struct parm_struct parm_table[] = {
                .label          = "printjob username",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szPrintjobUsername,
+               .offset         = LOCAL_VAR(szPrintjobUsername),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2987,7 +2559,7 @@ static struct parm_struct parm_table[] = {
                .label          = "mangling method",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szManglingMethod,
+               .offset         = GLOBAL_VAR(szManglingMethod),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -2996,7 +2568,7 @@ static struct parm_struct parm_table[] = {
                .label          = "mangle prefix",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.mangle_prefix,
+               .offset         = GLOBAL_VAR(mangle_prefix),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3006,7 +2578,7 @@ static struct parm_struct parm_table[] = {
                .label          = "default case",
                .type           = P_ENUM,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iDefaultCase,
+               .offset         = LOCAL_VAR(iDefaultCase),
                .special        = NULL,
                .enum_list      = enum_case,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -3015,7 +2587,7 @@ static struct parm_struct parm_table[] = {
                .label          = "case sensitive",
                .type           = P_ENUM,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iCaseSensitive,
+               .offset         = LOCAL_VAR(iCaseSensitive),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3024,7 +2596,7 @@ static struct parm_struct parm_table[] = {
                .label          = "casesignames",
                .type           = P_ENUM,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iCaseSensitive,
+               .offset         = LOCAL_VAR(iCaseSensitive),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL | FLAG_HIDE,
@@ -3033,7 +2605,7 @@ static struct parm_struct parm_table[] = {
                .label          = "preserve case",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bCasePreserve,
+               .offset         = LOCAL_VAR(bCasePreserve),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3042,7 +2614,7 @@ static struct parm_struct parm_table[] = {
                .label          = "short preserve case",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bShortCasePreserve,
+               .offset         = LOCAL_VAR(bShortCasePreserve),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3051,7 +2623,7 @@ static struct parm_struct parm_table[] = {
                .label          = "mangling char",
                .type           = P_CHAR,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.magic_char,
+               .offset         = LOCAL_VAR(magic_char),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3060,7 +2632,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hide dot files",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bHideDotFiles,
+               .offset         = LOCAL_VAR(bHideDotFiles),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3069,7 +2641,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hide special files",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bHideSpecialFiles,
+               .offset         = LOCAL_VAR(bHideSpecialFiles),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3078,7 +2650,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hide unreadable",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bHideUnReadable,
+               .offset         = LOCAL_VAR(bHideUnReadable),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3087,7 +2659,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hide unwriteable files",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bHideUnWriteableFiles,
+               .offset         = LOCAL_VAR(bHideUnWriteableFiles),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3096,7 +2668,7 @@ static struct parm_struct parm_table[] = {
                .label          = "delete veto files",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bDeleteVetoFiles,
+               .offset         = LOCAL_VAR(bDeleteVetoFiles),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3105,7 +2677,7 @@ static struct parm_struct parm_table[] = {
                .label          = "veto files",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szVetoFiles,
+               .offset         = LOCAL_VAR(szVetoFiles),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3114,7 +2686,7 @@ static struct parm_struct parm_table[] = {
                .label          = "hide files",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szHideFiles,
+               .offset         = LOCAL_VAR(szHideFiles),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3123,7 +2695,7 @@ static struct parm_struct parm_table[] = {
                .label          = "veto oplock files",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szVetoOplockFiles,
+               .offset         = LOCAL_VAR(szVetoOplockFiles),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3132,7 +2704,7 @@ static struct parm_struct parm_table[] = {
                .label          = "map archive",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bMap_archive,
+               .offset         = LOCAL_VAR(bMap_archive),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3141,7 +2713,7 @@ static struct parm_struct parm_table[] = {
                .label          = "map hidden",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bMap_hidden,
+               .offset         = LOCAL_VAR(bMap_hidden),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3150,7 +2722,7 @@ static struct parm_struct parm_table[] = {
                .label          = "map system",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bMap_system,
+               .offset         = LOCAL_VAR(bMap_system),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3159,7 +2731,7 @@ static struct parm_struct parm_table[] = {
                .label          = "map readonly",
                .type           = P_ENUM,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iMap_readonly,
+               .offset         = LOCAL_VAR(iMap_readonly),
                .special        = NULL,
                .enum_list      = enum_map_readonly,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3168,7 +2740,7 @@ static struct parm_struct parm_table[] = {
                .label          = "mangled names",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bMangledNames,
+               .offset         = LOCAL_VAR(bMangledNames),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3177,7 +2749,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max stat cache size",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iMaxStatCacheSize,
+               .offset         = GLOBAL_VAR(iMaxStatCacheSize),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3186,7 +2758,7 @@ static struct parm_struct parm_table[] = {
                .label          = "stat cache",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bStatCache,
+               .offset         = GLOBAL_VAR(bStatCache),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3195,7 +2767,7 @@ static struct parm_struct parm_table[] = {
                .label          = "store dos attributes",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bStoreDosAttributes,
+               .offset         = LOCAL_VAR(bStoreDosAttributes),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3204,7 +2776,7 @@ static struct parm_struct parm_table[] = {
                .label          = "dmapi support",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bDmapiSupport,
+               .offset         = LOCAL_VAR(bDmapiSupport),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3217,7 +2789,7 @@ static struct parm_struct parm_table[] = {
                .label          = "machine password timeout",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.machine_password_timeout,
+               .offset         = GLOBAL_VAR(machine_password_timeout),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_WIZARD,
@@ -3229,7 +2801,7 @@ static struct parm_struct parm_table[] = {
                .label          = "add user script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szAddUserScript,
+               .offset         = GLOBAL_VAR(szAddUserScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3238,7 +2810,7 @@ static struct parm_struct parm_table[] = {
                .label          = "rename user script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szRenameUserScript,
+               .offset         = GLOBAL_VAR(szRenameUserScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3247,7 +2819,7 @@ static struct parm_struct parm_table[] = {
                .label          = "delete user script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szDelUserScript,
+               .offset         = GLOBAL_VAR(szDelUserScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3256,7 +2828,7 @@ static struct parm_struct parm_table[] = {
                .label          = "add group script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szAddGroupScript,
+               .offset         = GLOBAL_VAR(szAddGroupScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3265,7 +2837,7 @@ static struct parm_struct parm_table[] = {
                .label          = "delete group script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szDelGroupScript,
+               .offset         = GLOBAL_VAR(szDelGroupScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3274,7 +2846,7 @@ static struct parm_struct parm_table[] = {
                .label          = "add user to group script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szAddUserToGroupScript,
+               .offset         = GLOBAL_VAR(szAddUserToGroupScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3283,7 +2855,7 @@ static struct parm_struct parm_table[] = {
                .label          = "delete user from group script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szDelUserFromGroupScript,
+               .offset         = GLOBAL_VAR(szDelUserFromGroupScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3292,7 +2864,7 @@ static struct parm_struct parm_table[] = {
                .label          = "set primary group script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szSetPrimaryGroupScript,
+               .offset         = GLOBAL_VAR(szSetPrimaryGroupScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3301,7 +2873,7 @@ static struct parm_struct parm_table[] = {
                .label          = "add machine script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szAddMachineScript,
+               .offset         = GLOBAL_VAR(szAddMachineScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3310,7 +2882,7 @@ static struct parm_struct parm_table[] = {
                .label          = "shutdown script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szShutdownScript,
+               .offset         = GLOBAL_VAR(szShutdownScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3319,7 +2891,7 @@ static struct parm_struct parm_table[] = {
                .label          = "abort shutdown script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szAbortShutdownScript,
+               .offset         = GLOBAL_VAR(szAbortShutdownScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3328,7 +2900,7 @@ static struct parm_struct parm_table[] = {
                .label          = "username map script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szUsernameMapScript,
+               .offset         = GLOBAL_VAR(szUsernameMapScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3337,7 +2909,7 @@ static struct parm_struct parm_table[] = {
                .label          = "username map cache time",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iUsernameMapCacheTime,
+               .offset         = GLOBAL_VAR(iUsernameMapCacheTime),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3346,7 +2918,7 @@ static struct parm_struct parm_table[] = {
                .label          = "logon script",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLogonScript,
+               .offset         = GLOBAL_VAR(szLogonScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3355,7 +2927,7 @@ static struct parm_struct parm_table[] = {
                .label          = "logon path",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLogonPath,
+               .offset         = GLOBAL_VAR(szLogonPath),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3364,7 +2936,7 @@ static struct parm_struct parm_table[] = {
                .label          = "logon drive",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLogonDrive,
+               .offset         = GLOBAL_VAR(szLogonDrive),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3373,7 +2945,7 @@ static struct parm_struct parm_table[] = {
                .label          = "logon home",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLogonHome,
+               .offset         = GLOBAL_VAR(szLogonHome),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3382,7 +2954,7 @@ static struct parm_struct parm_table[] = {
                .label          = "domain logons",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bDomainLogons,
+               .offset         = GLOBAL_VAR(bDomainLogons),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3392,7 +2964,7 @@ static struct parm_struct parm_table[] = {
                .label          = "init logon delayed hosts",
                .type           = P_LIST,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szInitLogonDelayedHosts,
+               .offset         = GLOBAL_VAR(szInitLogonDelayedHosts),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3402,7 +2974,7 @@ static struct parm_struct parm_table[] = {
                .label          = "init logon delay",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.InitLogonDelay,
+               .offset         = GLOBAL_VAR(InitLogonDelay),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3415,7 +2987,7 @@ static struct parm_struct parm_table[] = {
                .label          = "os level",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.os_level,
+               .offset         = GLOBAL_VAR(os_level),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED,
@@ -3424,7 +2996,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lm announce",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.lm_announce,
+               .offset         = GLOBAL_VAR(lm_announce),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_ADVANCED,
@@ -3433,7 +3005,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lm interval",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.lm_interval,
+               .offset         = GLOBAL_VAR(lm_interval),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3442,7 +3014,7 @@ static struct parm_struct parm_table[] = {
                .label          = "preferred master",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iPreferredMaster,
+               .offset         = GLOBAL_VAR(iPreferredMaster),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_BASIC | FLAG_ADVANCED,
@@ -3451,7 +3023,7 @@ static struct parm_struct parm_table[] = {
                .label          = "prefered master",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iPreferredMaster,
+               .offset         = GLOBAL_VAR(iPreferredMaster),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_HIDE,
@@ -3460,7 +3032,7 @@ static struct parm_struct parm_table[] = {
                .label          = "local master",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bLocalMaster,
+               .offset         = GLOBAL_VAR(bLocalMaster),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED,
@@ -3469,7 +3041,7 @@ static struct parm_struct parm_table[] = {
                .label          = "domain master",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iDomainMaster,
+               .offset         = GLOBAL_VAR(iDomainMaster),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_BASIC | FLAG_ADVANCED,
@@ -3478,7 +3050,7 @@ static struct parm_struct parm_table[] = {
                .label          = "browse list",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bBrowseList,
+               .offset         = GLOBAL_VAR(bBrowseList),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3487,7 +3059,7 @@ static struct parm_struct parm_table[] = {
                .label          = "browseable",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bBrowseable,
+               .offset         = LOCAL_VAR(bBrowseable),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -3496,7 +3068,7 @@ static struct parm_struct parm_table[] = {
                .label          = "browsable",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bBrowseable,
+               .offset         = LOCAL_VAR(bBrowseable),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -3505,7 +3077,7 @@ static struct parm_struct parm_table[] = {
                .label          = "access based share enum",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bAccessBasedShareEnum,
+               .offset         = LOCAL_VAR(bAccessBasedShareEnum),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE
@@ -3514,7 +3086,7 @@ static struct parm_struct parm_table[] = {
                .label          = "enhanced browsing",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.enhanced_browsing,
+               .offset         = GLOBAL_VAR(enhanced_browsing),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3526,7 +3098,7 @@ static struct parm_struct parm_table[] = {
                .label          = "dns proxy",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bDNSproxy,
+               .offset         = GLOBAL_VAR(bDNSproxy),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3535,7 +3107,7 @@ static struct parm_struct parm_table[] = {
                .label          = "wins proxy",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bWINSproxy,
+               .offset         = GLOBAL_VAR(bWINSproxy),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3544,7 +3116,7 @@ static struct parm_struct parm_table[] = {
                .label          = "wins server",
                .type           = P_LIST,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szWINSservers,
+               .offset         = GLOBAL_VAR(szWINSservers),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
@@ -3553,7 +3125,7 @@ static struct parm_struct parm_table[] = {
                .label          = "wins support",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bWINSsupport,
+               .offset         = GLOBAL_VAR(bWINSsupport),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
@@ -3562,7 +3134,7 @@ static struct parm_struct parm_table[] = {
                .label          = "wins hook",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szWINSHook,
+               .offset         = GLOBAL_VAR(szWINSHook),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3574,7 +3146,7 @@ static struct parm_struct parm_table[] = {
                .label          = "blocking locks",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bBlockingLocks,
+               .offset         = LOCAL_VAR(bBlockingLocks),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3583,7 +3155,7 @@ static struct parm_struct parm_table[] = {
                .label          = "csc policy",
                .type           = P_ENUM,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iCSCPolicy,
+               .offset         = LOCAL_VAR(iCSCPolicy),
                .special        = NULL,
                .enum_list      = enum_csc_policy,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3592,7 +3164,7 @@ static struct parm_struct parm_table[] = {
                .label          = "fake oplocks",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bFakeOplocks,
+               .offset         = LOCAL_VAR(bFakeOplocks),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -3601,7 +3173,7 @@ static struct parm_struct parm_table[] = {
                .label          = "kernel oplocks",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bKernelOplocks,
+               .offset         = GLOBAL_VAR(bKernelOplocks),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -3610,7 +3182,7 @@ static struct parm_struct parm_table[] = {
                .label          = "locking",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bLocking,
+               .offset         = LOCAL_VAR(bLocking),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3619,7 +3191,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lock spin time",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iLockSpinTime,
+               .offset         = GLOBAL_VAR(iLockSpinTime),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -3628,7 +3200,7 @@ static struct parm_struct parm_table[] = {
                .label          = "oplocks",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bOpLocks,
+               .offset         = LOCAL_VAR(bOpLocks),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3637,7 +3209,7 @@ static struct parm_struct parm_table[] = {
                .label          = "level2 oplocks",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bLevel2OpLocks,
+               .offset         = LOCAL_VAR(bLevel2OpLocks),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3646,7 +3218,7 @@ static struct parm_struct parm_table[] = {
                .label          = "oplock break wait time",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.oplock_break_wait_time,
+               .offset         = GLOBAL_VAR(oplock_break_wait_time),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -3655,7 +3227,7 @@ static struct parm_struct parm_table[] = {
                .label          = "oplock contention limit",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iOplockContentionLimit,
+               .offset         = LOCAL_VAR(iOplockContentionLimit),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3664,7 +3236,7 @@ static struct parm_struct parm_table[] = {
                .label          = "posix locking",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bPosixLocking,
+               .offset         = LOCAL_VAR(bPosixLocking),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3673,7 +3245,7 @@ static struct parm_struct parm_table[] = {
                .label          = "strict locking",
                .type           = P_ENUM,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iStrictLocking,
+               .offset         = LOCAL_VAR(iStrictLocking),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -3682,7 +3254,7 @@ static struct parm_struct parm_table[] = {
                .label          = "share modes",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bShareModes,
+               .offset         = LOCAL_VAR(bShareModes),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL | FLAG_DEPRECATED,
@@ -3694,7 +3266,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap admin dn",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLdapAdminDn,
+               .offset         = GLOBAL_VAR(szLdapAdminDn),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3703,7 +3275,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap delete dn",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ldap_delete_dn,
+               .offset         = GLOBAL_VAR(ldap_delete_dn),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3712,7 +3284,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap group suffix",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLdapGroupSuffix,
+               .offset         = GLOBAL_VAR(szLdapGroupSuffix),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3721,7 +3293,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap idmap suffix",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLdapIdmapSuffix,
+               .offset         = GLOBAL_VAR(szLdapIdmapSuffix),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3730,7 +3302,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap machine suffix",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLdapMachineSuffix,
+               .offset         = GLOBAL_VAR(szLdapMachineSuffix),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3739,7 +3311,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap passwd sync",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ldap_passwd_sync,
+               .offset         = GLOBAL_VAR(ldap_passwd_sync),
                .special        = NULL,
                .enum_list      = enum_ldap_passwd_sync,
                .flags          = FLAG_ADVANCED,
@@ -3748,7 +3320,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap password sync",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ldap_passwd_sync,
+               .offset         = GLOBAL_VAR(ldap_passwd_sync),
                .special        = NULL,
                .enum_list      = enum_ldap_passwd_sync,
                .flags          = FLAG_HIDE,
@@ -3757,7 +3329,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap replication sleep",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ldap_replication_sleep,
+               .offset         = GLOBAL_VAR(ldap_replication_sleep),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3766,7 +3338,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap suffix",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLdapSuffix,
+               .offset         = GLOBAL_VAR(szLdapSuffix),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3775,7 +3347,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap ssl",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ldap_ssl,
+               .offset         = GLOBAL_VAR(ldap_ssl),
                .special        = NULL,
                .enum_list      = enum_ldap_ssl,
                .flags          = FLAG_ADVANCED,
@@ -3784,7 +3356,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap ssl ads",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ldap_ssl_ads,
+               .offset         = GLOBAL_VAR(ldap_ssl_ads),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3793,7 +3365,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap deref",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ldap_deref,
+               .offset         = GLOBAL_VAR(ldap_deref),
                .special        = NULL,
                .enum_list      = enum_ldap_deref,
                .flags          = FLAG_ADVANCED,
@@ -3802,7 +3374,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap follow referral",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ldap_follow_referral,
+               .offset         = GLOBAL_VAR(ldap_follow_referral),
                .special        = NULL,
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_ADVANCED,
@@ -3811,7 +3383,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap timeout",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ldap_timeout,
+               .offset         = GLOBAL_VAR(ldap_timeout),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3820,7 +3392,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap connection timeout",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ldap_connection_timeout,
+               .offset         = GLOBAL_VAR(ldap_connection_timeout),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3829,7 +3401,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap page size",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ldap_page_size,
+               .offset         = GLOBAL_VAR(ldap_page_size),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3838,7 +3410,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap user suffix",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLdapUserSuffix,
+               .offset         = GLOBAL_VAR(szLdapUserSuffix),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3847,7 +3419,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap debug level",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ldap_debug_level,
+               .offset         = GLOBAL_VAR(ldap_debug_level),
                .special        = handle_ldap_debug_level,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3856,7 +3428,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap debug threshold",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ldap_debug_threshold,
+               .offset         = GLOBAL_VAR(ldap_debug_threshold),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3868,7 +3440,7 @@ static struct parm_struct parm_table[] = {
                .label          = "eventlog list",
                .type           = P_LIST,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szEventLogs,
+               .offset         = GLOBAL_VAR(szEventLogs),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -3880,7 +3452,7 @@ static struct parm_struct parm_table[] = {
                .label          = "add share command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szAddShareCommand,
+               .offset         = GLOBAL_VAR(szAddShareCommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3889,7 +3461,7 @@ static struct parm_struct parm_table[] = {
                .label          = "change share command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szChangeShareCommand,
+               .offset         = GLOBAL_VAR(szChangeShareCommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3898,7 +3470,7 @@ static struct parm_struct parm_table[] = {
                .label          = "delete share command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szDeleteShareCommand,
+               .offset         = GLOBAL_VAR(szDeleteShareCommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3907,7 +3479,7 @@ static struct parm_struct parm_table[] = {
                .label          = "config file",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szConfigFile,
+               .offset         = GLOBAL_VAR(szConfigFile),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE|FLAG_META,
@@ -3916,7 +3488,7 @@ static struct parm_struct parm_table[] = {
                .label          = "preload",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szAutoServices,
+               .offset         = GLOBAL_VAR(szAutoServices),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3925,7 +3497,7 @@ static struct parm_struct parm_table[] = {
                .label          = "auto services",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szAutoServices,
+               .offset         = GLOBAL_VAR(szAutoServices),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3934,7 +3506,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lock directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLockDir,
+               .offset         = GLOBAL_VAR(szLockDir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3943,7 +3515,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lock dir",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLockDir,
+               .offset         = GLOBAL_VAR(szLockDir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -3952,7 +3524,7 @@ static struct parm_struct parm_table[] = {
                .label          = "state directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szStateDir,
+               .offset         = GLOBAL_VAR(szStateDir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3961,7 +3533,7 @@ static struct parm_struct parm_table[] = {
                .label          = "cache directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szCacheDir,
+               .offset         = GLOBAL_VAR(szCacheDir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3970,7 +3542,7 @@ static struct parm_struct parm_table[] = {
                .label          = "pid directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szPidDir,
+               .offset         = GLOBAL_VAR(szPidDir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3980,7 +3552,7 @@ static struct parm_struct parm_table[] = {
                .label          = "utmp directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szUtmpDir,
+               .offset         = GLOBAL_VAR(szUtmpDir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3989,7 +3561,7 @@ static struct parm_struct parm_table[] = {
                .label          = "wtmp directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szWtmpDir,
+               .offset         = GLOBAL_VAR(szWtmpDir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3998,7 +3570,7 @@ static struct parm_struct parm_table[] = {
                .label          = "utmp",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bUtmp,
+               .offset         = GLOBAL_VAR(bUtmp),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4008,7 +3580,7 @@ static struct parm_struct parm_table[] = {
                .label          = "default service",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szDefaultService,
+               .offset         = GLOBAL_VAR(szDefaultService),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4017,7 +3589,7 @@ static struct parm_struct parm_table[] = {
                .label          = "default",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szDefaultService,
+               .offset         = GLOBAL_VAR(szDefaultService),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4026,7 +3598,7 @@ static struct parm_struct parm_table[] = {
                .label          = "message command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szMsgCommand,
+               .offset         = GLOBAL_VAR(szMsgCommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4035,7 +3607,7 @@ static struct parm_struct parm_table[] = {
                .label          = "dfree cache time",
                .type           = P_INTEGER,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.iDfreeCacheTime,
+               .offset         = LOCAL_VAR(iDfreeCacheTime),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4044,7 +3616,7 @@ static struct parm_struct parm_table[] = {
                .label          = "dfree command",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szDfree,
+               .offset         = LOCAL_VAR(szDfree),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4053,7 +3625,7 @@ static struct parm_struct parm_table[] = {
                .label          = "get quota command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szGetQuota,
+               .offset         = GLOBAL_VAR(szGetQuota),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4062,7 +3634,7 @@ static struct parm_struct parm_table[] = {
                .label          = "set quota command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szSetQuota,
+               .offset         = GLOBAL_VAR(szSetQuota),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4071,7 +3643,7 @@ static struct parm_struct parm_table[] = {
                .label          = "remote announce",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szRemoteAnnounce,
+               .offset         = GLOBAL_VAR(szRemoteAnnounce),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4080,7 +3652,7 @@ static struct parm_struct parm_table[] = {
                .label          = "remote browse sync",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szRemoteBrowseSync,
+               .offset         = GLOBAL_VAR(szRemoteBrowseSync),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4089,7 +3661,7 @@ static struct parm_struct parm_table[] = {
                .label          = "socket address",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szSocketAddress,
+               .offset         = GLOBAL_VAR(szSocketAddress),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4098,7 +3670,7 @@ static struct parm_struct parm_table[] = {
                .label          = "nmbd bind explicit broadcast",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bNmbdBindExplicitBroadcast,
+               .offset         = GLOBAL_VAR(bNmbdBindExplicitBroadcast),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4107,7 +3679,7 @@ static struct parm_struct parm_table[] = {
                .label          = "homedir map",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szNISHomeMapName,
+               .offset         = GLOBAL_VAR(szNISHomeMapName),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4116,7 +3688,7 @@ static struct parm_struct parm_table[] = {
                .label          = "afs username map",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szAfsUsernameMap,
+               .offset         = GLOBAL_VAR(szAfsUsernameMap),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4125,7 +3697,7 @@ static struct parm_struct parm_table[] = {
                .label          = "afs token lifetime",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iAfsTokenLifetime,
+               .offset         = GLOBAL_VAR(iAfsTokenLifetime),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4134,16 +3706,7 @@ static struct parm_struct parm_table[] = {
                .label          = "log nt token command",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szLogNtTokenCommand,
-               .special        = NULL,
-               .enum_list      = NULL,
-               .flags          = FLAG_ADVANCED,
-       },
-       {
-               .label          = "time offset",
-               .type           = P_INTEGER,
-               .p_class        = P_GLOBAL,
-               .ptr            = &extra_time_offset,
+               .offset         = GLOBAL_VAR(szLogNtTokenCommand),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4152,7 +3715,7 @@ static struct parm_struct parm_table[] = {
                .label          = "NIS homedir",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bNISHomeMap,
+               .offset         = GLOBAL_VAR(bNISHomeMap),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4161,7 +3724,7 @@ static struct parm_struct parm_table[] = {
                .label          = "-valid",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.valid,
+               .offset         = LOCAL_VAR(valid),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -4170,7 +3733,7 @@ static struct parm_struct parm_table[] = {
                .label          = "copy",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szCopy,
+               .offset         = LOCAL_VAR(szCopy),
                .special        = handle_copy,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -4179,7 +3742,7 @@ static struct parm_struct parm_table[] = {
                .label          = "include",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szInclude,
+               .offset         = LOCAL_VAR(szInclude),
                .special        = handle_include,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE|FLAG_META,
@@ -4188,7 +3751,7 @@ static struct parm_struct parm_table[] = {
                .label          = "preexec",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szPreExec,
+               .offset         = LOCAL_VAR(szPreExec),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -4197,7 +3760,7 @@ static struct parm_struct parm_table[] = {
                .label          = "exec",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szPreExec,
+               .offset         = LOCAL_VAR(szPreExec),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4206,7 +3769,7 @@ static struct parm_struct parm_table[] = {
                .label          = "preexec close",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bPreexecClose,
+               .offset         = LOCAL_VAR(bPreexecClose),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -4215,7 +3778,7 @@ static struct parm_struct parm_table[] = {
                .label          = "postexec",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szPostExec,
+               .offset         = LOCAL_VAR(szPostExec),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -4224,7 +3787,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root preexec",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szRootPreExec,
+               .offset         = LOCAL_VAR(szRootPreExec),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -4233,7 +3796,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root preexec close",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bRootpreexecClose,
+               .offset         = LOCAL_VAR(bRootpreexecClose),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -4242,7 +3805,7 @@ static struct parm_struct parm_table[] = {
                .label          = "root postexec",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szRootPostExec,
+               .offset         = LOCAL_VAR(szRootPostExec),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -4251,7 +3814,7 @@ static struct parm_struct parm_table[] = {
                .label          = "available",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bAvailable,
+               .offset         = LOCAL_VAR(bAvailable),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@@ -4260,7 +3823,7 @@ static struct parm_struct parm_table[] = {
                .label          = "registry shares",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bRegistryShares,
+               .offset         = GLOBAL_VAR(bRegistryShares),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4269,7 +3832,7 @@ static struct parm_struct parm_table[] = {
                .label          = "usershare allow guests",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bUsershareAllowGuests,
+               .offset         = GLOBAL_VAR(bUsershareAllowGuests),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4278,7 +3841,7 @@ static struct parm_struct parm_table[] = {
                .label          = "usershare max shares",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iUsershareMaxShares,
+               .offset         = GLOBAL_VAR(iUsershareMaxShares),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4287,7 +3850,7 @@ static struct parm_struct parm_table[] = {
                .label          = "usershare owner only",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bUsershareOwnerOnly,
+               .offset         = GLOBAL_VAR(bUsershareOwnerOnly),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4296,7 +3859,7 @@ static struct parm_struct parm_table[] = {
                .label          = "usershare path",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szUsersharePath,
+               .offset         = GLOBAL_VAR(szUsersharePath),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4305,7 +3868,7 @@ static struct parm_struct parm_table[] = {
                .label          = "usershare prefix allow list",
                .type           = P_LIST,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szUsersharePrefixAllowList,
+               .offset         = GLOBAL_VAR(szUsersharePrefixAllowList),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4314,7 +3877,7 @@ static struct parm_struct parm_table[] = {
                .label          = "usershare prefix deny list",
                .type           = P_LIST,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szUsersharePrefixDenyList,
+               .offset         = GLOBAL_VAR(szUsersharePrefixDenyList),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4323,7 +3886,7 @@ static struct parm_struct parm_table[] = {
                .label          = "usershare template share",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szUsershareTemplateShare,
+               .offset         = GLOBAL_VAR(szUsershareTemplateShare),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4332,7 +3895,7 @@ static struct parm_struct parm_table[] = {
                .label          = "volume",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.volume,
+               .offset         = LOCAL_VAR(volume),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -4341,7 +3904,7 @@ static struct parm_struct parm_table[] = {
                .label          = "fstype",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.fstype,
+               .offset         = LOCAL_VAR(fstype),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -4350,7 +3913,7 @@ static struct parm_struct parm_table[] = {
                .label          = "set directory",
                .type           = P_BOOLREV,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bNo_set_dir,
+               .offset         = LOCAL_VAR(bNo_set_dir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -4359,7 +3922,7 @@ static struct parm_struct parm_table[] = {
                .label          = "wide links",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bWidelinks,
+               .offset         = LOCAL_VAR(bWidelinks),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -4368,7 +3931,7 @@ static struct parm_struct parm_table[] = {
                .label          = "follow symlinks",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bSymlinks,
+               .offset         = LOCAL_VAR(bSymlinks),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -4377,7 +3940,7 @@ static struct parm_struct parm_table[] = {
                .label          = "dont descend",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szDontdescend,
+               .offset         = LOCAL_VAR(szDontdescend),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -4386,7 +3949,7 @@ static struct parm_struct parm_table[] = {
                .label          = "magic script",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szMagicScript,
+               .offset         = LOCAL_VAR(szMagicScript),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -4395,7 +3958,7 @@ static struct parm_struct parm_table[] = {
                .label          = "magic output",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szMagicOutput,
+               .offset         = LOCAL_VAR(szMagicOutput),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -4404,7 +3967,7 @@ static struct parm_struct parm_table[] = {
                .label          = "delete readonly",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bDeleteReadonly,
+               .offset         = LOCAL_VAR(bDeleteReadonly),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -4413,7 +3976,7 @@ static struct parm_struct parm_table[] = {
                .label          = "dos filemode",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bDosFilemode,
+               .offset         = LOCAL_VAR(bDosFilemode),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -4422,7 +3985,7 @@ static struct parm_struct parm_table[] = {
                .label          = "dos filetimes",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bDosFiletimes,
+               .offset         = LOCAL_VAR(bDosFiletimes),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -4431,7 +3994,7 @@ static struct parm_struct parm_table[] = {
                .label          = "dos filetime resolution",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bDosFiletimeResolution,
+               .offset         = LOCAL_VAR(bDosFiletimeResolution),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
@@ -4440,7 +4003,7 @@ static struct parm_struct parm_table[] = {
                .label          = "fake directory create times",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bFakeDirCreateTimes,
+               .offset         = LOCAL_VAR(bFakeDirCreateTimes),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -4449,7 +4012,7 @@ static struct parm_struct parm_table[] = {
                .label          = "async smb echo handler",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bAsyncSMBEchoHandler,
+               .offset         = GLOBAL_VAR(bAsyncSMBEchoHandler),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -4458,7 +4021,7 @@ static struct parm_struct parm_table[] = {
                .label          = "multicast dns register",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bMulticastDnsRegister,
+               .offset         = GLOBAL_VAR(bMulticastDnsRegister),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,
@@ -4467,7 +4030,7 @@ static struct parm_struct parm_table[] = {
                .label          = "panic action",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szPanicAction,
+               .offset         = GLOBAL_VAR(szPanicAction),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4476,7 +4039,7 @@ static struct parm_struct parm_table[] = {
                .label          = "perfcount module",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szSMBPerfcountModule,
+               .offset         = GLOBAL_VAR(szSMBPerfcountModule),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4488,7 +4051,7 @@ static struct parm_struct parm_table[] = {
                .label          = "vfs objects",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szVfsObjects,
+               .offset         = LOCAL_VAR(szVfsObjects),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -4497,7 +4060,7 @@ static struct parm_struct parm_table[] = {
                .label          = "vfs object",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szVfsObjects,
+               .offset         = LOCAL_VAR(szVfsObjects),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -4510,7 +4073,7 @@ static struct parm_struct parm_table[] = {
                .label          = "msdfs root",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.bMSDfsRoot,
+               .offset         = LOCAL_VAR(bMSDfsRoot),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -4519,7 +4082,7 @@ static struct parm_struct parm_table[] = {
                .label          = "msdfs proxy",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .ptr            = &sDefault.szMSDfsProxy,
+               .offset         = LOCAL_VAR(szMSDfsProxy),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
@@ -4528,7 +4091,7 @@ static struct parm_struct parm_table[] = {
                .label          = "host msdfs",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bHostMSDfs,
+               .offset         = GLOBAL_VAR(bHostMSDfs),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4540,7 +4103,7 @@ static struct parm_struct parm_table[] = {
                .label          = "passdb expand explicit",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bPassdbExpandExplicit,
+               .offset         = GLOBAL_VAR(bPassdbExpandExplicit),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4549,7 +4112,7 @@ static struct parm_struct parm_table[] = {
                .label          = "idmap backend",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szIdmapBackend,
+               .offset         = GLOBAL_VAR(szIdmapBackend),
                .special        = handle_idmap_backend,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
@@ -4558,7 +4121,7 @@ static struct parm_struct parm_table[] = {
                .label          = "idmap cache time",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iIdmapCacheTime,
+               .offset         = GLOBAL_VAR(iIdmapCacheTime),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4567,7 +4130,7 @@ static struct parm_struct parm_table[] = {
                .label          = "idmap negative cache time",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.iIdmapNegativeCacheTime,
+               .offset         = GLOBAL_VAR(iIdmapNegativeCacheTime),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4576,7 +4139,7 @@ static struct parm_struct parm_table[] = {
                .label          = "idmap uid",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szIdmapUID,
+               .offset         = GLOBAL_VAR(szIdmapUID),
                .special        = handle_idmap_uid,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
@@ -4585,7 +4148,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind uid",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szIdmapUID,
+               .offset         = GLOBAL_VAR(szIdmapUID),
                .special        = handle_idmap_uid,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -4594,7 +4157,7 @@ static struct parm_struct parm_table[] = {
                .label          = "idmap gid",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szIdmapGID,
+               .offset         = GLOBAL_VAR(szIdmapGID),
                .special        = handle_idmap_gid,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_DEPRECATED,
@@ -4603,7 +4166,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind gid",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szIdmapGID,
+               .offset         = GLOBAL_VAR(szIdmapGID),
                .special        = handle_idmap_gid,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,
@@ -4612,7 +4175,7 @@ static struct parm_struct parm_table[] = {
                .label          = "template homedir",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szTemplateHomedir,
+               .offset         = GLOBAL_VAR(szTemplateHomedir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4621,7 +4184,7 @@ static struct parm_struct parm_table[] = {
                .label          = "template shell",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szTemplateShell,
+               .offset         = GLOBAL_VAR(szTemplateShell),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4630,7 +4193,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind separator",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szWinbindSeparator,
+               .offset         = GLOBAL_VAR(szWinbindSeparator),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4639,7 +4202,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind cache time",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.winbind_cache_time,
+               .offset         = GLOBAL_VAR(winbind_cache_time),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4648,7 +4211,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind reconnect delay",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.winbind_reconnect_delay,
+               .offset         = GLOBAL_VAR(winbind_reconnect_delay),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4657,7 +4220,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind max clients",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.winbind_max_clients,
+               .offset         = GLOBAL_VAR(winbind_max_clients),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4666,7 +4229,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind enum users",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bWinbindEnumUsers,
+               .offset         = GLOBAL_VAR(bWinbindEnumUsers),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4675,7 +4238,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind enum groups",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bWinbindEnumGroups,
+               .offset         = GLOBAL_VAR(bWinbindEnumGroups),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4684,7 +4247,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind use default domain",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bWinbindUseDefaultDomain,
+               .offset         = GLOBAL_VAR(bWinbindUseDefaultDomain),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4693,7 +4256,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind trusted domains only",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bWinbindTrustedDomainsOnly,
+               .offset         = GLOBAL_VAR(bWinbindTrustedDomainsOnly),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4702,7 +4265,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind nested groups",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bWinbindNestedGroups,
+               .offset         = GLOBAL_VAR(bWinbindNestedGroups),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4711,7 +4274,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind expand groups",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.winbind_expand_groups,
+               .offset         = GLOBAL_VAR(winbind_expand_groups),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4720,7 +4283,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind nss info",
                .type           = P_LIST,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.szWinbindNssInfo,
+               .offset         = GLOBAL_VAR(szWinbindNssInfo),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4729,7 +4292,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind refresh tickets",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bWinbindRefreshTickets,
+               .offset         = GLOBAL_VAR(bWinbindRefreshTickets),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4738,7 +4301,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind offline logon",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bWinbindOfflineLogon,
+               .offset         = GLOBAL_VAR(bWinbindOfflineLogon),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4747,7 +4310,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind normalize names",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bWinbindNormalizeNames,
+               .offset         = GLOBAL_VAR(bWinbindNormalizeNames),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4756,7 +4319,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind rpc only",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bWinbindRpcOnly,
+               .offset         = GLOBAL_VAR(bWinbindRpcOnly),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4765,7 +4328,7 @@ static struct parm_struct parm_table[] = {
                .label          = "create krb5 conf",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.bCreateKrb5Conf,
+               .offset         = GLOBAL_VAR(bCreateKrb5Conf),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4774,7 +4337,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ncalrpc dir",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ncalrpc_dir,
+               .offset         = GLOBAL_VAR(ncalrpc_dir),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4783,20 +4346,20 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind max domain connections",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .ptr            = &Globals.winbindMaxDomainConnections,
+               .offset         = GLOBAL_VAR(winbindMaxDomainConnections),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
        },
 
-       {NULL,  P_BOOL,  P_NONE,  NULL,  NULL,  NULL,  0}
+       {NULL,  P_BOOL,  P_NONE,  0,  NULL,  NULL,  0}
 };
 
 /***************************************************************************
  Initialise the sDefault parameter structure for the printer values.
 ***************************************************************************/
 
-static void init_printer_values(struct service *pService)
+static void init_printer_values(struct loadparm_service *pService)
 {
        /* choose defaults depending on the type of printing */
        switch (pService->iPrinting) {
@@ -4998,7 +4561,7 @@ static void free_one_parameter_common(void *parm_ptr,
  * Free the allocated data for one parameter for a share
  * given as a service struct.
  */
-static void free_one_parameter(struct service *service,
+static void free_one_parameter(struct loadparm_service *service,
                               struct parm_struct parm)
 {
        void *parm_ptr;
@@ -5007,7 +4570,7 @@ static void free_one_parameter(struct service *service,
                return;
        }
 
-       parm_ptr = lp_local_ptr(service, parm.ptr);
+       parm_ptr = lp_parm_ptr(service, &parm);
 
        free_one_parameter_common(parm_ptr, parm);
 }
@@ -5016,7 +4579,7 @@ static void free_one_parameter(struct service *service,
  * Free the allocated parameter data of a share given
  * as a service struct.
  */
-static void free_parameters(struct service *service)
+static void free_parameters(struct loadparm_service *service)
 {
        uint32_t i;
 
@@ -5033,16 +4596,12 @@ static void free_one_parameter_by_snum(int snum, struct parm_struct parm)
 {
        void *parm_ptr;
 
-       if (parm.ptr == NULL) {
-               return;
-       }
-
        if (snum < 0) {
-               parm_ptr = parm.ptr;
+               parm_ptr = lp_parm_ptr(NULL, &parm);
        } else if (parm.p_class != P_LOCAL) {
                return;
        } else {
-               parm_ptr = lp_local_ptr_by_snum(snum, parm.ptr);
+               parm_ptr = lp_local_ptr_by_snum(snum, &parm);
        }
 
        free_one_parameter_common(parm_ptr, parm);
@@ -5137,7 +4696,7 @@ static bool apply_lp_set_cmdline(void)
 
 static void init_globals(bool reinit_globals)
 {
-       static bool done_init = False;
+       static bool done_init = false;
        char *s = NULL;
        int i;
 
@@ -5153,7 +4712,7 @@ static void init_globals(bool reinit_globals)
                        string_free(&Globals.szLogFile);
                        Globals.szLogFile = NULL;
                }
-               done_init = True;
+               done_init = true;
        } else {
                free_global_parameters();
        }
@@ -5166,13 +4725,13 @@ static void init_globals(bool reinit_globals)
 
        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].type == P_USTRING))
                {
-                       string_set((char **)parm_table[i].ptr, "");
+                       string_set(lp_parm_ptr(NULL, &parm_table[i]), "");
                }
        }
 
+
        string_set(&sDefault.fstype, FSTYPE_STRING);
        string_set(&sDefault.szPrintjobUsername, "%U");
 
@@ -5181,6 +4740,9 @@ static void init_globals(bool reinit_globals)
 
        DEBUG(3, ("Initialising global parameters\n"));
 
+       /* Must manually force to upper case here, as this does not go via the handler */
+       string_set(&Globals.szNetbiosName, myhostname_upper());
+
        string_set(&Globals.szSMBPasswdFile, get_dyn_SMB_PASSWD_FILE());
        string_set(&Globals.szPrivateDir, get_dyn_PRIVATE_DIR());
 
@@ -5193,14 +4755,6 @@ static void init_globals(bool reinit_globals)
        /* using UTF8 by default allows us to support all chars */
        string_set(&Globals.unix_charset, DEFAULT_UNIX_CHARSET);
 
-#if defined(HAVE_NL_LANGINFO) && defined(CODESET)
-       /* If the system supports nl_langinfo(), try to grab the value
-          from the user's locale */
-       string_set(&Globals.display_charset, "LOCALE");
-#else
-       string_set(&Globals.display_charset, DEFAULT_DISPLAY_CHARSET);
-#endif
-
        /* Use codepage 850 as a default for the dos character set */
        string_set(&Globals.dos_charset, DEFAULT_DOS_CHARSET);
 
@@ -5209,11 +4763,7 @@ static void init_globals(bool reinit_globals)
         */
        string_set(&Globals.szPasswdChat, DEFAULT_PASSWD_CHAT);
 
-       set_global_myname(myhostname());
-       string_set(&Globals.szNetbiosName,global_myname());
-
-       set_global_myworkgroup(WORKGROUP);
-       string_set(&Globals.szWorkgroup, lp_workgroup());
+       string_set(&Globals.szWorkgroup, DEFAULT_WORKGROUP);
 
        string_set(&Globals.szPasswdProgram, "");
        string_set(&Globals.szLockDir, get_dyn_LOCKDIR());
@@ -5232,12 +4782,6 @@ static void init_globals(bool reinit_globals)
        }
        string_set(&Globals.szServerString, s);
        SAFE_FREE(s);
-       if (asprintf(&s, "%d.%d", DEFAULT_MAJOR_VERSION,
-                       DEFAULT_MINOR_VERSION) < 0) {
-               smb_panic("init_globals: ENOMEM");
-       }
-       string_set(&Globals.szAnnounceVersion, s);
-       SAFE_FREE(s);
 #ifdef DEVELOPER
        string_set(&Globals.szPanicAction, "/bin/sleep 999999999");
 #endif
@@ -5254,7 +4798,7 @@ static void init_globals(bool reinit_globals)
 
        Globals.AlgorithmicRidBase = BASE_RID;
 
-       Globals.bLoadPrinters = True;
+       Globals.bLoadPrinters = true;
        Globals.PrintcapCacheTime = 750;        /* 12.5 minutes */
 
        Globals.ConfigBackend = config_backend;
@@ -5264,69 +4808,67 @@ static void init_globals(bool reinit_globals)
        Globals.max_xmit = 0x4104;
        Globals.max_mux = 50;   /* This is *needed* for profile support. */
        Globals.lpqcachetime = 30;      /* changed to handle large print servers better -- jerry */
-       Globals.bDisableSpoolss = False;
+       Globals.bDisableSpoolss = false;
        Globals.iMaxSmbdProcesses = 0;/* no limit specified */
        Globals.pwordlevel = 0;
        Globals.unamelevel = 0;
        Globals.deadtime = 0;
        Globals.getwd_cache = true;
-       Globals.bLargeReadwrite = True;
+       Globals.bLargeReadwrite = true;
        Globals.max_log_size = 5000;
        Globals.max_open_files = max_open_files();
        Globals.open_files_db_hash_size = SMB_OPEN_DATABASE_TDB_HASH_SIZE;
        Globals.maxprotocol = PROTOCOL_NT1;
        Globals.minprotocol = PROTOCOL_CORE;
        Globals.security = SEC_USER;
-       Globals.paranoid_server_security = True;
-       Globals.bEncryptPasswords = True;
-       Globals.bUpdateEncrypt = False;
+       Globals.paranoid_server_security = true;
+       Globals.bEncryptPasswords = true;
        Globals.clientSchannel = Auto;
        Globals.serverSchannel = Auto;
-       Globals.bReadRaw = True;
-       Globals.bWriteRaw = True;
-       Globals.bNullPasswords = False;
-       Globals.bObeyPamRestrictions = False;
+       Globals.bReadRaw = true;
+       Globals.bWriteRaw = true;
+       Globals.bNullPasswords = false;
+       Globals.bObeyPamRestrictions = false;
        Globals.syslog = 1;
-       Globals.bSyslogOnly = False;
-       Globals.bTimestampLogs = True;
+       Globals.bSyslogOnly = false;
+       Globals.bTimestampLogs = true;
        string_set(&Globals.szLogLevel, "0");
-       Globals.bDebugPrefixTimestamp = False;
+       Globals.bDebugPrefixTimestamp = false;
        Globals.bDebugHiresTimestamp = true;
-       Globals.bDebugPid = False;
-       Globals.bDebugUid = False;
-       Globals.bDebugClass = False;
-       Globals.bEnableCoreFiles = True;
+       Globals.bDebugPid = false;
+       Globals.bDebugUid = false;
+       Globals.bDebugClass = false;
+       Globals.bEnableCoreFiles = true;
        Globals.max_ttl = 60 * 60 * 24 * 3;     /* 3 days default. */
        Globals.max_wins_ttl = 60 * 60 * 24 * 6;        /* 6 days default. */
        Globals.min_wins_ttl = 60 * 60 * 6;     /* 6 hours default. */
        Globals.machine_password_timeout = 60 * 60 * 24 * 7;    /* 7 days default. */
        Globals.lm_announce = 2;        /* = Auto: send only if LM clients found */
        Globals.lm_interval = 60;
-       Globals.announce_as = ANNOUNCE_AS_NT_SERVER;
 #if (defined(HAVE_NETGROUP) && defined(WITH_AUTOMOUNT))
-       Globals.bNISHomeMap = False;
+       Globals.bNISHomeMap = false;
 #ifdef WITH_NISPLUS_HOME
        string_set(&Globals.szNISHomeMapName, "auto_home.org_dir");
 #else
        string_set(&Globals.szNISHomeMapName, "auto.home");
 #endif
 #endif
-       Globals.bTimeServer = False;
-       Globals.bBindInterfacesOnly = False;
-       Globals.bUnixPasswdSync = False;
-       Globals.bPamPasswordChange = False;
-       Globals.bPasswdChatDebug = False;
+       Globals.bTimeServer = false;
+       Globals.bBindInterfacesOnly = false;
+       Globals.bUnixPasswdSync = false;
+       Globals.bPamPasswordChange = false;
+       Globals.bPasswdChatDebug = false;
        Globals.iPasswdChatTimeout = 2; /* 2 second default. */
-       Globals.bNTPipeSupport = True;  /* Do NT pipes by default. */
-       Globals.bNTStatusSupport = True; /* Use NT status by default. */
-       Globals.bStatCache = True;      /* use stat cache by default */
+       Globals.bNTPipeSupport = true;  /* Do NT pipes by default. */
+       Globals.bNTStatusSupport = true; /* Use NT status by default. */
+       Globals.bStatCache = true;      /* use stat cache by default */
        Globals.iMaxStatCacheSize = 256; /* 256k by default */
        Globals.restrict_anonymous = 0;
-       Globals.bClientLanManAuth = False;      /* Do NOT use the LanMan hash if it is available */
-       Globals.bClientPlaintextAuth = False;   /* Do NOT use a plaintext password even if is requested by the server */
-       Globals.bLanmanAuth = False;    /* Do NOT use the LanMan hash, even if it is supplied */
-       Globals.bNTLMAuth = True;       /* Do use NTLMv1 if it is supplied by the client (otherwise NTLMv2) */
-       Globals.bClientNTLMv2Auth = True; /* Client should always use use NTLMv2, as we can't tell that the server supports it, but most modern servers do */
+       Globals.bClientLanManAuth = false;      /* Do NOT use the LanMan hash if it is available */
+       Globals.bClientPlaintextAuth = false;   /* Do NOT use a plaintext password even if is requested by the server */
+       Globals.bLanmanAuth = false;    /* Do NOT use the LanMan hash, even if it is supplied */
+       Globals.bNTLMAuth = true;       /* Do use NTLMv1 if it is supplied by the client (otherwise NTLMv2) */
+       Globals.bClientNTLMv2Auth = true; /* Client should always use use NTLMv2, as we can't tell that the server supports it, but most modern servers do */
        /* Note, that we will also use NTLM2 session security (which is different), if it is available */
 
        Globals.map_to_guest = 0;       /* By Default, "Never" */
@@ -5334,19 +4876,19 @@ static void init_globals(bool reinit_globals)
        Globals.enhanced_browsing = true;
        Globals.iLockSpinTime = WINDOWS_MINIMUM_LOCK_TIMEOUT_MS; /* msec. */
 #ifdef MMAP_BLACKLIST
-       Globals.bUseMmap = False;
+       Globals.bUseMmap = false;
 #else
-       Globals.bUseMmap = True;
+       Globals.bUseMmap = true;
 #endif
-       Globals.bUnixExtensions = True;
-       Globals.bResetOnZeroVC = False;
-       Globals.bLogWriteableFilesOnExit = False;
+       Globals.bUnixExtensions = true;
+       Globals.bResetOnZeroVC = false;
+       Globals.bLogWriteableFilesOnExit = false;
        Globals.bCreateKrb5Conf = true;
        Globals.winbindMaxDomainConnections = 1;
 
        /* hostname lookups can be very expensive and are broken on
           a large number of sites (tridge) */
-       Globals.bHostnameLookups = False;
+       Globals.bHostnameLookups = false;
 
        string_set(&Globals.szPassdbBackend, "tdbsam");
        string_set(&Globals.szLdapSuffix, "");
@@ -5357,10 +4899,10 @@ static void init_globals(bool reinit_globals)
 
        string_set(&Globals.szLdapAdminDn, "");
        Globals.ldap_ssl = LDAP_SSL_START_TLS;
-       Globals.ldap_ssl_ads = False;
+       Globals.ldap_ssl_ads = false;
        Globals.ldap_deref = -1;
        Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
-       Globals.ldap_delete_dn = False;
+       Globals.ldap_delete_dn = false;
        Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */
        Globals.ldap_follow_referral = Auto;
        Globals.ldap_timeout = LDAP_DEFAULT_TIMEOUT;
@@ -5380,34 +4922,33 @@ static void init_globals(bool reinit_globals)
    for the increasing samba install base:
 
    as a member of the workgroup, that will possibly become a
-   _local_ master browser (lm = True).  this is opposed to a forced
-   local master browser startup (pm = True).
+   _local_ master browser (lm = true).  this is opposed to a forced
+   local master browser startup (pm = true).
 
-   doesn't provide WINS server service by default (wsupp = False),
+   doesn't provide WINS server service by default (wsupp = false),
    and doesn't provide domain master browser services by default, either.
 
 */
 
-       Globals.bMsAddPrinterWizard = True;
+       Globals.bMsAddPrinterWizard = true;
        Globals.os_level = 20;
-       Globals.bLocalMaster = True;
+       Globals.bLocalMaster = true;
        Globals.iDomainMaster = Auto;   /* depending on bDomainLogons */
-       Globals.bDomainLogons = False;
-       Globals.bBrowseList = True;
-       Globals.bWINSsupport = False;
-       Globals.bWINSproxy = False;
+       Globals.bDomainLogons = false;
+       Globals.bBrowseList = true;
+       Globals.bWINSsupport = false;
+       Globals.bWINSproxy = false;
 
        TALLOC_FREE(Globals.szInitLogonDelayedHosts);
        Globals.InitLogonDelay = 100; /* 100 ms default delay */
 
-       Globals.bDNSproxy = True;
+       Globals.bDNSproxy = true;
 
        /* this just means to use them if they exist */
-       Globals.bKernelOplocks = True;
+       Globals.bKernelOplocks = true;
 
-       Globals.bAllowTrustedDomains = True;
+       Globals.bAllowTrustedDomains = true;
        string_set(&Globals.szIdmapBackend, "tdb");
-       Globals.bIdmapReadOnly = false;
 
        string_set(&Globals.szTemplateShell, "/bin/false");
        string_set(&Globals.szTemplateHomedir, "/home/%D/%U");
@@ -5418,42 +4959,42 @@ static void init_globals(bool reinit_globals)
 
        string_set(&Globals.ctdbdSocket, "");
        Globals.szClusterAddresses = NULL;
-       Globals.clustering = False;
+       Globals.clustering = false;
        Globals.ctdb_timeout = 0;
        Globals.ctdb_locktime_warn_threshold = 0;
 
        Globals.winbind_cache_time = 300;       /* 5 minutes */
        Globals.winbind_reconnect_delay = 30;   /* 30 seconds */
        Globals.winbind_max_clients = 200;
-       Globals.bWinbindEnumUsers = False;
-       Globals.bWinbindEnumGroups = False;
-       Globals.bWinbindUseDefaultDomain = False;
-       Globals.bWinbindTrustedDomainsOnly = False;
-       Globals.bWinbindNestedGroups = True;
+       Globals.bWinbindEnumUsers = false;
+       Globals.bWinbindEnumGroups = false;
+       Globals.bWinbindUseDefaultDomain = false;
+       Globals.bWinbindTrustedDomainsOnly = false;
+       Globals.bWinbindNestedGroups = true;
        Globals.winbind_expand_groups = 1;
        Globals.szWinbindNssInfo = str_list_make_v3(NULL, "template", NULL);
-       Globals.bWinbindRefreshTickets = False;
-       Globals.bWinbindOfflineLogon = False;
+       Globals.bWinbindRefreshTickets = false;
+       Globals.bWinbindOfflineLogon = false;
 
        Globals.iIdmapCacheTime = 86400 * 7; /* a week by default */
        Globals.iIdmapNegativeCacheTime = 120; /* 2 minutes by default */
 
-       Globals.bPassdbExpandExplicit = False;
+       Globals.bPassdbExpandExplicit = false;
 
        Globals.name_cache_timeout = 660; /* In seconds */
 
-       Globals.bUseSpnego = True;
-       Globals.bClientUseSpnego = True;
+       Globals.bUseSpnego = true;
+       Globals.bClientUseSpnego = true;
 
        Globals.client_signing = Auto;
-       Globals.server_signing = False;
+       Globals.server_signing = false;
 
-       Globals.bDeferSharingViolations = True;
+       Globals.bDeferSharingViolations = true;
        string_set(&Globals.smb_ports, SMB_PORTS);
 
-       Globals.bEnablePrivileges = True;
-       Globals.bHostMSDfs        = True;
-       Globals.bASUSupport       = False;
+       Globals.bEnablePrivileges = true;
+       Globals.bHostMSDfs        = true;
+       Globals.bASUSupport       = false;
 
        /* User defined shares. */
        if (asprintf(&s, "%s/usershares", get_dyn_STATEDIR()) < 0) {
@@ -5464,14 +5005,14 @@ static void init_globals(bool reinit_globals)
        string_set(&Globals.szUsershareTemplateShare, "");
        Globals.iUsershareMaxShares = 0;
        /* By default disallow sharing of directories not owned by the sharer. */
-       Globals.bUsershareOwnerOnly = True;
+       Globals.bUsershareOwnerOnly = true;
        /* By default disallow guest access to usershares. */
-       Globals.bUsershareAllowGuests = False;
+       Globals.bUsershareAllowGuests = false;
 
        Globals.iKeepalive = DEFAULT_KEEPALIVE;
 
        /* By default no shares out of the registry */
-       Globals.bRegistryShares = False;
+       Globals.bRegistryShares = false;
 
        Globals.iminreceivefile = 0;
 
@@ -5534,17 +5075,17 @@ static char *lp_string(const char *s)
 */
 
 #define FN_GLOBAL_STRING(fn_name,ptr) \
- char *fn_name(void) {return(lp_string(*(char **)(ptr) ? *(char **)(ptr) : ""));}
+ char *fn_name(void) {return(lp_string(*(char **)(&Globals.ptr) ? *(char **)(&Globals.ptr) : ""));}
 #define FN_GLOBAL_CONST_STRING(fn_name,ptr) \
- const char *fn_name(void) {return(*(const char **)(ptr) ? *(const char **)(ptr) : "");}
+ const char *fn_name(void) {return(*(const char **)(&Globals.ptr) ? *(const char **)(&Globals.ptr) : "");}
 #define FN_GLOBAL_LIST(fn_name,ptr) \
- const char **fn_name(void) {return(*(const char ***)(ptr));}
+ const char **fn_name(void) {return(*(const char ***)(&Globals.ptr));}
 #define FN_GLOBAL_BOOL(fn_name,ptr) \
- bool fn_name(void) {return(*(bool *)(ptr));}
+ bool fn_name(void) {return(*(bool *)(&Globals.ptr));}
 #define FN_GLOBAL_CHAR(fn_name,ptr) \
- char fn_name(void) {return(*(char *)(ptr));}
+ char fn_name(void) {return(*(char *)(&Globals.ptr));}
 #define FN_GLOBAL_INTEGER(fn_name,ptr) \
- int fn_name(void) {return(*(int *)(ptr));}
+ int fn_name(void) {return(*(int *)(&Globals.ptr));}
 
 #define FN_LOCAL_STRING(fn_name,val) \
  char *fn_name(int i) {return(lp_string((LP_SNUM_OK(i) && ServicePtrs[(i)]->val) ? ServicePtrs[(i)]->val : sDefault.val));}
@@ -5564,159 +5105,120 @@ static char *lp_string(const char *s)
 #define FN_LOCAL_CHAR(fn_name,val) \
  char fn_name(const struct share_params *p) {return(LP_SNUM_OK(p->service)? ServicePtrs[(p->service)]->val : sDefault.val);}
 
-FN_GLOBAL_STRING(lp_smb_ports, &Globals.smb_ports)
-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_private_dir, &Globals.szPrivateDir)
-FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString)
-FN_GLOBAL_INTEGER(lp_printcap_cache_time, &Globals.PrintcapCacheTime)
-FN_GLOBAL_STRING(lp_addport_cmd, &Globals.szAddPortCommand)
-FN_GLOBAL_STRING(lp_enumports_cmd, &Globals.szEnumPortsCommand)
-FN_GLOBAL_STRING(lp_addprinter_cmd, &Globals.szAddPrinterCommand)
-FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
-FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
-FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
+FN_GLOBAL_CONST_STRING(lp_smb_ports, smb_ports)
+FN_GLOBAL_CONST_STRING(lp_dos_charset, dos_charset)
+FN_GLOBAL_CONST_STRING(lp_unix_charset, unix_charset)
+FN_GLOBAL_STRING(lp_logfile, szLogFile)
+FN_GLOBAL_STRING(lp_configfile, szConfigFile)
+FN_GLOBAL_CONST_STRING(lp_smb_passwd_file, szSMBPasswdFile)
+FN_GLOBAL_CONST_STRING(lp_private_dir, szPrivateDir)
+FN_GLOBAL_STRING(lp_serverstring, szServerString)
+FN_GLOBAL_INTEGER(lp_printcap_cache_time, PrintcapCacheTime)
+FN_GLOBAL_STRING(lp_addport_cmd, szAddPortCommand)
+FN_GLOBAL_STRING(lp_enumports_cmd, szEnumPortsCommand)
+FN_GLOBAL_STRING(lp_addprinter_cmd, szAddPrinterCommand)
+FN_GLOBAL_STRING(lp_deleteprinter_cmd, szDeletePrinterCommand)
+FN_GLOBAL_STRING(lp_os2_driver_map, szOs2DriverMap)
+FN_GLOBAL_CONST_STRING(lp_lockdir, szLockDir)
 /* If lp_statedir() and lp_cachedir() are explicitely set during the
  * build process or in smb.conf, we use that value.  Otherwise they
  * default to the value of lp_lockdir(). */
-char *lp_statedir(void) {
+const char *lp_statedir(void) {
        if ((strcmp(get_dyn_STATEDIR(), get_dyn_LOCKDIR()) != 0) ||
            (strcmp(get_dyn_STATEDIR(), Globals.szStateDir) != 0))
-               return(lp_string(*(char **)(&Globals.szStateDir) ?
-                   *(char **)(&Globals.szStateDir) : ""));
+               return(*(char **)(&Globals.szStateDir) ?
+                      *(char **)(&Globals.szStateDir) : "");
        else
-               return(lp_string(*(char **)(&Globals.szLockDir) ?
-                   *(char **)(&Globals.szLockDir) : ""));
+               return(*(char **)(&Globals.szLockDir) ?
+                      *(char **)(&Globals.szLockDir) : "");
 }
-char *lp_cachedir(void) {
+const char *lp_cachedir(void) {
        if ((strcmp(get_dyn_CACHEDIR(), get_dyn_LOCKDIR()) != 0) ||
            (strcmp(get_dyn_CACHEDIR(), Globals.szCacheDir) != 0))
-               return(lp_string(*(char **)(&Globals.szCacheDir) ?
-                   *(char **)(&Globals.szCacheDir) : ""));
+               return(*(char **)(&Globals.szCacheDir) ?
+                      *(char **)(&Globals.szCacheDir) : "");
        else
-               return(lp_string(*(char **)(&Globals.szLockDir) ?
-                   *(char **)(&Globals.szLockDir) : ""));
-}
-FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
-FN_GLOBAL_STRING(lp_mangling_method, &Globals.szManglingMethod)
-FN_GLOBAL_INTEGER(lp_mangle_prefix, &Globals.mangle_prefix)
-FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
-FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)
-FN_GLOBAL_BOOL(lp_utmp, &Globals.bUtmp)
-FN_GLOBAL_STRING(lp_rootdir, &Globals.szRootdir)
-FN_GLOBAL_STRING(lp_perfcount_module, &Globals.szSMBPerfcountModule)
-FN_GLOBAL_STRING(lp_defaultservice, &Globals.szDefaultService)
-FN_GLOBAL_STRING(lp_msg_command, &Globals.szMsgCommand)
-FN_GLOBAL_STRING(lp_get_quota_command, &Globals.szGetQuota)
-FN_GLOBAL_STRING(lp_set_quota_command, &Globals.szSetQuota)
-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_STRING(lp_passwordserver, &Globals.szPasswordServer)
-FN_GLOBAL_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder)
-FN_GLOBAL_STRING(lp_realm, &Globals.szRealm)
-FN_GLOBAL_CONST_STRING(lp_afs_username_map, &Globals.szAfsUsernameMap)
-FN_GLOBAL_INTEGER(lp_afs_token_lifetime, &Globals.iAfsTokenLifetime)
-FN_GLOBAL_STRING(lp_log_nt_token_command, &Globals.szLogNtTokenCommand)
-FN_GLOBAL_STRING(lp_username_map, &Globals.szUsernameMap)
-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_BOOL(lp_nmbd_bind_explicit_broadcast, &Globals.bNmbdBindExplicitBroadcast)
-FN_GLOBAL_LIST(lp_wins_server_list, &Globals.szWINSservers)
-FN_GLOBAL_LIST(lp_interfaces, &Globals.szInterfaces)
-FN_GLOBAL_STRING(lp_nis_home_map_name, &Globals.szNISHomeMapName)
-static FN_GLOBAL_STRING(lp_announce_version, &Globals.szAnnounceVersion)
-FN_GLOBAL_LIST(lp_netbios_aliases, &Globals.szNetbiosAliases)
-/* FN_GLOBAL_STRING(lp_passdb_backend, &Globals.szPassdbBackend)
- * lp_passdb_backend() should be replace by the this macro again after
- * some releases.
- * */
-const char *lp_passdb_backend(void)
-{
-       char *delim, *quote;
-
-       delim = strchr( Globals.szPassdbBackend, ' ');
-       /* no space at all */
-       if (delim == NULL) {
-               goto out;
-       }
-
-       quote = strchr(Globals.szPassdbBackend, '"');
-       /* no quote char or non in the first part */
-       if (quote == NULL || quote > delim) {
-               *delim = '\0';
-               goto warn;
-       }
-
-       quote = strchr(quote+1, '"');
-       if (quote == NULL) {
-               DEBUG(0, ("WARNING: Your 'passdb backend' configuration is invalid due to a missing second \" char.\n"));
-               goto out;
-       } else if (*(quote+1) == '\0') {
-               /* space, fitting quote char, and one backend only */
-               goto out;
-       } else {
-               /* terminate string after the fitting quote char */
-               *(quote+1) = '\0';
-       }
-
-warn:
-       DEBUG(0, ("WARNING: Your 'passdb backend' configuration includes multiple backends.  This\n"
-               "is deprecated since Samba 3.0.23.  Please check WHATSNEW.txt or the section 'Passdb\n"
-               "Changes' from the ChangeNotes as part of the Samba HOWTO collection.  Only the first\n"
-               "backend (%s) is used.  The rest is ignored.\n", Globals.szPassdbBackend));
-
-out:
-       return Globals.szPassdbBackend;
-}
-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_STRING(lp_renameuser_script, &Globals.szRenameUserScript)
-FN_GLOBAL_STRING(lp_deluser_script, &Globals.szDelUserScript)
-
-FN_GLOBAL_CONST_STRING(lp_guestaccount, &Globals.szGuestaccount)
-FN_GLOBAL_STRING(lp_addgroup_script, &Globals.szAddGroupScript)
-FN_GLOBAL_STRING(lp_delgroup_script, &Globals.szDelGroupScript)
-FN_GLOBAL_STRING(lp_addusertogroup_script, &Globals.szAddUserToGroupScript)
-FN_GLOBAL_STRING(lp_deluserfromgroup_script, &Globals.szDelUserFromGroupScript)
-FN_GLOBAL_STRING(lp_setprimarygroup_script, &Globals.szSetPrimaryGroupScript)
-
-FN_GLOBAL_STRING(lp_addmachine_script, &Globals.szAddMachineScript)
-
-FN_GLOBAL_STRING(lp_shutdown_script, &Globals.szShutdownScript)
-FN_GLOBAL_STRING(lp_abort_shutdown_script, &Globals.szAbortShutdownScript)
-FN_GLOBAL_STRING(lp_username_map_script, &Globals.szUsernameMapScript)
-FN_GLOBAL_INTEGER(lp_username_map_cache_time, &Globals.iUsernameMapCacheTime)
-
-FN_GLOBAL_STRING(lp_check_password_script, &Globals.szCheckPasswordScript)
-
-FN_GLOBAL_STRING(lp_wins_hook, &Globals.szWINSHook)
-FN_GLOBAL_CONST_STRING(lp_template_homedir, &Globals.szTemplateHomedir)
-FN_GLOBAL_CONST_STRING(lp_template_shell, &Globals.szTemplateShell)
-FN_GLOBAL_CONST_STRING(lp_winbind_separator, &Globals.szWinbindSeparator)
-FN_GLOBAL_INTEGER(lp_acl_compatibility, &Globals.iAclCompat)
-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_BOOL(lp_winbind_trusted_domains_only, &Globals.bWinbindTrustedDomainsOnly)
-FN_GLOBAL_BOOL(lp_winbind_nested_groups, &Globals.bWinbindNestedGroups)
-FN_GLOBAL_INTEGER(lp_winbind_expand_groups, &Globals.winbind_expand_groups)
-FN_GLOBAL_BOOL(lp_winbind_refresh_tickets, &Globals.bWinbindRefreshTickets)
-FN_GLOBAL_BOOL(lp_winbind_offline_logon, &Globals.bWinbindOfflineLogon)
-FN_GLOBAL_BOOL(lp_winbind_normalize_names, &Globals.bWinbindNormalizeNames)
-FN_GLOBAL_BOOL(lp_winbind_rpc_only, &Globals.bWinbindRpcOnly)
-FN_GLOBAL_BOOL(lp_create_krb5_conf, &Globals.bCreateKrb5Conf)
+               return(*(char **)(&Globals.szLockDir) ?
+                      *(char **)(&Globals.szLockDir) : "");
+}
+FN_GLOBAL_CONST_STRING(lp_piddir, szPidDir)
+FN_GLOBAL_STRING(lp_mangling_method, szManglingMethod)
+FN_GLOBAL_INTEGER(lp_mangle_prefix, mangle_prefix)
+FN_GLOBAL_CONST_STRING(lp_utmpdir, szUtmpDir)
+FN_GLOBAL_CONST_STRING(lp_wtmpdir, szWtmpDir)
+FN_GLOBAL_BOOL(lp_utmp, bUtmp)
+FN_GLOBAL_STRING(lp_rootdir, szRootdir)
+FN_GLOBAL_STRING(lp_perfcount_module, szSMBPerfcountModule)
+FN_GLOBAL_STRING(lp_defaultservice, szDefaultService)
+FN_GLOBAL_STRING(lp_msg_command, szMsgCommand)
+FN_GLOBAL_STRING(lp_get_quota_command, szGetQuota)
+FN_GLOBAL_STRING(lp_set_quota_command, szSetQuota)
+FN_GLOBAL_STRING(lp_auto_services, szAutoServices)
+FN_GLOBAL_STRING(lp_passwd_program, szPasswdProgram)
+FN_GLOBAL_STRING(lp_passwd_chat, szPasswdChat)
+FN_GLOBAL_CONST_STRING(lp_passwordserver, szPasswordServer)
+FN_GLOBAL_CONST_STRING(lp_name_resolve_order, szNameResolveOrder)
+FN_GLOBAL_CONST_STRING(lp_workgroup, szWorkgroup)
+FN_GLOBAL_CONST_STRING(lp_netbios_name, szNetbiosName)
+FN_GLOBAL_CONST_STRING(lp_netbios_scope, szNetbiosScope)
+FN_GLOBAL_CONST_STRING(lp_realm, szRealmUpper)
+FN_GLOBAL_CONST_STRING(lp_dnsdomain, szDnsDomain)
+FN_GLOBAL_CONST_STRING(lp_afs_username_map, szAfsUsernameMap)
+FN_GLOBAL_INTEGER(lp_afs_token_lifetime, iAfsTokenLifetime)
+FN_GLOBAL_STRING(lp_log_nt_token_command, szLogNtTokenCommand)
+FN_GLOBAL_STRING(lp_username_map, szUsernameMap)
+FN_GLOBAL_CONST_STRING(lp_logon_script, szLogonScript)
+FN_GLOBAL_CONST_STRING(lp_logon_path, szLogonPath)
+FN_GLOBAL_CONST_STRING(lp_logon_drive, szLogonDrive)
+FN_GLOBAL_CONST_STRING(lp_logon_home, szLogonHome)
+FN_GLOBAL_STRING(lp_remote_announce, szRemoteAnnounce)
+FN_GLOBAL_STRING(lp_remote_browse_sync, szRemoteBrowseSync)
+FN_GLOBAL_BOOL(lp_nmbd_bind_explicit_broadcast, bNmbdBindExplicitBroadcast)
+FN_GLOBAL_LIST(lp_wins_server_list, szWINSservers)
+FN_GLOBAL_LIST(lp_interfaces, szInterfaces)
+FN_GLOBAL_STRING(lp_nis_home_map_name, szNISHomeMapName)
+FN_GLOBAL_LIST(lp_netbios_aliases, szNetbiosAliases)
+FN_GLOBAL_CONST_STRING(lp_passdb_backend, szPassdbBackend)
+FN_GLOBAL_LIST(lp_preload_modules, szPreloadModules)
+FN_GLOBAL_STRING(lp_panic_action, szPanicAction)
+FN_GLOBAL_STRING(lp_adduser_script, szAddUserScript)
+FN_GLOBAL_STRING(lp_renameuser_script, szRenameUserScript)
+FN_GLOBAL_STRING(lp_deluser_script, szDelUserScript)
+
+FN_GLOBAL_CONST_STRING(lp_guestaccount, szGuestaccount)
+FN_GLOBAL_STRING(lp_addgroup_script, szAddGroupScript)
+FN_GLOBAL_STRING(lp_delgroup_script, szDelGroupScript)
+FN_GLOBAL_STRING(lp_addusertogroup_script, szAddUserToGroupScript)
+FN_GLOBAL_STRING(lp_deluserfromgroup_script, szDelUserFromGroupScript)
+FN_GLOBAL_STRING(lp_setprimarygroup_script, szSetPrimaryGroupScript)
+
+FN_GLOBAL_STRING(lp_addmachine_script, szAddMachineScript)
+
+FN_GLOBAL_STRING(lp_shutdown_script, szShutdownScript)
+FN_GLOBAL_STRING(lp_abort_shutdown_script, szAbortShutdownScript)
+FN_GLOBAL_STRING(lp_username_map_script, szUsernameMapScript)
+FN_GLOBAL_INTEGER(lp_username_map_cache_time, iUsernameMapCacheTime)
+
+FN_GLOBAL_STRING(lp_check_password_script, szCheckPasswordScript)
+
+FN_GLOBAL_STRING(lp_wins_hook, szWINSHook)
+FN_GLOBAL_CONST_STRING(lp_template_homedir, szTemplateHomedir)
+FN_GLOBAL_CONST_STRING(lp_template_shell, szTemplateShell)
+FN_GLOBAL_CONST_STRING(lp_winbind_separator, szWinbindSeparator)
+FN_GLOBAL_INTEGER(lp_acl_compatibility, iAclCompat)
+FN_GLOBAL_BOOL(lp_winbind_enum_users, bWinbindEnumUsers)
+FN_GLOBAL_BOOL(lp_winbind_enum_groups, bWinbindEnumGroups)
+FN_GLOBAL_BOOL(lp_winbind_use_default_domain, bWinbindUseDefaultDomain)
+FN_GLOBAL_BOOL(lp_winbind_trusted_domains_only, bWinbindTrustedDomainsOnly)
+FN_GLOBAL_BOOL(lp_winbind_nested_groups, bWinbindNestedGroups)
+FN_GLOBAL_INTEGER(lp_winbind_expand_groups, winbind_expand_groups)
+FN_GLOBAL_BOOL(lp_winbind_refresh_tickets, bWinbindRefreshTickets)
+FN_GLOBAL_BOOL(lp_winbind_offline_logon, bWinbindOfflineLogon)
+FN_GLOBAL_BOOL(lp_winbind_normalize_names, bWinbindNormalizeNames)
+FN_GLOBAL_BOOL(lp_winbind_rpc_only, bWinbindRpcOnly)
+FN_GLOBAL_BOOL(lp_create_krb5_conf, bCreateKrb5Conf)
 static FN_GLOBAL_INTEGER(lp_winbind_max_domain_connections_int,
-                 &Globals.winbindMaxDomainConnections)
+                 winbindMaxDomainConnections)
 
 int lp_winbind_max_domain_connections(void)
 {
@@ -5729,119 +5231,117 @@ int lp_winbind_max_domain_connections(void)
        return MAX(1, lp_winbind_max_domain_connections_int());
 }
 
-FN_GLOBAL_CONST_STRING(lp_idmap_backend, &Globals.szIdmapBackend)
-FN_GLOBAL_INTEGER(lp_idmap_cache_time, &Globals.iIdmapCacheTime)
-FN_GLOBAL_INTEGER(lp_idmap_negative_cache_time, &Globals.iIdmapNegativeCacheTime)
-FN_GLOBAL_INTEGER(lp_keepalive, &Globals.iKeepalive)
-FN_GLOBAL_BOOL(lp_passdb_expand_explicit, &Globals.bPassdbExpandExplicit)
-
-FN_GLOBAL_STRING(lp_ldap_suffix, &Globals.szLdapSuffix)
-FN_GLOBAL_STRING(lp_ldap_admin_dn, &Globals.szLdapAdminDn)
-FN_GLOBAL_INTEGER(lp_ldap_ssl, &Globals.ldap_ssl)
-FN_GLOBAL_BOOL(lp_ldap_ssl_ads, &Globals.ldap_ssl_ads)
-FN_GLOBAL_INTEGER(lp_ldap_deref, &Globals.ldap_deref)
-FN_GLOBAL_INTEGER(lp_ldap_follow_referral, &Globals.ldap_follow_referral)
-FN_GLOBAL_INTEGER(lp_ldap_passwd_sync, &Globals.ldap_passwd_sync)
-FN_GLOBAL_BOOL(lp_ldap_delete_dn, &Globals.ldap_delete_dn)
-FN_GLOBAL_INTEGER(lp_ldap_replication_sleep, &Globals.ldap_replication_sleep)
-FN_GLOBAL_INTEGER(lp_ldap_timeout, &Globals.ldap_timeout)
-FN_GLOBAL_INTEGER(lp_ldap_connection_timeout, &Globals.ldap_connection_timeout)
-FN_GLOBAL_INTEGER(lp_ldap_page_size, &Globals.ldap_page_size)
-FN_GLOBAL_INTEGER(lp_ldap_debug_level, &Globals.ldap_debug_level)
-FN_GLOBAL_INTEGER(lp_ldap_debug_threshold, &Globals.ldap_debug_threshold)
-FN_GLOBAL_STRING(lp_add_share_cmd, &Globals.szAddShareCommand)
-FN_GLOBAL_STRING(lp_change_share_cmd, &Globals.szChangeShareCommand)
-FN_GLOBAL_STRING(lp_delete_share_cmd, &Globals.szDeleteShareCommand)
-FN_GLOBAL_STRING(lp_usershare_path, &Globals.szUsersharePath)
-FN_GLOBAL_LIST(lp_usershare_prefix_allow_list, &Globals.szUsersharePrefixAllowList)
-FN_GLOBAL_LIST(lp_usershare_prefix_deny_list, &Globals.szUsersharePrefixDenyList)
-
-FN_GLOBAL_LIST(lp_eventlog_list, &Globals.szEventLogs)
-
-FN_GLOBAL_BOOL(lp_registry_shares, &Globals.bRegistryShares)
-FN_GLOBAL_BOOL(lp_usershare_allow_guests, &Globals.bUsershareAllowGuests)
-FN_GLOBAL_BOOL(lp_usershare_owner_only, &Globals.bUsershareOwnerOnly)
-FN_GLOBAL_BOOL(lp_disable_netbios, &Globals.bDisableNetbios)
-FN_GLOBAL_BOOL(lp_reset_on_zero_vc, &Globals.bResetOnZeroVC)
-FN_GLOBAL_BOOL(lp_log_writeable_files_on_exit,
-              &Globals.bLogWriteableFilesOnExit)
-FN_GLOBAL_BOOL(lp_ms_add_printer_wizard, &Globals.bMsAddPrinterWizard)
-FN_GLOBAL_BOOL(lp_dns_proxy, &Globals.bDNSproxy)
-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_LIST(lp_init_logon_delayed_hosts, &Globals.szInitLogonDelayedHosts)
-FN_GLOBAL_INTEGER(lp_init_logon_delay, &Globals.InitLogonDelay)
-FN_GLOBAL_BOOL(lp_load_printers, &Globals.bLoadPrinters)
-FN_GLOBAL_BOOL(_lp_readraw, &Globals.bReadRaw)
-FN_GLOBAL_BOOL(lp_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)
-FN_GLOBAL_INTEGER(lp_client_schannel, &Globals.clientSchannel)
-FN_GLOBAL_INTEGER(lp_server_schannel, &Globals.serverSchannel)
-FN_GLOBAL_BOOL(lp_syslog_only, &Globals.bSyslogOnly)
-FN_GLOBAL_BOOL(lp_timestamp_logs, &Globals.bTimestampLogs)
-FN_GLOBAL_BOOL(lp_debug_prefix_timestamp, &Globals.bDebugPrefixTimestamp)
-FN_GLOBAL_BOOL(lp_debug_hires_timestamp, &Globals.bDebugHiresTimestamp)
-FN_GLOBAL_BOOL(lp_debug_pid, &Globals.bDebugPid)
-FN_GLOBAL_BOOL(lp_debug_uid, &Globals.bDebugUid)
-FN_GLOBAL_BOOL(lp_debug_class, &Globals.bDebugClass)
-FN_GLOBAL_BOOL(lp_enable_core_files, &Globals.bEnableCoreFiles)
-FN_GLOBAL_BOOL(lp_browse_list, &Globals.bBrowseList)
-FN_GLOBAL_BOOL(lp_nis_home_map, &Globals.bNISHomeMap)
-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_unix_password_sync, &Globals.bUnixPasswdSync)
-FN_GLOBAL_BOOL(lp_passwd_chat_debug, &Globals.bPasswdChatDebug)
-FN_GLOBAL_INTEGER(lp_passwd_chat_timeout, &Globals.iPasswdChatTimeout)
-FN_GLOBAL_BOOL(lp_nt_pipe_support, &Globals.bNTPipeSupport)
-FN_GLOBAL_BOOL(lp_nt_status_support, &Globals.bNTStatusSupport)
-FN_GLOBAL_BOOL(lp_stat_cache, &Globals.bStatCache)
-FN_GLOBAL_INTEGER(lp_max_stat_cache_size, &Globals.iMaxStatCacheSize)
-FN_GLOBAL_BOOL(lp_allow_trusted_domains, &Globals.bAllowTrustedDomains)
-FN_GLOBAL_BOOL(lp_map_untrusted_to_domain, &Globals.bMapUntrustedToDomain)
-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_plaintext_auth, &Globals.bClientPlaintextAuth)
-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_kernel_oplocks, &Globals.bKernelOplocks)
-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_client_use_spnego, &Globals.bClientUseSpnego)
-FN_GLOBAL_BOOL(lp_client_use_spnego_principal, &Globals.client_use_spnego_principal)
-FN_GLOBAL_BOOL(lp_send_spnego_principal, &Globals.send_spnego_principal)
-FN_GLOBAL_BOOL(lp_hostname_lookups, &Globals.bHostnameLookups)
+FN_GLOBAL_CONST_STRING(lp_idmap_backend, szIdmapBackend)
+FN_GLOBAL_INTEGER(lp_idmap_cache_time, iIdmapCacheTime)
+FN_GLOBAL_INTEGER(lp_idmap_negative_cache_time, iIdmapNegativeCacheTime)
+FN_GLOBAL_INTEGER(lp_keepalive, iKeepalive)
+FN_GLOBAL_BOOL(lp_passdb_expand_explicit, bPassdbExpandExplicit)
+
+FN_GLOBAL_STRING(lp_ldap_suffix, szLdapSuffix)
+FN_GLOBAL_STRING(lp_ldap_admin_dn, szLdapAdminDn)
+FN_GLOBAL_INTEGER(lp_ldap_ssl, ldap_ssl)
+FN_GLOBAL_BOOL(lp_ldap_ssl_ads, ldap_ssl_ads)
+FN_GLOBAL_INTEGER(lp_ldap_deref, ldap_deref)
+FN_GLOBAL_INTEGER(lp_ldap_follow_referral, ldap_follow_referral)
+FN_GLOBAL_INTEGER(lp_ldap_passwd_sync, ldap_passwd_sync)
+FN_GLOBAL_BOOL(lp_ldap_delete_dn, ldap_delete_dn)
+FN_GLOBAL_INTEGER(lp_ldap_replication_sleep, ldap_replication_sleep)
+FN_GLOBAL_INTEGER(lp_ldap_timeout, ldap_timeout)
+FN_GLOBAL_INTEGER(lp_ldap_connection_timeout, ldap_connection_timeout)
+FN_GLOBAL_INTEGER(lp_ldap_page_size, ldap_page_size)
+FN_GLOBAL_INTEGER(lp_ldap_debug_level, ldap_debug_level)
+FN_GLOBAL_INTEGER(lp_ldap_debug_threshold, ldap_debug_threshold)
+FN_GLOBAL_STRING(lp_add_share_cmd, szAddShareCommand)
+FN_GLOBAL_STRING(lp_change_share_cmd, szChangeShareCommand)
+FN_GLOBAL_STRING(lp_delete_share_cmd, szDeleteShareCommand)
+FN_GLOBAL_STRING(lp_usershare_path, szUsersharePath)
+FN_GLOBAL_LIST(lp_usershare_prefix_allow_list, szUsersharePrefixAllowList)
+FN_GLOBAL_LIST(lp_usershare_prefix_deny_list, szUsersharePrefixDenyList)
+
+FN_GLOBAL_LIST(lp_eventlog_list, szEventLogs)
+
+FN_GLOBAL_BOOL(lp_registry_shares, bRegistryShares)
+FN_GLOBAL_BOOL(lp_usershare_allow_guests, bUsershareAllowGuests)
+FN_GLOBAL_BOOL(lp_usershare_owner_only, bUsershareOwnerOnly)
+FN_GLOBAL_BOOL(lp_disable_netbios, bDisableNetbios)
+FN_GLOBAL_BOOL(lp_reset_on_zero_vc, bResetOnZeroVC)
+FN_GLOBAL_BOOL(lp_log_writeable_files_on_exit, bLogWriteableFilesOnExit)
+FN_GLOBAL_BOOL(lp_ms_add_printer_wizard, bMsAddPrinterWizard)
+FN_GLOBAL_BOOL(lp_dns_proxy, bDNSproxy)
+FN_GLOBAL_BOOL(lp_we_are_a_wins_server, bWINSsupport)
+FN_GLOBAL_BOOL(lp_wins_proxy, bWINSproxy)
+FN_GLOBAL_BOOL(lp_local_master, bLocalMaster)
+FN_GLOBAL_BOOL(lp_domain_logons, bDomainLogons)
+FN_GLOBAL_LIST(lp_init_logon_delayed_hosts, szInitLogonDelayedHosts)
+FN_GLOBAL_INTEGER(lp_init_logon_delay, InitLogonDelay)
+FN_GLOBAL_BOOL(lp_load_printers, bLoadPrinters)
+FN_GLOBAL_BOOL(_lp_readraw, bReadRaw)
+FN_GLOBAL_BOOL(lp_large_readwrite, bLargeReadwrite)
+FN_GLOBAL_BOOL(_lp_writeraw, bWriteRaw)
+FN_GLOBAL_BOOL(lp_null_passwords, bNullPasswords)
+FN_GLOBAL_BOOL(lp_obey_pam_restrictions, bObeyPamRestrictions)
+FN_GLOBAL_BOOL(lp_encrypted_passwords, bEncryptPasswords)
+FN_GLOBAL_INTEGER(lp_client_schannel, clientSchannel)
+FN_GLOBAL_INTEGER(lp_server_schannel, serverSchannel)
+FN_GLOBAL_BOOL(lp_syslog_only, bSyslogOnly)
+FN_GLOBAL_BOOL(lp_timestamp_logs, bTimestampLogs)
+FN_GLOBAL_BOOL(lp_debug_prefix_timestamp, bDebugPrefixTimestamp)
+FN_GLOBAL_BOOL(lp_debug_hires_timestamp, bDebugHiresTimestamp)
+FN_GLOBAL_BOOL(lp_debug_pid, bDebugPid)
+FN_GLOBAL_BOOL(lp_debug_uid, bDebugUid)
+FN_GLOBAL_BOOL(lp_debug_class, bDebugClass)
+FN_GLOBAL_BOOL(lp_enable_core_files, bEnableCoreFiles)
+FN_GLOBAL_BOOL(lp_browse_list, bBrowseList)
+FN_GLOBAL_BOOL(lp_nis_home_map, bNISHomeMap)
+static FN_GLOBAL_BOOL(lp_time_server, bTimeServer)
+FN_GLOBAL_BOOL(lp_bind_interfaces_only, bBindInterfacesOnly)
+FN_GLOBAL_BOOL(lp_pam_password_change, bPamPasswordChange)
+FN_GLOBAL_BOOL(lp_unix_password_sync, bUnixPasswdSync)
+FN_GLOBAL_BOOL(lp_passwd_chat_debug, bPasswdChatDebug)
+FN_GLOBAL_INTEGER(lp_passwd_chat_timeout, iPasswdChatTimeout)
+FN_GLOBAL_BOOL(lp_nt_pipe_support, bNTPipeSupport)
+FN_GLOBAL_BOOL(lp_nt_status_support, bNTStatusSupport)
+FN_GLOBAL_BOOL(lp_stat_cache, bStatCache)
+FN_GLOBAL_INTEGER(lp_max_stat_cache_size, iMaxStatCacheSize)
+FN_GLOBAL_BOOL(lp_allow_trusted_domains, bAllowTrustedDomains)
+FN_GLOBAL_BOOL(lp_map_untrusted_to_domain, bMapUntrustedToDomain)
+FN_GLOBAL_INTEGER(lp_restrict_anonymous, restrict_anonymous)
+FN_GLOBAL_BOOL(lp_lanman_auth, bLanmanAuth)
+FN_GLOBAL_BOOL(lp_ntlm_auth, bNTLMAuth)
+FN_GLOBAL_BOOL(lp_client_plaintext_auth, bClientPlaintextAuth)
+FN_GLOBAL_BOOL(lp_client_lanman_auth, bClientLanManAuth)
+FN_GLOBAL_BOOL(lp_client_ntlmv2_auth, bClientNTLMv2Auth)
+FN_GLOBAL_BOOL(lp_host_msdfs, bHostMSDfs)
+FN_GLOBAL_BOOL(lp_kernel_oplocks, bKernelOplocks)
+FN_GLOBAL_BOOL(lp_enhanced_browsing, enhanced_browsing)
+FN_GLOBAL_BOOL(lp_use_mmap, bUseMmap)
+FN_GLOBAL_BOOL(lp_unix_extensions, bUnixExtensions)
+FN_GLOBAL_BOOL(lp_use_spnego, bUseSpnego)
+FN_GLOBAL_BOOL(lp_client_use_spnego, bClientUseSpnego)
+FN_GLOBAL_BOOL(lp_client_use_spnego_principal, client_use_spnego_principal)
+FN_GLOBAL_BOOL(lp_send_spnego_principal, send_spnego_principal)
+FN_GLOBAL_BOOL(lp_hostname_lookups, bHostnameLookups)
 FN_LOCAL_PARM_BOOL(lp_change_notify, bChangeNotify)
 FN_LOCAL_PARM_BOOL(lp_kernel_change_notify, bKernelChangeNotify)
-FN_GLOBAL_STRING(lp_dedicated_keytab_file, &Globals.szDedicatedKeytabFile)
-FN_GLOBAL_INTEGER(lp_kerberos_method, &Globals.iKerberosMethod)
-FN_GLOBAL_BOOL(lp_defer_sharing_violations, &Globals.bDeferSharingViolations)
-FN_GLOBAL_BOOL(lp_enable_privileges, &Globals.bEnablePrivileges)
-FN_GLOBAL_BOOL(lp_enable_asu_support, &Globals.bASUSupport)
-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_max_log_size, &Globals.max_log_size)
-FN_GLOBAL_INTEGER(lp_max_open_files, &Globals.max_open_files)
-FN_GLOBAL_INTEGER(lp_open_files_db_hash_size, &Globals.open_files_db_hash_size)
-FN_GLOBAL_INTEGER(lp_maxxmit, &Globals.max_xmit)
-FN_GLOBAL_INTEGER(lp_maxmux, &Globals.max_mux)
-FN_GLOBAL_INTEGER(lp_passwordlevel, &Globals.pwordlevel)
-FN_GLOBAL_INTEGER(lp_usernamelevel, &Globals.unamelevel)
-FN_GLOBAL_INTEGER(lp_deadtime, &Globals.deadtime)
-FN_GLOBAL_BOOL(lp_getwd_cache, &Globals.getwd_cache)
-static FN_GLOBAL_INTEGER(_lp_maxprotocol, &Globals.maxprotocol)
+FN_GLOBAL_CONST_STRING(lp_dedicated_keytab_file, szDedicatedKeytabFile)
+FN_GLOBAL_INTEGER(lp_kerberos_method, iKerberosMethod)
+FN_GLOBAL_BOOL(lp_defer_sharing_violations, bDeferSharingViolations)
+FN_GLOBAL_BOOL(lp_enable_privileges, bEnablePrivileges)
+FN_GLOBAL_BOOL(lp_enable_asu_support, bASUSupport)
+FN_GLOBAL_INTEGER(lp_os_level, os_level)
+FN_GLOBAL_INTEGER(lp_max_ttl, max_ttl)
+FN_GLOBAL_INTEGER(lp_max_wins_ttl, max_wins_ttl)
+FN_GLOBAL_INTEGER(lp_min_wins_ttl, min_wins_ttl)
+FN_GLOBAL_INTEGER(lp_max_log_size, max_log_size)
+FN_GLOBAL_INTEGER(lp_max_open_files, max_open_files)
+FN_GLOBAL_INTEGER(lp_open_files_db_hash_size, open_files_db_hash_size)
+FN_GLOBAL_INTEGER(lp_maxxmit, max_xmit)
+FN_GLOBAL_INTEGER(lp_maxmux, max_mux)
+FN_GLOBAL_INTEGER(lp_passwordlevel, pwordlevel)
+FN_GLOBAL_INTEGER(lp_usernamelevel, unamelevel)
+FN_GLOBAL_INTEGER(lp_deadtime, deadtime)
+FN_GLOBAL_BOOL(lp_getwd_cache, getwd_cache)
+static FN_GLOBAL_INTEGER(_lp_maxprotocol, maxprotocol)
 int lp_maxprotocol(void)
 {
        int ret = _lp_maxprotocol();
@@ -5853,28 +5353,27 @@ int lp_maxprotocol(void)
        }
        return ret;
 }
-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_maxdisksize, &Globals.maxdisksize)
-FN_GLOBAL_INTEGER(lp_lpqcachetime, &Globals.lpqcachetime)
-FN_GLOBAL_INTEGER(lp_max_smbd_processes, &Globals.iMaxSmbdProcesses)
-FN_GLOBAL_BOOL(_lp_disable_spoolss, &Globals.bDisableSpoolss)
-FN_GLOBAL_INTEGER(lp_syslog, &Globals.syslog)
-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_map_to_guest, &Globals.map_to_guest)
-FN_GLOBAL_INTEGER(lp_oplock_break_wait_time, &Globals.oplock_break_wait_time)
-FN_GLOBAL_INTEGER(lp_lock_spin_time, &Globals.iLockSpinTime)
-FN_GLOBAL_INTEGER(lp_usershare_max_shares, &Globals.iUsershareMaxShares)
-FN_GLOBAL_CONST_STRING(lp_socket_options, &Globals.szSocketOptions)
-FN_GLOBAL_INTEGER(lp_config_backend, &Globals.ConfigBackend)
-FN_GLOBAL_INTEGER(lp_smb2_max_read, &Globals.ismb2_max_read)
-FN_GLOBAL_INTEGER(lp_smb2_max_write, &Globals.ismb2_max_write)
-FN_GLOBAL_INTEGER(lp_smb2_max_trans, &Globals.ismb2_max_trans)
+FN_GLOBAL_INTEGER(lp_minprotocol, minprotocol)
+FN_GLOBAL_INTEGER(lp_security, security)
+FN_GLOBAL_LIST(lp_auth_methods, AuthMethods)
+FN_GLOBAL_BOOL(lp_paranoid_server_security, paranoid_server_security)
+FN_GLOBAL_INTEGER(lp_maxdisksize, maxdisksize)
+FN_GLOBAL_INTEGER(lp_lpqcachetime, lpqcachetime)
+FN_GLOBAL_INTEGER(lp_max_smbd_processes, iMaxSmbdProcesses)
+FN_GLOBAL_BOOL(_lp_disable_spoolss, bDisableSpoolss)
+FN_GLOBAL_INTEGER(lp_syslog, syslog)
+FN_GLOBAL_INTEGER(lp_lm_announce, lm_announce)
+FN_GLOBAL_INTEGER(lp_lm_interval, lm_interval)
+FN_GLOBAL_INTEGER(lp_machine_password_timeout, machine_password_timeout)
+FN_GLOBAL_INTEGER(lp_map_to_guest, map_to_guest)
+FN_GLOBAL_INTEGER(lp_oplock_break_wait_time, oplock_break_wait_time)
+FN_GLOBAL_INTEGER(lp_lock_spin_time, iLockSpinTime)
+FN_GLOBAL_INTEGER(lp_usershare_max_shares, iUsershareMaxShares)
+FN_GLOBAL_CONST_STRING(lp_socket_options, szSocketOptions)
+FN_GLOBAL_INTEGER(lp_config_backend, ConfigBackend)
+FN_GLOBAL_INTEGER(lp_smb2_max_read, ismb2_max_read)
+FN_GLOBAL_INTEGER(lp_smb2_max_write, ismb2_max_write)
+FN_GLOBAL_INTEGER(lp_smb2_max_trans, ismb2_max_trans)
 int lp_smb2_max_credits(void)
 {
        if (Globals.ismb2_max_credits == 0) {
@@ -5887,16 +5386,16 @@ FN_LOCAL_STRING(lp_postexec, szPostExec)
 FN_LOCAL_STRING(lp_rootpreexec, szRootPreExec)
 FN_LOCAL_STRING(lp_rootpostexec, szRootPostExec)
 FN_LOCAL_STRING(lp_servicename, szService)
-FN_LOCAL_CONST_STRING(lp_const_servicename, szService)
+ FN_LOCAL_CONST_STRING(lp_const_servicename, szService)
 FN_LOCAL_STRING(lp_pathname, szPath)
 FN_LOCAL_STRING(lp_dontdescend, szDontdescend)
 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_GLOBAL_LIST(lp_svcctl_list, &Globals.szServicesList)
+FN_GLOBAL_LIST(lp_svcctl_list, szServicesList)
 FN_LOCAL_STRING(lp_cups_options, szCupsOptions)
-FN_GLOBAL_STRING(lp_cups_server, &Globals.szCupsServer)
+FN_GLOBAL_STRING(lp_cups_server, szCupsServer)
 int lp_cups_encrypt(void)
 {
        int result = 0;
@@ -5905,23 +5404,23 @@ int lp_cups_encrypt(void)
                case Auto:
                        result = HTTP_ENCRYPT_REQUIRED;
                        break;
-               case True:
+               case true:
                        result = HTTP_ENCRYPT_ALWAYS;
                        break;
-               case False:
+               case false:
                        result = HTTP_ENCRYPT_NEVER;
                        break;
        }
 #endif
        return result;
 }
-FN_GLOBAL_STRING(lp_iprint_server, &Globals.szIPrintServer)
-FN_GLOBAL_INTEGER(lp_cups_connection_timeout, &Globals.cups_connection_timeout)
-FN_GLOBAL_CONST_STRING(lp_ctdbd_socket, &Globals.ctdbdSocket)
-FN_GLOBAL_LIST(lp_cluster_addresses, &Globals.szClusterAddresses)
-FN_GLOBAL_BOOL(lp_clustering, &Globals.clustering)
-FN_GLOBAL_INTEGER(lp_ctdb_timeout, &Globals.ctdb_timeout)
-FN_GLOBAL_INTEGER(lp_ctdb_locktime_warn_threshold, &Globals.ctdb_locktime_warn_threshold)
+FN_GLOBAL_STRING(lp_iprint_server, szIPrintServer)
+FN_GLOBAL_INTEGER(lp_cups_connection_timeout, cups_connection_timeout)
+FN_GLOBAL_CONST_STRING(lp_ctdbd_socket, ctdbdSocket)
+FN_GLOBAL_LIST(lp_cluster_addresses, szClusterAddresses)
+FN_GLOBAL_BOOL(lp_clustering, clustering)
+FN_GLOBAL_INTEGER(lp_ctdb_timeout, ctdb_timeout)
+FN_GLOBAL_INTEGER(lp_ctdb_locktime_warn_threshold, ctdb_locktime_warn_threshold)
 FN_LOCAL_STRING(lp_printcommand, szPrintcommand)
 FN_LOCAL_STRING(lp_lpqcommand, szLpqcommand)
 FN_LOCAL_STRING(lp_lprmcommand, szLprmcommand)
@@ -5994,8 +5493,8 @@ FN_LOCAL_BOOL(lp_dos_filemode, bDosFilemode)
 FN_LOCAL_BOOL(lp_dos_filetimes, bDosFiletimes)
 FN_LOCAL_BOOL(lp_dos_filetime_resolution, bDosFiletimeResolution)
 FN_LOCAL_BOOL(lp_fake_dir_create_times, bFakeDirCreateTimes)
-FN_GLOBAL_BOOL(lp_async_smb_echo_handler, &Globals.bAsyncSMBEchoHandler)
-FN_GLOBAL_BOOL(lp_multicast_dns_register, &Globals.bMulticastDnsRegister)
+FN_GLOBAL_BOOL(lp_async_smb_echo_handler, bAsyncSMBEchoHandler)
+FN_GLOBAL_BOOL(lp_multicast_dns_register, bMulticastDnsRegister)
 FN_LOCAL_BOOL(lp_blocking_locks, bBlockingLocks)
 FN_LOCAL_BOOL(lp_inherit_perms, bInheritPerms)
 FN_LOCAL_BOOL(lp_inherit_acls, bInheritACLS)
@@ -6038,31 +5537,31 @@ FN_LOCAL_INTEGER(lp_map_readonly, iMap_readonly)
 FN_LOCAL_INTEGER(lp_directory_name_cache_size, iDirectoryNameCacheSize)
 FN_LOCAL_INTEGER(lp_smb_encrypt, ismb_encrypt)
 FN_LOCAL_CHAR(lp_magicchar, magic_char)
-FN_GLOBAL_INTEGER(lp_winbind_cache_time, &Globals.winbind_cache_time)
-FN_GLOBAL_INTEGER(lp_winbind_reconnect_delay, &Globals.winbind_reconnect_delay)
-FN_GLOBAL_INTEGER(lp_winbind_max_clients, &Globals.winbind_max_clients)
-FN_GLOBAL_LIST(lp_winbind_nss_info, &Globals.szWinbindNssInfo)
-FN_GLOBAL_INTEGER(lp_algorithmic_rid_base, &Globals.AlgorithmicRidBase)
-FN_GLOBAL_INTEGER(lp_name_cache_timeout, &Globals.name_cache_timeout)
-FN_GLOBAL_INTEGER(lp_client_signing, &Globals.client_signing)
-FN_GLOBAL_INTEGER(lp_server_signing, &Globals.server_signing)
-FN_GLOBAL_INTEGER(lp_client_ldap_sasl_wrapping, &Globals.client_ldap_sasl_wrapping)
-
-FN_GLOBAL_STRING(lp_ncalrpc_dir, &Globals.ncalrpc_dir)
+FN_GLOBAL_INTEGER(lp_winbind_cache_time, winbind_cache_time)
+FN_GLOBAL_INTEGER(lp_winbind_reconnect_delay, winbind_reconnect_delay)
+FN_GLOBAL_INTEGER(lp_winbind_max_clients, winbind_max_clients)
+FN_GLOBAL_LIST(lp_winbind_nss_info, szWinbindNssInfo)
+FN_GLOBAL_INTEGER(lp_algorithmic_rid_base, AlgorithmicRidBase)
+FN_GLOBAL_INTEGER(lp_name_cache_timeout, name_cache_timeout)
+FN_GLOBAL_INTEGER(lp_client_signing, client_signing)
+FN_GLOBAL_INTEGER(lp_server_signing, server_signing)
+FN_GLOBAL_INTEGER(lp_client_ldap_sasl_wrapping, client_ldap_sasl_wrapping)
+
+FN_GLOBAL_CONST_STRING(lp_ncalrpc_dir, ncalrpc_dir)
 
 /* local prototypes */
 
 static int map_parameter_canonical(const char *pszParmName, bool *inverse);
 static const char *get_boolean(bool bool_value);
 static int getservicebyname(const char *pszServiceName,
-                           struct service *pserviceDest);
-static void copy_service(struct service *pserviceDest,
-                        struct service *pserviceSource,
+                           struct loadparm_service *pserviceDest);
+static void copy_service(struct loadparm_service *pserviceDest,
+                        struct loadparm_service *pserviceSource,
                         struct bitmap *pcopymapDest);
 static bool do_parameter(const char *pszParmName, const char *pszParmValue,
                         void *userdata);
 static bool do_section(const char *pszSectionName, void *userdata);
-static void init_copymap(struct service *pservice);
+static void init_copymap(struct loadparm_service *pservice);
 static bool hash_a_service(const char *name, int number);
 static void free_service_byindex(int iService);
 static void free_param_opts(struct param_opt_struct **popts);
@@ -6077,7 +5576,7 @@ static bool is_synonym_of(int parm1, int parm2, bool *inverse);
 static struct param_opt_struct *get_parametrics(int snum, const char *type,
                                                const char *option)
 {
-       bool global_section = False;
+       bool global_section = false;
        char* param_key;
         struct param_opt_struct *data;
 
@@ -6085,7 +5584,7 @@ static struct param_opt_struct *get_parametrics(int snum, const char *type,
 
        if (snum < 0) { 
                data = Globals.param_opt;
-               global_section = True;
+               global_section = true;
        } else {
                data = ServicePtrs[snum]->param_opt;
        }
@@ -6158,16 +5657,16 @@ convenience routine to return boolean parameters.
 ********************************************************************/
 static bool lp_bool(const char *s)
 {
-       bool ret = False;
+       bool ret = false;
 
        if (!s || !*s) {
                MISSING_PARAMETER(lp_bool);
-               return False;
+               return false;
        }
 
        if (!set_boolean(s, &ret)) {
                DEBUG(0,("lp_bool(%s): value is not boolean!\n",s));
-               return False;
+               return false;
        }
 
        return ret;
@@ -6196,18 +5695,6 @@ static int lp_enum(const char *s,const struct enum_list *_enum)
 
 #undef MISSING_PARAMETER
 
-/* DO NOT USE lp_parm_string ANYMORE!!!!
- * use lp_parm_const_string or lp_parm_talloc_string
- *
- * lp_parm_string is only used to let old modules find this symbol
- */
-#undef lp_parm_string
- char *lp_parm_string(const char *servicename, const char *type, const char *option);
- char *lp_parm_string(const char *servicename, const char *type, const char *option)
-{
-       return lp_parm_talloc_string(lp_servicenumber(servicename), type, option, NULL);
-}
-
 /* Return parametric option from a given service. Type is a part of option before ':' */
 /* Parametric option has following syntax: 'Type: option = value' */
 /* the returned value is talloced on the talloc_tos() */
@@ -6313,9 +5800,9 @@ int lp_parm_enum(int snum, const char *type, const char *option,
  Initialise a service to the defaults.
 ***************************************************************************/
 
-static void init_service(struct service *pservice)
+static void init_service(struct loadparm_service *pservice)
 {
-       memset((char *)pservice, '\0', sizeof(struct service));
+       memset((char *)pservice, '\0', sizeof(struct loadparm_service));
        copy_service(pservice, &sDefault, NULL);
 }
 
@@ -6353,7 +5840,7 @@ static void free_param_opts(struct param_opt_struct **popts)
  Free the dynamically allocated parts of a service struct.
 ***************************************************************************/
 
-static void free_service(struct service *pservice)
+static void free_service(struct loadparm_service *pservice)
 {
        if (!pservice)
                return;
@@ -6383,7 +5870,7 @@ static void free_service_byindex(int idx)
        if ( !LP_SNUM_OK(idx) ) 
                return;
 
-       ServicePtrs[idx]->valid = False;
+       ServicePtrs[idx]->valid = false;
        invalid_services[num_invalid_services++] = idx;
 
        /* we have to cleanup the hash record */
@@ -6405,10 +5892,10 @@ static void free_service_byindex(int idx)
  service. 
 ***************************************************************************/
 
-static int add_a_service(const struct service *pservice, const char *name)
+static int add_a_service(const struct loadparm_service *pservice, const char *name)
 {
        int i;
-       struct service tservice;
+       struct loadparm_service tservice;
        int num_to_alloc = iNumServices + 1;
 
        tservice = *pservice;
@@ -6429,16 +5916,16 @@ static int add_a_service(const struct service *pservice, const char *name)
 
        /* if not, then create one */
        if (i == iNumServices) {
-               struct service **tsp;
+               struct loadparm_service **tsp;
                int *tinvalid;
 
-               tsp = SMB_REALLOC_ARRAY_KEEP_OLD_ON_ERROR(ServicePtrs, struct service *, num_to_alloc);
+               tsp = SMB_REALLOC_ARRAY_KEEP_OLD_ON_ERROR(ServicePtrs, struct loadparm_service *, num_to_alloc);
                if (tsp == NULL) {
                        DEBUG(0,("add_a_service: failed to enlarge ServicePtrs!\n"));
                        return (-1);
                }
                ServicePtrs = tsp;
-               ServicePtrs[iNumServices] = SMB_MALLOC_P(struct service);
+               ServicePtrs[iNumServices] = SMB_MALLOC_P(struct loadparm_service);
                if (!ServicePtrs[iNumServices]) {
                        DEBUG(0,("add_a_service: out of memory!\n"));
                        return (-1);
@@ -6458,7 +5945,7 @@ static int add_a_service(const struct service *pservice, const char *name)
                free_service_byindex(i);
        }
 
-       ServicePtrs[i]->valid = True;
+       ServicePtrs[i]->valid = true;
 
        init_service(ServicePtrs[i]);
        copy_service(ServicePtrs[i], &tservice, NULL);
@@ -6508,7 +5995,7 @@ static bool hash_a_service(const char *name, int idx)
                ServiceHash = db_open_rbt(NULL);
                if ( !ServiceHash ) {
                        DEBUG(0,("hash_a_service: open tdb servicehash failed!\n"));
-                       return False;
+                       return false;
                }
        }
 
@@ -6523,7 +6010,7 @@ static bool hash_a_service(const char *name, int idx)
 
        TALLOC_FREE(canon_name);
 
-       return True;
+       return true;
 }
 
 /***************************************************************************
@@ -6544,7 +6031,7 @@ bool lp_add_home(const char *pszHomename, int iDefaultService,
        i = add_a_service(ServicePtrs[iDefaultService], pszHomename);
 
        if (i < 0)
-               return (False);
+               return (false);
 
        if (!(*(ServicePtrs[iDefaultService]->szPath))
            || strequal(ServicePtrs[iDefaultService]->szPath, lp_pathname(GLOBAL_SECTION_SNUM))) {
@@ -6565,12 +6052,12 @@ bool lp_add_home(const char *pszHomename, int iDefaultService,
        ServicePtrs[i]->bBrowseable = sDefault.bBrowseable;
        ServicePtrs[i]->bAccessBasedShareEnum = sDefault.bAccessBasedShareEnum;
 
-       ServicePtrs[i]->autoloaded = True;
+       ServicePtrs[i]->autoloaded = true;
 
        DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n", pszHomename, 
               user, ServicePtrs[i]->szPath ));
 
-       return (True);
+       return (true);
 }
 
 /***************************************************************************
@@ -6596,11 +6083,11 @@ static bool lp_add_ipc(const char *ipc_name, bool guest_ok)
        int i = add_a_service(&sDefault, ipc_name);
 
        if (i < 0)
-               return (False);
+               return (false);
 
        if (asprintf(&comment, "IPC Service (%s)",
                                Globals.szServerString) < 0) {
-               return (False);
+               return (false);
        }
 
        string_set(&ServicePtrs[i]->szPath, tmpdir());
@@ -6608,18 +6095,18 @@ static bool lp_add_ipc(const char *ipc_name, bool guest_ok)
        string_set(&ServicePtrs[i]->comment, comment);
        string_set(&ServicePtrs[i]->fstype, "IPC");
        ServicePtrs[i]->iMaxConnections = 0;
-       ServicePtrs[i]->bAvailable = True;
-       ServicePtrs[i]->bRead_only = True;
-       ServicePtrs[i]->bGuest_only = False;
-       ServicePtrs[i]->bAdministrative_share = True;
+       ServicePtrs[i]->bAvailable = true;
+       ServicePtrs[i]->bRead_only = true;
+       ServicePtrs[i]->bGuest_only = false;
+       ServicePtrs[i]->bAdministrative_share = true;
        ServicePtrs[i]->bGuest_ok = guest_ok;
-       ServicePtrs[i]->bPrint_ok = False;
+       ServicePtrs[i]->bPrint_ok = false;
        ServicePtrs[i]->bBrowseable = sDefault.bBrowseable;
 
        DEBUG(3, ("adding IPC service\n"));
 
        SAFE_FREE(comment);
-       return (True);
+       return (true);
 }
 
 /***************************************************************************
@@ -6632,9 +6119,9 @@ bool lp_add_printer(const char *pszPrintername, int iDefaultService)
        int i = add_a_service(ServicePtrs[iDefaultService], pszPrintername);
 
        if (i < 0)
-               return (False);
+               return (false);
 
-       /* note that we do NOT default the availability flag to True - */
+       /* note that we do NOT default the availability flag to true - */
        /* we take it from the default service passed. This allows all */
        /* dynamic printers to be disabled by disabling the [printers] */
        /* entry (if/when the 'available' keyword is implemented!).    */
@@ -6647,17 +6134,17 @@ bool lp_add_printer(const char *pszPrintername, int iDefaultService)
        ServicePtrs[i]->bBrowseable = sDefault.bBrowseable;
 
        /* Printers cannot be read_only. */
-       ServicePtrs[i]->bRead_only = False;
+       ServicePtrs[i]->bRead_only = false;
        /* No share modes on printer services. */
-       ServicePtrs[i]->bShareModes = False;
+       ServicePtrs[i]->bShareModes = false;
        /* No oplocks on printer services. */
-       ServicePtrs[i]->bOpLocks = False;
+       ServicePtrs[i]->bOpLocks = false;
        /* Printer services must be printable. */
-       ServicePtrs[i]->bPrint_ok = True;
+       ServicePtrs[i]->bPrint_ok = true;
 
        DEBUG(3, ("adding printer service %s\n", pszPrintername));
 
-       return (True);
+       return (true);
 }
 
 
@@ -6674,8 +6161,8 @@ bool lp_parameter_is_valid(const char *pszParmName)
 
 /***************************************************************************
  Check whether the given name is the name of a global parameter.
- Returns True for strings belonging to parameters of class
- P_GLOBAL, False for all other strings, also for parametric options
+ Returns true for strings belonging to parameters of class
+ P_GLOBAL, false for all other strings, also for parametric options
  and strings not belonging to any option.
 ***************************************************************************/
 
@@ -6687,19 +6174,19 @@ bool lp_parameter_is_global(const char *pszParmName)
                return (parm_table[num].p_class == P_GLOBAL);
        }
 
-       return False;
+       return false;
 }
 
 /**************************************************************************
  Check whether the given name is the canonical name of a parameter.
- Returns False if it is not a valid parameter Name.
- For parametric options, True is returned.
+ Returns false if it is not a valid parameter Name.
+ For parametric options, true is returned.
 **************************************************************************/
 
 bool lp_parameter_is_canonical(const char *parm_name)
 {
        if (!lp_parameter_is_valid(parm_name)) {
-               return False;
+               return false;
        }
 
        return (map_parameter(parm_name) ==
@@ -6719,7 +6206,7 @@ bool lp_canonicalize_parameter(const char *parm_name, const char **canon_parm,
 
        if (!lp_parameter_is_valid(parm_name)) {
                *canon_parm = NULL;
-               return False;
+               return false;
        }
 
        num = map_parameter_canonical(parm_name, inverse);
@@ -6730,7 +6217,7 @@ bool lp_canonicalize_parameter(const char *parm_name, const char **canon_parm,
                *canon_parm = parm_table[num].label;
        }
 
-       return True;
+       return true;
 
 }
 
@@ -6739,7 +6226,7 @@ bool lp_canonicalize_parameter(const char *parm_name, const char **canon_parm,
  Turn the value given into the inverse boolean expression when
  the synonym is an invers boolean synonym.
 
- Return True if parm_name is a valid parameter name and
+ Return true if parm_name is a valid parameter name and
  in case it is an invers boolean synonym, if the val string could
  successfully be converted to the reverse bool.
  Return false in all other cases.
@@ -6756,7 +6243,7 @@ bool lp_canonicalize_parameter_with_value(const char *parm_name,
        if (!lp_parameter_is_valid(parm_name)) {
                *canon_parm = NULL;
                *canon_val = NULL;
-               return False;
+               return false;
        }
 
        num = map_parameter_canonical(parm_name, &inverse);
@@ -6769,19 +6256,19 @@ bool lp_canonicalize_parameter_with_value(const char *parm_name,
                if (inverse) {
                        if (!lp_invert_boolean(val, canon_val)) {
                                *canon_val = NULL;
-                               return False;
+                               return false;
                        }
                } else {
                        *canon_val = val;
                }
        }
 
-       return True;
+       return true;
 }
 
 /***************************************************************************
  Map a parameter's string representation to something we can use. 
- Returns False if the parameter string is not recognised, else TRUE.
+ Returns false if the parameter string is not recognised, else TRUE.
 ***************************************************************************/
 
 static int map_parameter(const char *pszParmName)
@@ -6813,7 +6300,7 @@ static int map_parameter(const char *pszParmName)
 static int map_parameter_canonical(const char *pszParmName, bool *inverse)
 {
        int parm_num, canon_num;
-       bool loc_inverse = False;
+       bool loc_inverse = false;
 
        parm_num = map_parameter(pszParmName);
        if ((parm_num < 0) || !(parm_table[parm_num].flags & FLAG_HIDE)) {
@@ -6838,13 +6325,13 @@ done:
 /***************************************************************************
  return true if parameter number parm1 is a synonym of parameter
  number parm2 (parm2 being the principal name).
- set inverse to True if parm1 is P_BOOLREV and parm2 is P_BOOL,
False otherwise.
+ set inverse to true if parm1 is P_BOOLREV and parm2 is P_BOOL,
false otherwise.
 ***************************************************************************/
 
 static bool is_synonym_of(int parm1, int parm2, bool *inverse)
 {
-       if ((parm_table[parm1].ptr == parm_table[parm2].ptr) &&
+       if ((parm_table[parm1].offset == parm_table[parm2].offset) &&
            (parm_table[parm1].flags & FLAG_HIDE) &&
            !(parm_table[parm2].flags & FLAG_HIDE))
        {
@@ -6852,14 +6339,14 @@ static bool is_synonym_of(int parm1, int parm2, bool *inverse)
                        if ((parm_table[parm1].type == P_BOOLREV) &&
                            (parm_table[parm2].type == P_BOOL))
                        {
-                               *inverse = True;
+                               *inverse = true;
                        } else {
-                               *inverse = False;
+                               *inverse = false;
                        }
                }
-               return True;
+               return true;
        }
-       return False;
+       return false;
 }
 
 /***************************************************************************
@@ -6879,10 +6366,10 @@ static void show_parameter(int parmIndex)
                "P_ENUM", "P_SEP"};
        unsigned flags[] = { FLAG_BASIC, FLAG_SHARE, FLAG_PRINT, FLAG_GLOBAL,
                FLAG_WIZARD, FLAG_ADVANCED, FLAG_DEVELOPER, FLAG_DEPRECATED,
-               FLAG_HIDE, FLAG_DOS_STRING};
+               FLAG_HIDE};
        const char *flag_names[] = { "FLAG_BASIC", "FLAG_SHARE", "FLAG_PRINT",
                "FLAG_GLOBAL", "FLAG_WIZARD", "FLAG_ADVANCED", "FLAG_DEVELOPER",
-               "FLAG_DEPRECATED", "FLAG_HIDE", "FLAG_DOS_STRING", NULL};
+               "FLAG_DEPRECATED", "FLAG_HIDE", NULL};
 
        printf("%s=%s", parm_table[parmIndex].label,
               type[parm_table[parmIndex].type]);
@@ -6898,18 +6385,18 @@ static void show_parameter(int parmIndex)
                }
        }
        printf(",");
-       hadFlag = False;
+       hadFlag = false;
        for (flagIndex=0; flag_names[flagIndex]; flagIndex++) {
                if (parm_table[parmIndex].flags & flags[flagIndex]) {
                        printf("%s%s",
                                hadFlag ? "|" : "",
                                flag_names[flagIndex]);
-                       hadFlag = True;
+                       hadFlag = true;
                }
        }
 
        /* output synonyms */
-       hadSyn = False;
+       hadSyn = false;
        for (parmIndex2=0; parm_table[parmIndex2].label; parmIndex2++) {
                if (is_synonym_of(parmIndex, parmIndex2, &inverse)) {
                        printf(" (%ssynonym of %s)", inverse ? "inverse " : "",
@@ -6917,7 +6404,7 @@ static void show_parameter(int parmIndex)
                } else if (is_synonym_of(parmIndex2, parmIndex, &inverse)) {
                        if (!hadSyn) {
                                printf(" (synonyms: ");
-                               hadSyn = True;
+                               hadSyn = true;
                        } else {
                                printf(", ");
                        }
@@ -6974,7 +6461,7 @@ static const char *get_boolean(bool bool_value)
 
 /***************************************************************************
  Provide the string of the negated boolean value associated to the boolean
- given as a string. Returns False if the passed string does not correctly
+ given as a string. Returns false if the passed string does not correctly
  represent a boolean.
 ***************************************************************************/
 
@@ -6983,16 +6470,16 @@ bool lp_invert_boolean(const char *str, const char **inverse_str)
        bool val;
 
        if (!set_boolean(str, &val)) {
-               return False;
+               return false;
        }
 
        *inverse_str = get_boolean(!val);
-       return True;
+       return true;
 }
 
 /***************************************************************************
  Provide the canonical string representation of a boolean value given
- as a string. Return True on success, False if the string given does
+ as a string. Return true on success, false if the string given does
  not correctly represent a boolean.
 ***************************************************************************/
 
@@ -7001,18 +6488,18 @@ bool lp_canonicalize_boolean(const char *str, const char**canon_str)
        bool val;
 
        if (!set_boolean(str, &val)) {
-               return False;
+               return false;
        }
 
        *canon_str = get_boolean(val);
-       return True;
+       return true;
 }
 
 /***************************************************************************
 Find a service by name. Otherwise works like get_service.
 ***************************************************************************/
 
-static int getservicebyname(const char *pszServiceName, struct service *pserviceDest)
+static int getservicebyname(const char *pszServiceName, struct loadparm_service *pserviceDest)
 {
        int iService = -1;
        char *canon_name;
@@ -7093,7 +6580,7 @@ static void set_param_opt(struct param_opt_struct **opt_list,
        }
 }
 
-static void copy_service(struct service *pserviceDest, struct service *pserviceSource,
+static void copy_service(struct loadparm_service *pserviceDest, struct loadparm_service *pserviceSource,
                         struct bitmap *pcopymapDest)
 {
        int i;
@@ -7101,15 +6588,10 @@ static void copy_service(struct service *pserviceDest, struct service *pserviceS
        struct param_opt_struct *data;
 
        for (i = 0; parm_table[i].label; i++)
-               if (parm_table[i].ptr && parm_table[i].p_class == P_LOCAL &&
+               if (parm_table[i].p_class == P_LOCAL &&
                    (bcopyall || bitmap_query(pcopymapDest,i))) {
-                       void *def_ptr = parm_table[i].ptr;
-                       void *src_ptr =
-                               ((char *)pserviceSource) + PTR_DIFF(def_ptr,
-                                                                   &sDefault);
-                       void *dest_ptr =
-                               ((char *)pserviceDest) + PTR_DIFF(def_ptr,
-                                                                 &sDefault);
+                       void *src_ptr = lp_parm_ptr(pserviceSource, &parm_table[i]);
+                       void *dest_ptr = lp_parm_ptr(pserviceDest, &parm_table[i]);
 
                        switch (parm_table[i].type) {
                                case P_BOOL:
@@ -7133,10 +6615,14 @@ static void copy_service(struct service *pserviceDest, struct service *pserviceS
                                        break;
 
                                case P_USTRING:
+                               {
+                                       char *upper_string = strupper_talloc(talloc_tos(), 
+                                                                            *(char **)src_ptr);
                                        string_set((char **)dest_ptr,
-                                                  *(char **)src_ptr);
-                                       strupper_m(*(char **)dest_ptr);
+                                                  upper_string);
+                                       TALLOC_FREE(upper_string);
                                        break;
+                               }
                                case P_LIST:
                                        TALLOC_FREE(*((char ***)dest_ptr));
                                        *((char ***)dest_ptr) = str_list_copy(NULL, 
@@ -7162,19 +6648,19 @@ static void copy_service(struct service *pserviceDest, struct service *pserviceS
 }
 
 /***************************************************************************
-Check a service for consistency. Return False if the service is in any way
-incomplete or faulty, else True.
+Check a service for consistency. Return false if the service is in any way
+incomplete or faulty, else true.
 ***************************************************************************/
 
 bool service_ok(int iService)
 {
        bool bRetval;
 
-       bRetval = True;
+       bRetval = true;
        if (ServicePtrs[iService]->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 */
@@ -7183,11 +6669,11 @@ bool service_ok(int iService)
                if (!ServicePtrs[iService]->bPrint_ok) {
                        DEBUG(0, ("WARNING: [%s] service MUST be printable!\n",
                               ServicePtrs[iService]->szService));
-                       ServicePtrs[iService]->bPrint_ok = True;
+                       ServicePtrs[iService]->bPrint_ok = true;
                }
                /* [printers] service must also be non-browsable. */
                if (ServicePtrs[iService]->bBrowseable)
-                       ServicePtrs[iService]->bBrowseable = False;
+                       ServicePtrs[iService]->bBrowseable = false;
        }
 
        if (ServicePtrs[iService]->szPath[0] == '\0' &&
@@ -7196,7 +6682,7 @@ bool service_ok(int iService)
            ) {
                DEBUG(0, ("WARNING: No path in service %s - making it unavailable!\n",
                        ServicePtrs[iService]->szService));
-               ServicePtrs[iService]->bAvailable = False;
+               ServicePtrs[iService]->bAvailable = false;
        }
 
        /* If a service is flagged unavailable, log the fact at level 1. */
@@ -7496,43 +6982,34 @@ bool lp_file_list_changed(void)
                }
                f = f->next;
        }
-       return (False);
+       return (false);
 }
 
 
-/***************************************************************************
- Run standard_sub_basic on netbios name... needed because global_myname
- is not accessed through any lp_ macro.
- Note: We must *NOT* use string_set() here as ptr points to global_myname.
-***************************************************************************/
-
-static bool handle_netbios_name(int snum, const char *pszParmValue, char **ptr)
+/**
+ * Initialize iconv conversion descriptors.
+ *
+ * This is called the first time it is needed, and also called again
+ * every time the configuration is reloaded, because the charset or
+ * codepage might have changed.
+ **/
+static void init_iconv(void)
 {
-       bool ret;
-       char *netbios_name = talloc_sub_basic(
-               talloc_tos(), get_current_username(), current_user_info.domain,
-               pszParmValue);
-
-       ret = set_global_myname(netbios_name);
-       TALLOC_FREE(netbios_name);
-       string_set(&Globals.szNetbiosName,global_myname());
-
-       DEBUG(4, ("handle_netbios_name: set global_myname to: %s\n",
-              global_myname()));
-
-       return ret;
+       global_iconv_handle = smb_iconv_handle_reinit(NULL, lp_dos_charset(),
+                                                     lp_unix_charset(),
+                                                     true, global_iconv_handle);
 }
 
-static bool handle_charset(int snum, const char *pszParmValue, char **ptr)
+static bool handle_charset(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr)
 {
        if (strcmp(*ptr, pszParmValue) != 0) {
                string_set(ptr, pszParmValue);
                init_iconv();
        }
-       return True;
+       return true;
 }
 
-static bool handle_dos_charset(int snum, const char *pszParmValue, char **ptr)
+static bool handle_dos_charset(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr)
 {
        bool is_utf8 = false;
        size_t len = strlen(pszParmValue);
@@ -7569,29 +7046,22 @@ static bool handle_dos_charset(int snum, const char *pszParmValue, char **ptr)
        return true;
 }
 
-
-
-static bool handle_workgroup(int snum, const char *pszParmValue, char **ptr)
+static bool handle_realm(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr)
 {
-       bool ret;
-
-       ret = set_global_myworkgroup(pszParmValue);
-       string_set(&Globals.szWorkgroup,lp_workgroup());
-
-       return ret;
-}
-
-static bool handle_netbios_scope(int snum, const char *pszParmValue, char **ptr)
-{
-       bool ret;
+       bool ret = true;
+       char *realm = strupper_talloc(talloc_tos(), pszParmValue);
+       char *dnsdomain = strlower_talloc(talloc_tos(), pszParmValue);
 
-       ret = set_global_scope(pszParmValue);
-       string_set(&Globals.szNetbiosScope,global_scope());
+       ret &= string_set(&Globals.szRealm, pszParmValue);
+       ret &= string_set(&Globals.szRealmUpper, realm);
+       ret &= string_set(&Globals.szDnsDomain, dnsdomain);
+       TALLOC_FREE(realm);
+       TALLOC_FREE(dnsdomain);
 
        return ret;
 }
 
-static bool handle_netbios_aliases(int snum, const char *pszParmValue, char **ptr)
+static bool handle_netbios_aliases(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr)
 {
        TALLOC_FREE(Globals.szNetbiosAliases);
        Globals.szNetbiosAliases = str_list_make_v3(NULL, pszParmValue, NULL);
@@ -7603,7 +7073,7 @@ static bool handle_netbios_aliases(int snum, const char *pszParmValue, char **pt
 ***************************************************************************/
 static bool bAllowIncludeRegistry = true;
 
-static bool handle_include(int snum, const char *pszParmValue, char **ptr)
+static bool handle_include(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr)
 {
        char *fname;
 
@@ -7656,17 +7126,17 @@ static bool handle_include(int snum, const char *pszParmValue, char **ptr)
  Handle the interpretation of the copy parameter.
 ***************************************************************************/
 
-static bool handle_copy(int snum, const char *pszParmValue, char **ptr)
+static bool handle_copy(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr)
 {
        bool bRetval;
        int iTemp;
-       struct service serviceTemp;
+       struct loadparm_service serviceTemp;
 
        string_set(ptr, pszParmValue);
 
        init_service(&serviceTemp);
 
-       bRetval = False;
+       bRetval = false;
 
        DEBUG(3, ("Copying service from service %s\n", pszParmValue));
 
@@ -7677,18 +7147,18 @@ static bool handle_copy(int snum, const char *pszParmValue, char **ptr)
                        copy_service(ServicePtrs[iServiceIndex],
                                     &serviceTemp,
                                     ServicePtrs[iServiceIndex]->copymap);
-                       bRetval = True;
+                       bRetval = true;
                }
        } else {
                DEBUG(0, ("Unable to copy service - source not found: %s\n", pszParmValue));
-               bRetval = False;
+               bRetval = false;
        }
 
        free_service(&serviceTemp);
        return (bRetval);
 }
 
-static bool handle_ldap_debug_level(int snum, const char *pszParmValue, char **ptr)
+static bool handle_ldap_debug_level(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr)
 {
        Globals.ldap_debug_level = lp_int(pszParmValue);
        init_ldap_debugging();
@@ -7717,7 +7187,7 @@ static gid_t idmap_gid_low, idmap_gid_high;
 bool lp_idmap_uid(uid_t *low, uid_t *high)
 {
         if (idmap_uid_low == 0 || idmap_uid_high == 0)
-                return False;
+                return false;
 
         if (low)
                 *low = idmap_uid_low;
@@ -7725,13 +7195,13 @@ bool lp_idmap_uid(uid_t *low, uid_t *high)
         if (high)
                 *high = idmap_uid_high;
 
-        return True;
+        return true;
 }
 
 bool lp_idmap_gid(gid_t *low, gid_t *high)
 {
         if (idmap_gid_low == 0 || idmap_gid_high == 0)
-                return False;
+                return false;
 
         if (low)
                 *low = idmap_gid_low;
@@ -7739,10 +7209,10 @@ bool lp_idmap_gid(gid_t *low, gid_t *high)
         if (high)
                 *high = idmap_gid_high;
 
-        return True;
+        return true;
 }
 
-static bool handle_idmap_backend(int snum, const char *pszParmValue, char **ptr)
+static bool handle_idmap_backend(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr)
 {
        lp_do_parameter(snum, "idmap config * : backend", pszParmValue);
 
@@ -7751,25 +7221,25 @@ static bool handle_idmap_backend(int snum, const char *pszParmValue, char **ptr)
 
 /* Do some simple checks on "idmap [ug]id" parameter values */
 
-static bool handle_idmap_uid(int snum, const char *pszParmValue, char **ptr)
+static bool handle_idmap_uid(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr)
 {
        lp_do_parameter(snum, "idmap config * : range", pszParmValue);
 
-       return True;
+       return true;
 }
 
-static bool handle_idmap_gid(int snum, const char *pszParmValue, char **ptr)
+static bool handle_idmap_gid(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr)
 {
        lp_do_parameter(snum, "idmap config * : range", pszParmValue);
 
-       return True;
+       return true;
 }
 
 /***************************************************************************
  Handle the DEBUG level list.
 ***************************************************************************/
 
-static bool handle_debug_list( int snum, const char *pszParmValueIn, char **ptr )
+static bool handle_debug_list(struct loadparm_context *unused, int snum, const char *pszParmValueIn, char **ptr )
 {
        string_set(ptr, pszParmValueIn);
        return debug_parse_levels(pszParmValueIn);
@@ -7848,10 +7318,10 @@ static void lp_set_enum_parm( struct parm_struct *parm, const char *pszParmValue
 /***************************************************************************
 ***************************************************************************/
 
-static bool handle_printing(int snum, const char *pszParmValue, char **ptr)
+static bool handle_printing(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr)
 {
        static int parm_num = -1;
-       struct service *s;
+       struct loadparm_service *s;
 
        if ( parm_num == -1 )
                parm_num = map_parameter( "printing" );
@@ -7865,7 +7335,7 @@ static bool handle_printing(int snum, const char *pszParmValue, char **ptr)
 
        init_printer_values( s );
 
-       return True;
+       return true;
 }
 
 
@@ -7873,7 +7343,7 @@ static bool handle_printing(int snum, const char *pszParmValue, char **ptr)
  Initialise a copymap.
 ***************************************************************************/
 
-static void init_copymap(struct service *pservice)
+static void init_copymap(struct loadparm_service *pservice)
 {
        int i;
 
@@ -7889,24 +7359,29 @@ static void init_copymap(struct service *pservice)
                        bitmap_set(pservice->copymap, i);
 }
 
-/***************************************************************************
- Return the local pointer to a parameter given a service struct and the
- pointer into the default structure.
-***************************************************************************/
-
-static void *lp_local_ptr(struct service *service, void *ptr)
+/**
+  return the parameter pointer for a parameter
+*/
+void *lp_parm_ptr(struct loadparm_service *service, struct parm_struct *parm)
 {
-       return (void *)(((char *)service) + PTR_DIFF(ptr, &sDefault));
+       if (service == NULL) {
+               if (parm->p_class == P_LOCAL)
+                       return (void *)(((char *)&sDefault)+parm->offset);
+               else if (parm->p_class == P_GLOBAL)
+                       return (void *)(((char *)&Globals)+parm->offset);
+               else return NULL;
+       } else {
+               return (void *)(((char *)service) + parm->offset);
+       }
 }
 
 /***************************************************************************
- Return the local pointer to a parameter given the service number and the 
- pointer into the default structure.
+ Return the local pointer to a parameter given the service number and parameter
 ***************************************************************************/
 
-void *lp_local_ptr_by_snum(int snum, void *ptr)
+void *lp_local_ptr_by_snum(int snum, struct parm_struct *parm)
 {
-       return lp_local_ptr(ServicePtrs[snum], ptr);
+       return lp_parm_ptr(ServicePtrs[snum], parm);
 }
 
 /***************************************************************************
@@ -7918,7 +7393,6 @@ bool lp_do_parameter(int snum, 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;
        struct param_opt_struct **opt_list;
 
        parmnum = map_parameter(pszParmName);
@@ -7927,7 +7401,7 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
                if (strchr(pszParmName, ':') == NULL) {
                        DEBUG(0, ("Ignoring unknown parameter \"%s\"\n",
                                  pszParmName));
-                       return (True);
+                       return (true);
                }
 
                /*
@@ -7938,7 +7412,7 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
                        ? &Globals.param_opt : &ServicePtrs[snum]->param_opt;
                set_param_opt(opt_list, pszParmName, pszParmValue, 0);
 
-               return (True);
+               return (true);
        }
 
        /* if it's already been set by the command line, then we don't
@@ -7952,19 +7426,17 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
                          pszParmName));
        }
 
-       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;
+               parm_ptr = lp_parm_ptr(NULL, &parm_table[parmnum]);
        } else {
                if (parm_table[parmnum].p_class == P_GLOBAL) {
                        DEBUG(0,
                              ("Global parameter %s found in service section!\n",
                               pszParmName));
-                       return (True);
+                       return (true);
                }
-               parm_ptr = lp_local_ptr_by_snum(snum, def_ptr);
+               parm_ptr = lp_local_ptr_by_snum(snum, &parm_table[parmnum]);
        }
 
        if (snum >= 0) {
@@ -7974,13 +7446,13 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
                /* this handles the aliases - set the copymap for other entries with
                   the same data pointer */
                for (i = 0; parm_table[i].label; i++)
-                       if (parm_table[i].ptr == parm_table[parmnum].ptr)
+                       if (parm_table[i].offset == parm_table[parmnum].offset)
                                bitmap_clear(ServicePtrs[snum]->copymap, i);
        }
 
        /* if it is a special case then go ahead */
        if (parm_table[parmnum].special) {
-               return parm_table[parmnum].special(snum, pszParmValue,
+               return parm_table[parmnum].special(NULL, snum, pszParmValue,
                                                   (char **)parm_ptr);
        }
 
@@ -8021,10 +7493,13 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
                        break;
 
                case P_USTRING:
-                       string_set((char **)parm_ptr, pszParmValue);
-                       strupper_m(*(char **)parm_ptr);
+               {
+                       char *upper_string = strupper_talloc(talloc_tos(), 
+                                                            pszParmValue);
+                       string_set((char **)parm_ptr, upper_string);
+                       TALLOC_FREE(upper_string);
                        break;
-
+               }
                case P_ENUM:
                        lp_set_enum_parm( &parm_table[parmnum], pszParmValue, (int*)parm_ptr );
                        break;
@@ -8032,7 +7507,7 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
                        break;
        }
 
-       return (True);
+       return (true);
 }
 
 /***************************************************************************
@@ -8054,10 +7529,10 @@ static bool lp_set_cmdline_helper(const char *pszParmName, const char *pszParmVa
                /* we have to also set FLAG_CMDLINE on aliases.  Aliases must
                 * be grouped in the table, so we don't have to search the
                 * whole table */
-               for (i=parmnum-1;i>=0 && parm_table[i].ptr == parm_table[parmnum].ptr;i--) {
+               for (i=parmnum-1;i>=0 && parm_table[i].offset == parm_table[parmnum].offset;i--) {
                        parm_table[i].flags |= FLAG_CMDLINE;
                }
-               for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].ptr == parm_table[parmnum].ptr;i++) {
+               for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].offset == parm_table[parmnum].offset;i++) {
                        parm_table[i].flags |= FLAG_CMDLINE;
                }
 
@@ -8093,7 +7568,7 @@ static bool do_parameter(const char *pszParmName, const char *pszParmValue,
                         void *userdata)
 {
        if (!bInGlobalSection && bGlobalOnly)
-               return (True);
+               return (true);
 
        DEBUGADD(4, ("doing parameter %s = %s\n", pszParmName, pszParmValue));
 
@@ -8233,7 +7708,7 @@ static bool equal_parameter(parm_type type, void *ptr1, void *ptr2)
                case P_SEP:
                        break;
        }
-       return (False);
+       return (false);
 }
 
 /***************************************************************************
@@ -8248,7 +7723,7 @@ void init_locals(void)
 /***************************************************************************
  Process a new section (service). At this stage all sections are services.
  Later we'll have special sections that permit server parameters to be set.
- Returns True on success, False on failure. 
+ Returns true on success, false on failure.
 ***************************************************************************/
 
 static bool do_section(const char *pszSectionName, void *userdata)
@@ -8256,7 +7731,7 @@ static bool do_section(const char *pszSectionName, void *userdata)
        bool bRetval;
        bool isglobal = ((strwicmp(pszSectionName, GLOBAL_NAME) == 0) ||
                         (strwicmp(pszSectionName, GLOBAL_NAME2) == 0));
-       bRetval = False;
+       bRetval = false;
 
        /* if we were in a global section then do the local inits */
        if (bInGlobalSection && !isglobal)
@@ -8268,14 +7743,14 @@ static bool do_section(const char *pszSectionName, void *userdata)
        /* check for multiple global sections */
        if (bInGlobalSection) {
                DEBUG(3, ("Processing section \"[%s]\"\n", pszSectionName));
-               return (True);
+               return (true);
        }
 
        if (!bInGlobalSection && bGlobalOnly)
-               return (True);
+               return (true);
 
        /* if we have a current service, tidy it up before moving on */
-       bRetval = True;
+       bRetval = true;
 
        if (iServiceIndex >= 0)
                bRetval = service_ok(iServiceIndex);
@@ -8289,7 +7764,7 @@ static bool do_section(const char *pszSectionName, void *userdata)
                if ((iServiceIndex = add_a_service(&sDefault, pszSectionName))
                    < 0) {
                        DEBUG(0, ("Failed to add a new service\n"));
-                       return (False);
+                       return (false);
                }
                /* Clean all parametric options for service */
                /* They will be added during parsing again */
@@ -8307,31 +7782,36 @@ static bool do_section(const char *pszSectionName, void *userdata)
 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, 
-                                               *(const char ***)parm_table[i].ptr);
+                                             *(const char ***)lp_parm_ptr(NULL, 
+                                                                          &parm_table[i]));
                case P_STRING:
                case P_USTRING:
                        return strequal(parm_table[i].def.svalue,
-                                       *(char **)parm_table[i].ptr);
+                                       *(char **)lp_parm_ptr(NULL, 
+                                                             &parm_table[i]));
                case P_BOOL:
                case P_BOOLREV:
                        return parm_table[i].def.bvalue ==
-                               *(bool *)parm_table[i].ptr;
+                               *(bool *)lp_parm_ptr(NULL, 
+                                                    &parm_table[i]);
                case P_CHAR:
                        return parm_table[i].def.cvalue ==
-                               *(char *)parm_table[i].ptr;
+                               *(char *)lp_parm_ptr(NULL, 
+                                                    &parm_table[i]);
                case P_INTEGER:
                case P_OCTAL:
                case P_ENUM:
                        return parm_table[i].def.ivalue ==
-                               *(int *)parm_table[i].ptr;
+                               *(int *)lp_parm_ptr(NULL, 
+                                                   &parm_table[i]);
                case P_SEP:
                        break;
        }
-       return False;
+       return false;
 }
 
 /***************************************************************************
@@ -8348,12 +7828,13 @@ static void dump_globals(FILE *f)
        for (i = 0; parm_table[i].label; i++)
                if (parm_table[i].p_class == P_GLOBAL &&
                    !(parm_table[i].flags & FLAG_META) &&
-                   parm_table[i].ptr &&
-                   (i == 0 || (parm_table[i].ptr != parm_table[i - 1].ptr))) {
+                   (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) {
                        if (defaults_saved && is_default(i))
                                continue;
                        fprintf(f, "\t%s = ", parm_table[i].label);
-                       print_parameter(&parm_table[i], parm_table[i].ptr, f);
+                       print_parameter(&parm_table[i], lp_parm_ptr(NULL, 
+                                                                   &parm_table[i]),
+                                       f);
                        fprintf(f, "\n");
        }
        if (Globals.param_opt != NULL) {
@@ -8367,23 +7848,21 @@ static void dump_globals(FILE *f)
 }
 
 /***************************************************************************
- Return True if a local parameter is currently set to the global default.
+ Return true if a local parameter is currently set to the global default.
 ***************************************************************************/
 
 bool lp_is_default(int snum, struct parm_struct *parm)
 {
-       int pdiff = PTR_DIFF(parm->ptr, &sDefault);
-
        return equal_parameter(parm->type,
-                              ((char *)ServicePtrs[snum]) + pdiff,
-                              ((char *)&sDefault) + pdiff);
+                              lp_parm_ptr(ServicePtrs[snum], parm),
+                              lp_parm_ptr(NULL, parm));
 }
 
 /***************************************************************************
  Display the contents of a single services record.
 ***************************************************************************/
 
-static void dump_a_service(struct service *pService, FILE * f)
+static void dump_a_service(struct loadparm_service *pService, FILE * f)
 {
        int i;
        struct param_opt_struct *data;
@@ -8395,27 +7874,23 @@ static void dump_a_service(struct service *pService, FILE * f)
 
                if (parm_table[i].p_class == P_LOCAL &&
                    !(parm_table[i].flags & FLAG_META) &&
-                   parm_table[i].ptr &&
                    (*parm_table[i].label != '-') &&
-                   (i == 0 || (parm_table[i].ptr != parm_table[i - 1].ptr))) 
+                   (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) 
                {
-                       int pdiff = PTR_DIFF(parm_table[i].ptr, &sDefault);
-
                        if (pService == &sDefault) {
                                if (defaults_saved && is_default(i))
                                        continue;
                        } else {
                                if (equal_parameter(parm_table[i].type,
-                                                   ((char *)pService) +
-                                                   pdiff,
-                                                   ((char *)&sDefault) +
-                                                   pdiff))
+                                                   lp_parm_ptr(pService, &parm_table[i]),
+                                                   lp_parm_ptr(NULL, &parm_table[i])))
                                        continue;
                        }
 
                        fprintf(f, "\t%s = ", parm_table[i].label);
                        print_parameter(&parm_table[i],
-                                       ((char *)pService) + pdiff, f);
+                                       lp_parm_ptr(pService, &parm_table[i]),
+                                       f);
                        fprintf(f, "\n");
                }
        }
@@ -8436,7 +7911,7 @@ static void dump_a_service(struct service *pService, FILE * f)
 bool dump_a_parameter(int snum, char *parm_name, FILE * f, bool isGlobal)
 {
        int i;
-       bool result = False;
+       bool result = false;
        parm_class p_class;
        unsigned flag = 0;
        fstring local_parm_name;
@@ -8455,7 +7930,7 @@ bool dump_a_parameter(int snum, char *parm_name, FILE * f, bool isGlobal)
                                local_parm_name, parm_opt, NULL);
                        if (parm_opt_value) {
                                printf( "%s\n", parm_opt_value);
-                               result = True;
+                               result = true;
                        }
                }
                return result;
@@ -8472,24 +7947,23 @@ bool dump_a_parameter(int snum, char *parm_name, FILE * f, bool isGlobal)
                if (strwicmp(parm_table[i].label, parm_name) == 0 &&
                    !(parm_table[i].flags & FLAG_META) &&
                    (parm_table[i].p_class == p_class || parm_table[i].flags & flag) &&
-                   parm_table[i].ptr &&
                    (*parm_table[i].label != '-') &&
-                   (i == 0 || (parm_table[i].ptr != parm_table[i - 1].ptr))) 
+                   (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) 
                {
                        void *ptr;
 
                        if (isGlobal) {
-                               ptr = parm_table[i].ptr;
+                               ptr = lp_parm_ptr(NULL, 
+                                                 &parm_table[i]);
                        } else {
-                               struct service *pService = ServicePtrs[snum];
-                               ptr = ((char *)pService) +
-                                       PTR_DIFF(parm_table[i].ptr, &sDefault);
+                               ptr = lp_parm_ptr(ServicePtrs[snum], 
+                                                 &parm_table[i]);
                        }
 
                        print_parameter(&parm_table[i],
                                        ptr, f);
                        fprintf(f, "\n");
-                       result = True;
+                       result = true;
                        break;
                }
        }
@@ -8527,13 +8001,12 @@ struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters)
                        if (parm_table[*i].p_class == P_SEPARATOR)
                                return &parm_table[(*i)++];
 
-                       if (!parm_table[*i].ptr
-                           || (*parm_table[*i].label == '-'))
+                       if ((*parm_table[*i].label == '-'))
                                continue;
 
                        if ((*i) > 0
-                           && (parm_table[*i].ptr ==
-                               parm_table[(*i) - 1].ptr))
+                           && (parm_table[*i].offset ==
+                               parm_table[(*i) - 1].offset))
                                continue;
 
                        if (is_default(*i) && !allparameters)
@@ -8542,29 +8015,24 @@ struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters)
                        return &parm_table[(*i)++];
                }
        } else {
-               struct service *pService = ServicePtrs[snum];
+               struct loadparm_service *pService = ServicePtrs[snum];
 
                for (; parm_table[*i].label; (*i)++) {
                        if (parm_table[*i].p_class == P_SEPARATOR)
                                return &parm_table[(*i)++];
 
                        if (parm_table[*i].p_class == P_LOCAL &&
-                           parm_table[*i].ptr &&
                            (*parm_table[*i].label != '-') &&
                            ((*i) == 0 ||
-                            (parm_table[*i].ptr !=
-                             parm_table[(*i) - 1].ptr)))
+                            (parm_table[*i].offset !=
+                             parm_table[(*i) - 1].offset)))
                        {
-                               int pdiff =
-                                       PTR_DIFF(parm_table[*i].ptr,
-                                                &sDefault);
-
                                if (allparameters ||
                                    !equal_parameter(parm_table[*i].type,
-                                                    ((char *)pService) +
-                                                    pdiff,
-                                                    ((char *)&sDefault) +
-                                                    pdiff))
+                                                    lp_parm_ptr(pService, 
+                                                                &parm_table[*i]),
+                                                    lp_parm_ptr(NULL, 
+                                                                &parm_table[*i])))
                                {
                                        return &parm_table[(*i)++];
                                }
@@ -8658,7 +8126,7 @@ void lp_add_one_printer(const char *name, const char *comment,
                lp_add_printer(name, printers);
                if ((i = lp_servicenumber(name)) >= 0) {
                        string_set(&ServicePtrs[i]->comment, comment);
-                       ServicePtrs[i]->autoloaded = True;
+                       ServicePtrs[i]->autoloaded = true;
                }
        }
 }
@@ -8725,41 +8193,37 @@ 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)
+               if (i > 0 && parm_table[i].offset == parm_table[i - 1].offset)
                        continue;
                switch (parm_table[i].type) {
                        case P_LIST:
                                parm_table[i].def.lvalue = str_list_copy(
-                                       NULL, *(const char ***)parm_table[i].ptr);
+                                       NULL, *(const char ***)lp_parm_ptr(NULL, &parm_table[i]));
                                break;
                        case P_STRING:
                        case P_USTRING:
-                               if (parm_table[i].ptr) {
-                                       parm_table[i].def.svalue = SMB_STRDUP(*(char **)parm_table[i].ptr);
-                               } else {
-                                       parm_table[i].def.svalue = NULL;
-                               }
+                               parm_table[i].def.svalue = SMB_STRDUP(*(char **)lp_parm_ptr(NULL, &parm_table[i]));
                                break;
                        case P_BOOL:
                        case P_BOOLREV:
                                parm_table[i].def.bvalue =
-                                       *(bool *)parm_table[i].ptr;
+                                       *(bool *)lp_parm_ptr(NULL, &parm_table[i]);
                                break;
                        case P_CHAR:
                                parm_table[i].def.cvalue =
-                                       *(char *)parm_table[i].ptr;
+                                       *(char *)lp_parm_ptr(NULL, &parm_table[i]);
                                break;
                        case P_INTEGER:
                        case P_OCTAL:
                        case P_ENUM:
                                parm_table[i].def.ivalue =
-                                       *(int *)parm_table[i].ptr;
+                                       *(int *)lp_parm_ptr(NULL, &parm_table[i]);
                                break;
                        case P_SEP:
                                break;
                }
        }
-       defaults_saved = True;
+       defaults_saved = true;
 }
 
 /***********************************************************
@@ -8769,10 +8233,10 @@ static void lp_save_defaults(void)
 static void set_allowed_client_auth(void)
 {
        if (Globals.bClientNTLMv2Auth) {
-               Globals.bClientLanManAuth = False;
+               Globals.bClientLanManAuth = false;
        }
        if (!Globals.bClientLanManAuth) {
-               Globals.bClientPlaintextAuth = False;
+               Globals.bClientPlaintextAuth = false;
        }
 }
 
@@ -8802,7 +8266,7 @@ static bool check_usershare_stat(const char *fname,
                DEBUG(0,("check_usershare_stat: file %s owned by uid %u is "
                        "not a regular file\n",
                        fname, (unsigned int)psbuf->st_ex_uid ));
-               return False;
+               return false;
        }
 
        /* Ensure this doesn't have the other write bit set. */
@@ -8810,7 +8274,7 @@ static bool check_usershare_stat(const char *fname,
                DEBUG(0,("check_usershare_stat: file %s owned by uid %u allows "
                        "public write. Refusing to allow as a usershare file.\n",
                        fname, (unsigned int)psbuf->st_ex_uid ));
-               return False;
+               return false;
        }
 
        /* Should be 10k or less. */
@@ -8819,10 +8283,10 @@ static bool check_usershare_stat(const char *fname,
                        "too large (%u) to be a user share file.\n",
                        fname, (unsigned int)psbuf->st_ex_uid,
                        (unsigned int)psbuf->st_ex_size ));
-               return False;
+               return false;
        }
 
-       return True;
+       return true;
 }
 
 /***************************************************************************
@@ -8852,7 +8316,7 @@ enum usershare_err parse_usershare_file(TALLOC_CTX *ctx,
        *pp_sharepath = NULL;
        *pp_comment = NULL;
 
-       *pallow_guest = False;
+       *pallow_guest = false;
 
        if (numlines < 4) {
                return USERSHARE_MALFORMED_FILE;
@@ -8903,7 +8367,7 @@ enum usershare_err parse_usershare_file(TALLOC_CTX *ctx,
                        return USERSHARE_MALFORMED_ACL_DEF;
                }
                if (lines[4][9] == 'y') {
-                       *pallow_guest = True;
+                       *pallow_guest = true;
                }
 
                /* Backwards compatible extension to file version #2. */
@@ -9044,7 +8508,7 @@ static int process_usershare_file(const char *dir_name, const char *file_name, i
        int iService = -1;
        TALLOC_CTX *ctx = talloc_stackframe();
        struct security_descriptor *psd = NULL;
-       bool guest_ok = False;
+       bool guest_ok = false;
        char *canon_name = NULL;
        bool added_service = false;
        int ret = -1;
@@ -9157,7 +8621,7 @@ static int process_usershare_file(const char *dir_name, const char *file_name, i
 
        /* Everything ok - add the service possibly using a template. */
        if (iService < 0) {
-               const struct service *sp = &sDefault;
+               const struct loadparm_service *sp = &sDefault;
                if (snum_template != -1) {
                        sp = ServicePtrs[snum_template];
                }
@@ -9171,7 +8635,7 @@ static int process_usershare_file(const char *dir_name, const char *file_name, i
                added_service = true;
 
                /* Read only is controlled by usershare ACL below. */
-               ServicePtrs[iService]->bRead_only = False;
+               ServicePtrs[iService]->bRead_only = false;
        }
 
        /* Write the ACL of the new/modified share. */
@@ -9183,7 +8647,7 @@ static int process_usershare_file(const char *dir_name, const char *file_name, i
        }
 
        /* If from a template it may be marked invalid. */
-       ServicePtrs[iService]->valid = True;
+       ServicePtrs[iService]->valid = true;
 
        /* Set the service as a valid usershare. */
        ServicePtrs[iService]->usershare = USERSHARE_VALID;
@@ -9288,7 +8752,7 @@ int load_usershare_service(const char *servicename)
        /* Ensure the template share exists if it's set. */
        if (Globals.szUsershareTemplateShare[0]) {
                /* We can't use lp_servicenumber here as we are recommending that
-                  template shares have -valid=False set. */
+                  template shares have -valid=false set. */
                for (snum_template = iNumServices - 1; snum_template >= 0; snum_template--) {
                        if (ServicePtrs[snum_template]->szService &&
                                        strequal(ServicePtrs[snum_template]->szService,
@@ -9359,7 +8823,7 @@ int load_usershare_shares(struct smbd_server_connection *sconn)
        /* Ensure the template share exists if it's set. */
        if (Globals.szUsershareTemplateShare[0]) {
                /* We can't use lp_servicenumber here as we are recommending that
-                  template shares have -valid=False set. */
+                  template shares have -valid=false set. */
                for (snum_template = iNumServices - 1; snum_template >= 0; snum_template--) {
                        if (ServicePtrs[snum_template]->szService &&
                                        strequal(ServicePtrs[snum_template]->szService,
@@ -9513,8 +8977,8 @@ bool lp_is_in_client(void)
 }
 
 /***************************************************************************
- Load the services array from the services file. Return True on success, 
False on failure.
+ Load the services array from the services file. Return true on success,
false on failure.
 ***************************************************************************/
 
 static bool lp_load_ex(const char *pszFname,
@@ -9528,11 +8992,11 @@ static bool lp_load_ex(const char *pszFname,
        char *n2 = NULL;
        bool bRetval;
 
-       bRetval = False;
+       bRetval = false;
 
        DEBUG(3, ("lp_load_ex: refreshing parameters\n"));
 
-       bInGlobalSection = True;
+       bInGlobalSection = true;
        bGlobalOnly = global_only;
        bAllowIncludeRegistry = allow_include_registry;
 
@@ -9630,7 +9094,7 @@ static bool lp_load_ex(const char *pszFname,
                          lp_passwordserver()));
        }
 
-       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            */
@@ -9706,7 +9170,7 @@ void lp_dump(FILE *f, bool show_defaults, int maxtoprint)
        int iService;
 
        if (show_defaults)
-               defaults_saved = False;
+               defaults_saved = false;
 
        dump_globals(f);
 
@@ -9835,22 +9299,8 @@ static void set_default_server_announce_type(void)
 
        default_server_announce |= SV_TYPE_PRINTQ_SERVER;
 
-       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;
-       }
+       default_server_announce |= SV_TYPE_SERVER_NT;
+       default_server_announce |= SV_TYPE_NT;
 
        switch (lp_server_role()) {
                case ROLE_DOMAIN_MEMBER:
@@ -9915,7 +9365,7 @@ bool lp_preferred_master(void)
 
 void lp_remove_service(int snum)
 {
-       ServicePtrs[snum]->valid = False;
+       ServicePtrs[snum]->valid = false;
        invalid_services[num_invalid_services++] = snum;
 }
 
@@ -9943,54 +9393,6 @@ int lp_default_server_announce(void)
        return default_server_announce;
 }
 
-/*******************************************************************
- Split the announce version into major and minor numbers.
-********************************************************************/
-
-int lp_major_announce_version(void)
-{
-       static bool got_major = False;
-       static int major_version = DEFAULT_MAJOR_VERSION;
-       char *vers;
-       char *p;
-
-       if (got_major)
-               return major_version;
-
-       got_major = True;
-       if ((vers = lp_announce_version()) == NULL)
-               return major_version;
-
-       if ((p = strchr_m(vers, '.')) == 0)
-               return major_version;
-
-       *p = '\0';
-       major_version = atoi(vers);
-       return major_version;
-}
-
-int lp_minor_announce_version(void)
-{
-       static bool got_minor = False;
-       static int minor_version = DEFAULT_MINOR_VERSION;
-       char *vers;
-       char *p;
-
-       if (got_minor)
-               return minor_version;
-
-       got_minor = True;
-       if ((vers = lp_announce_version()) == NULL)
-               return minor_version;
-
-       if ((p = strchr_m(vers, '.')) == 0)
-               return minor_version;
-
-       p++;
-       minor_version = atoi(p);
-       return minor_version;
-}
-
 /***********************************************************
  Set the global name resolution order (used in smbclient).
 ************************************************************/
@@ -10060,7 +9462,7 @@ bool lp_disable_spoolss( void )
        if ( spoolss_state == SVCCTL_STATE_UNKNOWN )
                spoolss_state = _lp_disable_spoolss() ? SVCCTL_STOPPED : SVCCTL_RUNNING;
 
-       return spoolss_state == SVCCTL_STOPPED ? True : False;
+       return spoolss_state == SVCCTL_STOPPED ? true : false;
 }
 
 void lp_set_spoolss_state( uint32 state )
@@ -10141,7 +9543,7 @@ bool lp_posix_pathnames(void)
 
 void lp_set_posix_pathnames(void)
 {
-       posix_pathnames = True;
+       posix_pathnames = true;
 }
 
 /*******************************************************************
@@ -10165,7 +9567,7 @@ enum brl_flavour lp_posix_cifsu_locktype(files_struct *fsp)
 
 void lp_set_posix_default_cifsx_readwrite_locktype(enum brl_flavour val)
 {
-       posix_default_lock_was_set = True;
+       posix_default_lock_was_set = true;
        posix_cifsx_locktype = val;
 }
 
@@ -10192,11 +9594,6 @@ const char *lp_socket_address(void)
        return  Globals.szSocketAddress;
 }
 
-void lp_set_passdb_backend(const char *backend)
-{
-       string_set(&Globals.szPassdbBackend, backend);
-}
-
 /*******************************************************************
  Safe wide links checks.
  This helper function always verify the validity of wide links,