r4439: unlimited connections is -1
[samba.git] / source4 / param / loadparm.c
index 89ba7926009991842a46863faf431d4c85a4baed..8e535c09005f10da8d0ff69619fc4bd2202f16a0 100644 (file)
@@ -8,7 +8,7 @@
    Copyright (C) Simo Sorce 2001
    Copyright (C) Alexander Bokovoy 2002
    Copyright (C) Stefan (metze) Metzmacher 2002
-   Copyright (C) Anthony Liguori 2003
+   Copyright (C) Jim McDonough (jmcd@us.ibm.com)  2003.
    Copyright (C) James Myers 2003 <myersjj@samba.org>
    
    This program is free software; you can redistribute it and/or modify
  */
 
 #include "includes.h"
+#include "dynconfig.h"
+#include "system/time.h"
+#include "system/iconv.h"
+#include "system/network.h"
+#include "system/printing.h"
+#include "librpc/gen_ndr/ndr_svcctl.h"
+#include "dlinklist.h"
 
 BOOL in_client = False;                /* Not in the client by default */
 static BOOL bLoaded = False;
@@ -74,9 +81,60 @@ static BOOL bLoaded = False;
 #define VALID(i) ServicePtrs[i]->valid
 
 static BOOL do_parameter(const char *, const char *);
+static BOOL do_parameter_var(const char *pszParmName, const char *fmt, ...);
 
 static BOOL defaults_saved = False;
 
+
+#define FLAG_BASIC     0x0001 /* fundamental options */
+#define FLAG_SHARE     0x0002 /* file sharing options */
+#define FLAG_PRINT     0x0004 /* printing options */
+#define FLAG_GLOBAL    0x0008 /* local options that should be globally settable in SWAT */
+#define FLAG_WIZARD    0x0010 /* Parameters that the wizard will operate on */
+#define FLAG_ADVANCED  0x0020 /* Parameters that the wizard will operate on */
+#define FLAG_DEVELOPER         0x0040 /* Parameters that the wizard will operate on */
+#define FLAG_DEPRECATED 0x1000 /* options that should no longer be used */
+#define FLAG_HIDE      0x2000 /* options that should be hidden in SWAT */
+#define FLAG_DOS_STRING 0x4000 /* convert from UNIX to DOS codepage when reading this string. */
+#define FLAG_CMDLINE    0x8000 /* this option was set from the command line */
+
+
+/* the following are used by loadparm for option lists */
+typedef enum
+{
+  P_BOOL,P_BOOLREV,P_CHAR,P_INTEGER,P_OCTAL,P_LIST,
+  P_STRING,P_USTRING,P_ENUM,P_SEP
+} parm_type;
+
+typedef enum
+{
+  P_LOCAL,P_GLOBAL,P_SEPARATOR,P_NONE
+} parm_class;
+
+struct enum_list {
+       int value;
+       const char *name;
+};
+
+struct parm_struct
+{
+       const char *label;
+       parm_type type;
+       parm_class class;
+       void *ptr;
+       BOOL (*special)(const char *, char **);
+       const struct enum_list *enum_list;
+       uint_t flags;
+       union {
+               BOOL bvalue;
+               int ivalue;
+               char *svalue;
+               char cvalue;
+               char **lvalue;
+       } def;
+};
+
+
 struct param_opt {
        struct param_opt *prev, *next;
        char *key;
@@ -89,21 +147,16 @@ struct param_opt {
  */
 typedef struct
 {
-       char *smb_ports;
+       char **smb_ports;
        char *dos_charset;
        char *unix_charset;
+       char *ncalrpc_dir;
        char *display_charset;
        char *szPrintcapname;
-       char *szEnumPortsCommand;
-       char *szAddPrinterCommand;
-       char *szDeletePrinterCommand;
-       char *szOs2DriverMap;
        char *szLockDir;
        char *szPidDir;
        char *szRootdir;
        char *szDefaultService;
-       char *szDfree;
-       char *szMsgCommand;
        char *szHostsEquiv;
        char *szServerString;
        char *szAutoServices;
@@ -112,15 +165,14 @@ typedef struct
        char *szLogFile;
        char *szConfigFile;
        char *szSMBPasswdFile;
+       char *szSAM_URL;
+       char *szSPOOLSS_URL;
        char *szPrivateDir;
-       char **szPassdbBackend;
-       char **szSamBackend;
        char **szPreloadModules;
        char *szPasswordServer;
        char *szSocketOptions;
        char *szRealm;
        char *szADSserver;
-       char *szUsernameMap;
        char *szLogonScript;
        char *szLogonPath;
        char *szLogonDrive;
@@ -130,7 +182,6 @@ typedef struct
        char *szRemoteAnnounce;
        char *szRemoteBrowseSync;
        char *szSocketAddress;
-       char *szNISHomeMapName;
        char *szAnnounceVersion;        /* This is initialised in init_globals */
        char *szWorkgroup;
        char *szNetbiosName;
@@ -139,28 +190,15 @@ typedef struct
        char *szDomainOtherSIDs;
        char *szNameResolveOrder;
        char *szPanicAction;
-       char *szAddUserScript;
-       char *szDelUserScript;
-       char *szAddGroupScript;
-       char *szDelGroupScript;
-       char *szAddUserToGroupScript;
-       char *szDelUserFromGroupScript;
-       char *szSetPrimaryGroupScript;
+       char *szAddUserScript; 
        char *szAddMachineScript;
-       char *szShutdownScript;
-       char *szAbortShutdownScript;
        char *szWINSHook;
        char *szWINSPartners;
-#ifdef WITH_UTMP
-       char *szUtmpDir;
-       char *szWtmpDir;
-       BOOL bUtmp;
-#endif
-       char *szSourceEnv;
+       char **dcerpc_ep_servers;
+       char **server_services;
        char *szWinbindUID;
        char *szWinbindGID;
        char *szNonUnixAccountRange;
-       int AlgorithmicRidBase;
        char *szTemplateHomedir;
        char *szTemplateShell;
        char *szWinbindSeparator;
@@ -168,66 +206,32 @@ typedef struct
        BOOL bWinbindEnumGroups;
        BOOL bWinbindUseDefaultDomain;
        char *szIDMapBackend;
-       char *szAddShareCommand;
-       char *szChangeShareCommand;
-       char *szDeleteShareCommand;
        char *szGuestaccount;
-       char *szManglingMethod;
-       int mangle_prefix;
-       int max_log_size;
-       int keepalive;
-       int mangled_stack;
-       int max_xmit;
        int max_mux;
-       int max_open_files;
+       int max_xmit;
        int pwordlevel;
        int unamelevel;
-       int deadtime;
        int maxprotocol;
        int minprotocol;
        int security;
        char **AuthMethods;
        BOOL paranoid_server_security;
-       int maxdisksize;
        int lpqcachetime;
-       int iMaxSmbdProcesses;
        BOOL bDisableSpoolss;
-       int iTotalPrintJobs;
-       int syslog;
        int os_level;
        int enhanced_browsing;
        int time_offset;
        int max_ttl;
        int max_wins_ttl;
        int min_wins_ttl;
-       int ReadSize;
        int lm_announce;
        int lm_interval;
        int announce_as;        /* This is initialised in init_globals */
        int machine_password_timeout;
-       int change_notify_timeout;
-       int stat_cache_size;
-       int map_to_guest;
-       int min_passwd_length;
-       int oplock_break_wait_time;
        int winbind_cache_time;
        int iLockSpinCount;
        int iLockSpinTime;
-       char *szLdapMachineSuffix;
-       char *szLdapUserSuffix;
-#ifdef WITH_LDAP_SAMCONFIG
-       int ldap_port;
-       char *szLdapServer;
-#endif
        char *socket_options;
-       int ldap_ssl;
-       char *szLdapSuffix;
-       char *szLdapFilter;
-       char *szLdapAdminDn;
-       BOOL ldap_trust_ids;
-       char *szAclCompat;
-       int ldap_passwd_sync; 
-       BOOL bMsAddPrinterWizard;
        BOOL bDNSproxy;
        BOOL bWINSsupport;
        BOOL bWINSproxy;
@@ -236,40 +240,25 @@ typedef struct
        BOOL bDomainMaster;
        BOOL bDomainLogons;
        BOOL bEncryptPasswords;
-       BOOL bUpdateEncrypt;
-       BOOL bStripDot;
        BOOL bNullPasswords;
        BOOL bObeyPamRestrictions;
        BOOL bLoadPrinters;
        BOOL bLargeReadwrite;
        BOOL bReadRaw;
        BOOL bWriteRaw;
-       BOOL bReadPrediction;
-       BOOL bReadbmpx;
-       BOOL bSyslogOnly;
-       BOOL bBrowseList;
-       BOOL bNISHomeMap;
        BOOL bTimeServer;
        BOOL bBindInterfacesOnly;
        BOOL bPamPasswordChange;
-       BOOL bUnixPasswdSync;
-       BOOL bPasswdChatDebug;
-       BOOL bTimestampLogs;
        BOOL bNTSmbSupport;
-       BOOL bNTPipeSupport;
        BOOL bNTStatusSupport;
-       BOOL bStatCache;
-       BOOL bKernelOplocks;
        BOOL bAllowTrustedDomains;
        BOOL bLanmanAuth;
        BOOL bNTLMAuth;
        BOOL bUseSpnego;
+       int  server_signing;
+       int  client_signing;
        BOOL bClientLanManAuth;
        BOOL bClientNTLMv2Auth;
-       BOOL bClientUseSpnego;
-       BOOL bDebugHiresTimestamp;
-       BOOL bDebugPid;
-       BOOL bDebugUid;
        BOOL bHostMSDfs;
        BOOL bHideLocalUsers;
        BOOL bUnicode;
@@ -277,10 +266,9 @@ typedef struct
        BOOL bHostnameLookups;
        BOOL bUnixExtensions;
        BOOL bDisableNetbios;
-       BOOL bKernelChangeNotify;
+       BOOL bRpcBigEndian;
        int restrict_anonymous;
        int name_cache_timeout;
-       BOOL client_signing;
        struct param_opt *param_opt;
 }
 global;
@@ -302,10 +290,6 @@ typedef struct
        char **szAdminUsers;
        char *szCopy;
        char *szInclude;
-       char *szPreExec;
-       char *szPostExec;
-       char *szRootPreExec;
-       char *szRootPostExec;
        char *szPrintcommand;
        char *szLpqcommand;
        char *szLprmcommand;
@@ -314,62 +298,21 @@ typedef struct
        char *szQueuepausecommand;
        char *szQueueresumecommand;
        char *szPrintername;
-       char *szDontdescend;
        char **szHostsallow;
        char **szHostsdeny;
-       char *szMagicScript;
-       char *szMagicOutput;
-       char *szMangledMap;
-       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 *szVfsObjectFile;
-       char *szVfsOptions;
-       char *szVfsPath;
        char *szMSDfsProxy;
-       char *ntvfs_handler;
+       char **ntvfs_handler;
        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;
-       BOOL bPreexecClose;
-       BOOL bRootpreexecClose;
-       BOOL bCaseSensitive;
-       BOOL bCasePreserve;
-       BOOL bShortCasePreserve;
-       BOOL bCaseMangle;
-       BOOL bHideDotFiles;
-       BOOL bHideSpecialFiles;
-       BOOL bHideUnReadable;
-       BOOL bHideUnWriteableFiles;
-       BOOL bBrowseable;
        BOOL bAvailable;
+       BOOL bBrowseable;
        BOOL bRead_only;
-       BOOL bNo_set_dir;
-       BOOL bGuest_only;
-       BOOL bGuest_ok;
        BOOL bPrint_ok;
        BOOL bMap_system;
        BOOL bMap_hidden;
@@ -377,34 +320,16 @@ typedef struct
        BOOL bLocking;
        BOOL bStrictLocking;
        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;
+       BOOL bGuest_only;
+       BOOL bGuest_ok;
        BOOL *copymap;
-       BOOL bDeleteReadonly;
-       BOOL bFakeOplocks;
-       BOOL bDeleteVetoFiles;
-       BOOL bDosFilemode;
-       BOOL bDosFiletimes;
-       BOOL bDosFiletimeResolution;
-       BOOL bFakeDirCreateTimes;
-       BOOL bBlockingLocks;
-       BOOL bInheritPerms;
-       BOOL bInheritACLS;
        BOOL bMSDfsRoot;
-       BOOL bUseClientDriver;
-       BOOL bDefaultDevmode;
-       BOOL bNTAclSupport;
-       BOOL bUseSendfile;
-       BOOL bProfileAcls;
+       BOOL bShareModes;
+       BOOL bStrictSync;
+       BOOL bCIFileSystem;
        struct param_opt *param_opt;
 
        char dummy[3];          /* for alignment */
@@ -424,10 +349,6 @@ static service sDefault = {
        NULL,                   /* szAdminUsers */
        NULL,                   /* szCopy */
        NULL,                   /* szInclude */
-       NULL,                   /* szPreExec */
-       NULL,                   /* szPostExec */
-       NULL,                   /* szRootPreExec */
-       NULL,                   /* szRootPostExec */
        NULL,                   /* szPrintcommand */
        NULL,                   /* szLpqcommand */
        NULL,                   /* szLprmcommand */
@@ -436,62 +357,21 @@ static service sDefault = {
        NULL,                   /* szQueuepausecommand */
        NULL,                   /* szQueueresumecommand */
        NULL,                   /* szPrintername */
-       NULL,                   /* szDontdescend */
        NULL,                   /* szHostsallow */
        NULL,                   /* szHostsdeny */
-       NULL,                   /* szMagicScript */
-       NULL,                   /* szMagicOutput */
-       NULL,                   /* szMangledMap */
-       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 object */
-       NULL,                   /* vfs options */
-       NULL,                   /* vfs path */
        NULL,                   /* szMSDfsProxy */
        NULL,                   /* ntvfs_handler */
        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 */
-       False,                  /* bPreexecClose */
-       False,                  /* bRootpreexecClose */
-       False,                  /* case sensitive */
-       True,                   /* case preserve */
-       True,                   /* short case preserve */
-       False,                  /* case mangle */
-       True,                   /* bHideDotFiles */
-       False,                  /* bHideSpecialFiles */
-       False,                  /* bHideUnReadable */
-       False,                  /* bHideUnWriteableFiles */
-       True,                   /* bBrowseable */
        True,                   /* bAvailable */
+       True,                   /* bBrowseable */
        True,                   /* bRead_only */
-       True,                   /* bNo_set_dir */
-       False,                  /* bGuest_only */
-       False,                  /* bGuest_ok */
        False,                  /* bPrint_ok */
        False,                  /* bMap_system */
        False,                  /* bMap_hidden */
@@ -499,35 +379,16 @@ static service sDefault = {
        True,                   /* bLocking */
        True,                   /* bStrictLocking */
        True,                   /* bPosixLocking */
-       True,                   /* bShareModes */
        True,                   /* bOpLocks */
        True,                   /* bLevel2OpLocks */
        False,                  /* bOnlyUser */
-       True,                   /* bMangledNames */
-       True,                   /* bWidelinks */
-       True,                   /* bSymlinks */
-       False,                  /* bSyncAlways */
-       False,                  /* bStrictAllocate */
-       False,                  /* bStrictSync */
-       '~',                    /* magic char */
+       False,                  /* bGuest_only */
+       False,                  /* bGuest_ok */
        NULL,                   /* copymap */
-       False,                  /* bDeleteReadonly */
-       False,                  /* bFakeOplocks */
-       False,                  /* bDeleteVetoFiles */
-       False,                  /* bDosFilemode */
-       False,                  /* bDosFiletimes */
-       False,                  /* bDosFiletimeResolution */
-       False,                  /* bFakeDirCreateTimes */
-       True,                   /* bBlockingLocks */
-       False,                  /* bInheritPerms */
-       False,                  /* bInheritACLS */
        False,                  /* bMSDfsRoot */
-       False,                  /* bUseClientDriver */
-       False,                  /* bDefaultDevmode */
-       True,                   /* bNTAclSupport */
-       False,                  /* bUseSendfile */
-       False,                  /* bProfileAcls */
-       
+       True,                   /* bShareModes */
+       False,                  /* bStrictSync */
+       False,                  /* bCIFileSystem */
        NULL,                   /* Parametric options */
 
        ""                      /* dummy */
@@ -547,18 +408,10 @@ static int default_server_announce;
 /* prototypes for the special type handlers */
 static BOOL handle_include(const char *pszParmValue, char **ptr);
 static BOOL handle_copy(const char *pszParmValue, char **ptr);
-static BOOL handle_vfs_object(const char *pszParmValue, char **ptr);
-static BOOL handle_source_env(const char *pszParmValue, char **ptr);
 static BOOL handle_winbind_uid(const char *pszParmValue, char **ptr);
 static BOOL handle_winbind_gid(const char *pszParmValue, char **ptr);
 static BOOL handle_non_unix_account_range(const char *pszParmValue, char **ptr);
 
-static BOOL handle_ldap_machine_suffix ( const char *pszParmValue, char **ptr );
-static BOOL handle_ldap_user_suffix ( const char *pszParmValue, char **ptr );
-static BOOL handle_ldap_suffix ( const char *pszParmValue, char **ptr );
-
-static BOOL handle_acl_compatibility(const char *pszParmValue, char **ptr);
-
 static void set_server_role(void);
 static void set_default_server_announce_type(void);
 
@@ -602,38 +455,6 @@ static const struct enum_list enum_printing[] = {
        {-1, NULL}
 };
 
-static const struct enum_list enum_ldap_ssl[] = {
-#ifdef WITH_LDAP_SAMCONFIG
-       {LDAP_SSL_ON, "Yes"},
-       {LDAP_SSL_ON, "yes"},
-       {LDAP_SSL_ON, "on"},
-       {LDAP_SSL_ON, "On"},
-#endif
-       {LDAP_SSL_OFF, "no"},
-       {LDAP_SSL_OFF, "No"},
-       {LDAP_SSL_OFF, "off"},
-       {LDAP_SSL_OFF, "Off"},
-       {LDAP_SSL_START_TLS, "start tls"},
-       {LDAP_SSL_START_TLS, "Start_tls"},
-       {-1, NULL}
-};
-
-static const struct enum_list enum_ldap_passwd_sync[] = {
-       {LDAP_PASSWD_SYNC_ON, "Yes"},
-       {LDAP_PASSWD_SYNC_ON, "yes"},
-       {LDAP_PASSWD_SYNC_ON, "on"},
-       {LDAP_PASSWD_SYNC_ON, "On"},
-       {LDAP_PASSWD_SYNC_OFF, "no"},
-       {LDAP_PASSWD_SYNC_OFF, "No"},
-       {LDAP_PASSWD_SYNC_OFF, "off"},
-       {LDAP_PASSWD_SYNC_OFF, "Off"},
-#ifdef LDAP_EXOP_X_MODIFY_PASSWD       
-       {LDAP_PASSWD_SYNC_ONLY, "Only"},
-       {LDAP_PASSWD_SYNC_ONLY, "only"},
-#endif /* LDAP_EXOP_X_MODIFY_PASSWD */ 
-       {-1, NULL}
-};
-
 /* Types of machine we can announce as. */
 #define ANNOUNCE_AS_NT_SERVER 1
 #define ANNOUNCE_AS_WIN95 2
@@ -649,12 +470,6 @@ static const struct enum_list enum_announce_as[] = {
        {-1, NULL}
 };
 
-static const struct enum_list enum_case[] = {
-       {CASE_LOWER, "lower"},
-       {CASE_UPPER, "upper"},
-       {-1, NULL}
-};
-
 static const struct enum_list enum_bool_auto[] = {
        {False, "No"},
        {False, "False"},
@@ -680,34 +495,28 @@ static const struct enum_list enum_csc_policy[] = {
        {-1, NULL}
 };
 
-/* 
-   Do you want session setups at user level security with a invalid
-   password to be rejected or allowed in as guest? WinNT rejects them
-   but it can be a pain as it means "net view" needs to use a password
-
-   You have 3 choices in the setting of map_to_guest:
-
-   "Never" means session setups with an invalid password
-   are rejected. This is the default.
-
-   "Bad User" means session setups with an invalid password
-   are rejected, unless the username does not exist, in which case it
-   is treated as a guest login
-
-   "Bad Password" means session setups with an invalid password
-   are treated as a guest login
-
-   Note that map_to_guest only has an effect in user or server
-   level security.
-*/
-
-static const struct enum_list enum_map_to_guest[] = {
-       {NEVER_MAP_TO_GUEST, "Never"},
-       {MAP_TO_GUEST_ON_BAD_USER, "Bad User"},
-       {MAP_TO_GUEST_ON_BAD_PASSWORD, "Bad Password"},
+/* SMB signing types. */
+static const struct enum_list enum_smb_signing_vals[] = {
+       {SMB_SIGNING_OFF, "No"},
+       {SMB_SIGNING_OFF, "False"},
+       {SMB_SIGNING_OFF, "0"},
+       {SMB_SIGNING_OFF, "Off"},
+       {SMB_SIGNING_OFF, "disabled"},
+       {SMB_SIGNING_SUPPORTED, "Yes"},
+       {SMB_SIGNING_SUPPORTED, "True"},
+       {SMB_SIGNING_SUPPORTED, "1"},
+       {SMB_SIGNING_SUPPORTED, "On"},
+       {SMB_SIGNING_SUPPORTED, "enabled"},
+       {SMB_SIGNING_REQUIRED, "required"},
+       {SMB_SIGNING_REQUIRED, "mandatory"},
+       {SMB_SIGNING_REQUIRED, "force"},
+       {SMB_SIGNING_REQUIRED, "forced"},
+       {SMB_SIGNING_REQUIRED, "enforced"},
+       {SMB_SIGNING_AUTO, "auto"},
        {-1, NULL}
 };
 
+
 /* Note: We do not initialise the defaults union - it is not allowed in ANSI C
  *
  * Note: We have a flag called FLAG_DEVELOPER but is not used at this time, it
@@ -723,6 +532,7 @@ static struct parm_struct parm_table[] = {
 
        {"dos charset", P_STRING, P_GLOBAL, &Globals.dos_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"unix charset", P_STRING, P_GLOBAL, &Globals.unix_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"ncalrpc dir", P_STRING, P_GLOBAL, &Globals.ncalrpc_dir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"display charset", P_STRING, P_GLOBAL, &Globals.display_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
        {"path", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
@@ -736,29 +546,26 @@ static struct parm_struct parm_table[] = {
        {"server string", P_STRING, P_GLOBAL, &Globals.szServerString, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED  | FLAG_DEVELOPER},
        {"interfaces", P_LIST, P_GLOBAL, &Globals.szInterfaces, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
        {"bind interfaces only", P_BOOL, P_GLOBAL, &Globals.bBindInterfacesOnly, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"ntvfs handler", P_STRING, P_LOCAL, &sDefault.ntvfs_handler, NULL, NULL, FLAG_ADVANCED},
+       {"ntvfs handler", P_LIST, P_LOCAL, &sDefault.ntvfs_handler, NULL, NULL, FLAG_ADVANCED},
+       {"dcerpc endpoint servers", P_LIST, P_GLOBAL, &Globals.dcerpc_ep_servers, NULL, NULL, FLAG_ADVANCED},
+       {"server services", P_LIST, P_GLOBAL, &Globals.server_services, NULL, NULL, FLAG_ADVANCED},
 
        {"Security Options", P_SEP, P_SEPARATOR},
        
        {"security", P_ENUM, P_GLOBAL, &Globals.security, NULL, enum_security, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
        {"auth methods", P_LIST, P_GLOBAL, &Globals.AuthMethods, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
        {"encrypt passwords", P_BOOL, P_GLOBAL, &Globals.bEncryptPasswords, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
-       {"update encrypted", P_BOOL, P_GLOBAL, &Globals.bUpdateEncrypt, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_DEVELOPER},
        {"allow trusted domains", P_BOOL, P_GLOBAL, &Globals.bAllowTrustedDomains, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"hosts equiv", P_STRING, P_GLOBAL, &Globals.szHostsEquiv, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"idmap backend", P_STRING, P_GLOBAL, &Globals.szIDMapBackend, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"min passwd length", P_INTEGER, P_GLOBAL, &Globals.min_passwd_length, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"min password length", P_INTEGER, P_GLOBAL, &Globals.min_passwd_length, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"map to guest", P_ENUM, P_GLOBAL, &Globals.map_to_guest, NULL, enum_map_to_guest, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"null passwords", P_BOOL, P_GLOBAL, &Globals.bNullPasswords, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"obey pam restrictions", P_BOOL, P_GLOBAL, &Globals.bObeyPamRestrictions, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"password server", P_STRING, P_GLOBAL, &Globals.szPasswordServer, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
        {"smb passwd file", P_STRING, P_GLOBAL, &Globals.szSMBPasswdFile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"sam database", P_STRING, P_GLOBAL, &Globals.szSAM_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"spoolss database", P_STRING, P_GLOBAL, &Globals.szSPOOLSS_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"private dir", P_STRING, P_GLOBAL, &Globals.szPrivateDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"passdb backend", P_LIST, P_GLOBAL, &Globals.szPassdbBackend, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"sam backend", P_LIST, P_GLOBAL, &Globals.szSamBackend, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"non unix account range", P_STRING, P_GLOBAL, &Globals.szNonUnixAccountRange, handle_non_unix_account_range, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"algorithmic rid base", P_INTEGER, P_GLOBAL, &Globals.AlgorithmicRidBase, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"root directory", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"root dir", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"root", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, FLAG_HIDE | FLAG_DEVELOPER},
@@ -767,11 +574,8 @@ static struct parm_struct parm_table[] = {
        {"pam password change", P_BOOL, P_GLOBAL, &Globals.bPamPasswordChange, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"passwd program", P_STRING, P_GLOBAL, &Globals.szPasswdProgram, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"passwd chat", P_STRING, P_GLOBAL, &Globals.szPasswdChat, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"passwd chat debug", P_BOOL, P_GLOBAL, &Globals.bPasswdChatDebug, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"username map", P_STRING, P_GLOBAL, &Globals.szUsernameMap, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER | FLAG_DEVELOPER},
        {"password level", P_INTEGER, P_GLOBAL, &Globals.pwordlevel, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"username level", P_INTEGER, P_GLOBAL, &Globals.unamelevel, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"unix password sync", P_BOOL, P_GLOBAL, &Globals.bUnixPasswdSync, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"restrict anonymous", P_INTEGER, P_GLOBAL, &Globals.restrict_anonymous, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"lanman auth", P_BOOL, P_GLOBAL, &Globals.bLanmanAuth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"ntlm auth", P_BOOL, P_GLOBAL, &Globals.bNTLMAuth, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
@@ -785,81 +589,42 @@ static struct parm_struct parm_table[] = {
        {"invalid users", P_LIST, P_LOCAL, &sDefault.szInvalidUsers, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
        {"valid users", P_LIST, P_LOCAL, &sDefault.szValidUsers, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
        {"admin users", P_LIST, P_LOCAL, &sDefault.szAdminUsers, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
-       {"read list", P_LIST, P_LOCAL, &sDefault.readlist, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
-       {"write list", P_LIST, P_LOCAL, &sDefault.writelist, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
-       {"printer admin", P_LIST, P_LOCAL, &sDefault.printer_admin, NULL, NULL, FLAG_GLOBAL | FLAG_PRINT},
-       {"force user", P_STRING, P_LOCAL, &sDefault.force_user, NULL, NULL, FLAG_SHARE},
-       {"force group", P_STRING, P_LOCAL, &sDefault.force_group, NULL, NULL, FLAG_SHARE},
-       {"group", P_STRING, P_LOCAL, &sDefault.force_group, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        
        {"read only", P_BOOL, P_LOCAL, &sDefault.bRead_only, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE},
-       {"write ok", P_BOOLREV, P_LOCAL, &sDefault.bRead_only, NULL, NULL, FLAG_HIDE},
-       {"writeable", P_BOOLREV, P_LOCAL, &sDefault.bRead_only, NULL, NULL, FLAG_HIDE},
-       {"writable", P_BOOLREV, P_LOCAL, &sDefault.bRead_only, NULL, NULL, FLAG_HIDE},
-       
-       {"create mask", P_OCTAL, P_LOCAL, &sDefault.iCreate_mask, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
-       {"create mode", P_OCTAL, P_LOCAL, &sDefault.iCreate_mask, NULL, NULL, FLAG_GLOBAL},
-       {"force create mode", P_OCTAL, P_LOCAL, &sDefault.iCreate_force_mode, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
-       {"security mask", P_OCTAL, P_LOCAL, &sDefault.iSecurity_mask, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
-       {"force security mode", P_OCTAL, P_LOCAL, &sDefault.iSecurity_force_mode, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
-       {"directory mask", P_OCTAL, P_LOCAL, &sDefault.iDir_mask, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
-       {"directory mode", P_OCTAL, P_LOCAL, &sDefault.iDir_mask, NULL, NULL, FLAG_GLOBAL},
-       {"force directory mode", P_OCTAL, P_LOCAL, &sDefault.iDir_force_mode, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
-       {"directory security mask", P_OCTAL, P_LOCAL, &sDefault.iDir_Security_mask, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
-       {"force directory security mode", P_OCTAL, P_LOCAL, &sDefault.iDir_Security_force_mode, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE},
-       {"inherit permissions", P_BOOL, P_LOCAL, &sDefault.bInheritPerms, NULL, NULL, FLAG_SHARE},
-       {"inherit acls", P_BOOL, P_LOCAL, &sDefault.bInheritACLS, NULL, NULL, FLAG_SHARE},
+
        {"guest only", P_BOOL, P_LOCAL, &sDefault.bGuest_only, NULL, NULL, FLAG_SHARE},
-       {"only guest", P_BOOL, P_LOCAL, &sDefault.bGuest_only, NULL, NULL, FLAG_HIDE},
 
        {"guest ok", P_BOOL, P_LOCAL, &sDefault.bGuest_ok, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
-       {"public", P_BOOL, P_LOCAL, &sDefault.bGuest_ok, NULL, NULL, FLAG_HIDE},
-       
+
        {"only user", P_BOOL, P_LOCAL, &sDefault.bOnlyUser, NULL, NULL, FLAG_SHARE},
        {"hosts allow", P_LIST, P_LOCAL, &sDefault.szHostsallow, NULL, NULL, FLAG_GLOBAL | FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
-       {"allow hosts", P_LIST, P_LOCAL, &sDefault.szHostsallow, NULL, NULL, FLAG_HIDE},
        {"hosts deny", P_LIST, P_LOCAL, &sDefault.szHostsdeny, NULL, NULL, FLAG_GLOBAL | FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
-       {"deny hosts", P_LIST, P_LOCAL, &sDefault.szHostsdeny, NULL, NULL, FLAG_HIDE},
        {"preload modules", P_LIST, P_GLOBAL, &Globals.szPreloadModules, NULL, NULL, FLAG_BASIC | FLAG_GLOBAL},
 
        {"Logging Options", P_SEP, P_SEPARATOR},
 
        {"log level", P_INTEGER, P_GLOBAL, &DEBUGLEVEL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"debuglevel", P_INTEGER, P_GLOBAL, &DEBUGLEVEL, NULL, NULL, FLAG_HIDE},
-       {"syslog", P_INTEGER, P_GLOBAL, &Globals.syslog, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"syslog only", P_BOOL, P_GLOBAL, &Globals.bSyslogOnly, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"log file", P_STRING, P_GLOBAL, &Globals.szLogFile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        
-       {"max log size", P_INTEGER, P_GLOBAL, &Globals.max_log_size, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"timestamp logs", P_BOOL, P_GLOBAL, &Globals.bTimestampLogs, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"debug timestamp", P_BOOL, P_GLOBAL, &Globals.bTimestampLogs, NULL, NULL, FLAG_DEVELOPER},
-       {"debug hires timestamp", P_BOOL, P_GLOBAL, &Globals.bDebugHiresTimestamp, NULL, NULL, FLAG_DEVELOPER},
-       {"debug pid", P_BOOL, P_GLOBAL, &Globals.bDebugPid, NULL, NULL, FLAG_DEVELOPER},
-       {"debug uid", P_BOOL, P_GLOBAL, &Globals.bDebugUid, NULL, NULL, FLAG_DEVELOPER},
-       
        {"Protocol Options", P_SEP, P_SEPARATOR},
        
-       {"smb ports", P_STRING, P_GLOBAL, &Globals.smb_ports, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"smb ports", P_LIST, P_GLOBAL, &Globals.smb_ports, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"large readwrite", P_BOOL, P_GLOBAL, &Globals.bLargeReadwrite, NULL, NULL, FLAG_DEVELOPER},
        {"max protocol", P_ENUM, P_GLOBAL, &Globals.maxprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
        {"min protocol", P_ENUM, P_GLOBAL, &Globals.minprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
        {"unicode", P_BOOL, P_GLOBAL, &Globals.bUnicode, NULL, NULL, FLAG_DEVELOPER},
-       {"read bmpx", P_BOOL, P_GLOBAL, &Globals.bReadbmpx, NULL, NULL, FLAG_DEVELOPER},
        {"read raw", P_BOOL, P_GLOBAL, &Globals.bReadRaw, NULL, NULL, FLAG_DEVELOPER},
        {"write raw", P_BOOL, P_GLOBAL, &Globals.bWriteRaw, NULL, NULL, FLAG_DEVELOPER},
        {"disable netbios", P_BOOL, P_GLOBAL, &Globals.bDisableNetbios, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        
-       {"acl compatibility", P_STRING, P_GLOBAL, &Globals.szAclCompat, handle_acl_compatibility, NULL, FLAG_SHARE | FLAG_GLOBAL | FLAG_ADVANCED},
-       {"nt acl support", P_BOOL,  P_LOCAL, &sDefault.bNTAclSupport, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE | FLAG_ADVANCED | FLAG_WIZARD},
-       {"nt pipe support", P_BOOL, P_GLOBAL, &Globals.bNTPipeSupport, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"nt status support", P_BOOL, P_GLOBAL, &Globals.bNTStatusSupport, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"profile acls", P_BOOL,  P_LOCAL, &sDefault.bProfileAcls, NULL, NULL, FLAG_GLOBAL | FLAG_SHARE  | FLAG_ADVANCED | FLAG_WIZARD},
-       
+
        {"announce version", P_STRING, P_GLOBAL, &Globals.szAnnounceVersion, NULL, NULL, FLAG_DEVELOPER},
        {"announce as", P_ENUM, P_GLOBAL, &Globals.announce_as, NULL, enum_announce_as, FLAG_DEVELOPER},
        {"max mux", P_INTEGER, P_GLOBAL, &Globals.max_mux, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"max xmit", P_INTEGER, P_GLOBAL, &Globals.max_xmit, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       
+
        {"name resolve order", P_STRING, P_GLOBAL, &Globals.szNameResolveOrder, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
        {"max ttl", P_INTEGER, P_GLOBAL, &Globals.max_ttl, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, 
        {"max wins ttl", P_INTEGER, P_GLOBAL, &Globals.max_wins_ttl, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
@@ -867,42 +632,27 @@ static struct parm_struct parm_table[] = {
        {"time server", P_BOOL, P_GLOBAL, &Globals.bTimeServer, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"unix extensions", P_BOOL, P_GLOBAL, &Globals.bUnixExtensions, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"use spnego", P_BOOL, P_GLOBAL, &Globals.bUseSpnego, NULL, NULL, FLAG_DEVELOPER},
-       {"client signing", P_BOOL, P_GLOBAL, &Globals.client_signing, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"client use spnego", P_BOOL, P_GLOBAL, &Globals.bClientUseSpnego, NULL, NULL, FLAG_DEVELOPER},
+       {"server signing", P_ENUM, P_GLOBAL, &Globals.server_signing, NULL, enum_smb_signing_vals, FLAG_ADVANCED}, 
+       {"client signing", P_ENUM, P_GLOBAL, &Globals.client_signing, NULL, enum_smb_signing_vals, FLAG_ADVANCED}, 
+       {"rpc big endian", P_BOOL, P_GLOBAL, &Globals.bRpcBigEndian, NULL, NULL, FLAG_DEVELOPER},
 
        {"Tuning Options", P_SEP, P_SEPARATOR},
-       
-       {"block size", P_INTEGER, P_LOCAL, &sDefault.iBlock_size, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"change notify timeout", P_INTEGER, P_GLOBAL, &Globals.change_notify_timeout, NULL, NULL, FLAG_DEVELOPER},
-       {"deadtime", P_INTEGER, P_GLOBAL, &Globals.deadtime, NULL, NULL, FLAG_DEVELOPER},
-       {"keepalive", P_INTEGER, P_GLOBAL, &Globals.keepalive, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"kernel change notify", P_BOOL, P_GLOBAL, &Globals.bKernelChangeNotify, NULL, NULL, FLAG_DEVELOPER},
-       
+               
        {"lpq cache time", P_INTEGER, P_GLOBAL, &Globals.lpqcachetime, NULL, NULL, FLAG_DEVELOPER},
-       {"max smbd processes", P_INTEGER, P_GLOBAL, &Globals.iMaxSmbdProcesses, NULL, NULL, FLAG_DEVELOPER},
        {"max connections", P_INTEGER, P_LOCAL, &sDefault.iMaxConnections, NULL, NULL, FLAG_SHARE},
        {"paranoid server security", P_BOOL, P_GLOBAL, &Globals.paranoid_server_security, NULL, NULL, FLAG_DEVELOPER},
-       {"max disk size", P_INTEGER, P_GLOBAL, &Globals.maxdisksize, NULL, NULL, FLAG_DEVELOPER},
-       {"max open files", P_INTEGER, P_GLOBAL, &Globals.max_open_files, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"min print space", P_INTEGER, P_LOCAL, &sDefault.iMinPrintSpace, NULL, NULL, FLAG_PRINT},
-       {"read size", P_INTEGER, P_GLOBAL, &Globals.ReadSize, NULL, NULL, FLAG_DEVELOPER},
        
        {"socket options", P_STRING, P_GLOBAL, &Globals.socket_options, NULL, NULL, FLAG_DEVELOPER},
-       {"stat cache size", P_INTEGER, P_GLOBAL, &Globals.stat_cache_size, NULL, NULL, FLAG_DEVELOPER},
-       {"strict allocate", P_BOOL, P_LOCAL, &sDefault.bStrictAllocate, NULL, NULL, FLAG_SHARE},
-       {"strict sync", P_BOOL, P_LOCAL, &sDefault.bStrictSync, NULL, NULL, FLAG_SHARE},
-       {"sync always", P_BOOL, P_LOCAL, &sDefault.bSyncAlways, NULL, NULL, FLAG_SHARE},
        {"use mmap", P_BOOL, P_GLOBAL, &Globals.bUseMmap, NULL, NULL, FLAG_DEVELOPER},
-       {"use sendfile", P_BOOL, P_LOCAL, &sDefault.bUseSendfile, NULL, NULL, FLAG_SHARE},
        {"hostname lookups", P_BOOL, P_GLOBAL, &Globals.bHostnameLookups, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"write cache size", P_INTEGER, P_LOCAL, &sDefault.iWriteCacheSize, NULL, NULL, FLAG_SHARE},
 
        {"name cache timeout", P_INTEGER, P_GLOBAL, &Globals.name_cache_timeout, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"strict sync", P_BOOL, P_LOCAL, &sDefault.bStrictSync, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE}, 
+       {"case insensitive filesystem", P_BOOL, P_LOCAL, &sDefault.bCIFileSystem, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE}, 
 
        {"Printing Options", P_SEP, P_SEPARATOR},
        
-       {"total print jobs", P_INTEGER, P_GLOBAL, &Globals.iTotalPrintJobs, NULL, NULL, FLAG_PRINT},
-       {"max reported print jobs", P_INTEGER, P_LOCAL, &sDefault.iMaxReportedPrintJobs, NULL, NULL, FLAG_PRINT},
        {"max print jobs", P_INTEGER, P_LOCAL, &sDefault.iMaxPrintJobs, NULL, NULL, FLAG_PRINT},
        {"load printers", P_BOOL, P_GLOBAL, &Globals.bLoadPrinters, NULL, NULL, FLAG_PRINT},
        {"printcap name", P_STRING, P_GLOBAL, &Globals.szPrintcapname, NULL, NULL, FLAG_PRINT | FLAG_DEVELOPER},
@@ -918,45 +668,15 @@ static struct parm_struct parm_table[] = {
        {"lpresume command", P_STRING, P_LOCAL, &sDefault.szLpresumecommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL},
        {"queuepause command", P_STRING, P_LOCAL, &sDefault.szQueuepausecommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL},
        {"queueresume command", P_STRING, P_LOCAL, &sDefault.szQueueresumecommand, NULL, NULL, FLAG_PRINT | FLAG_GLOBAL},
-
-       {"enumports command", P_STRING, P_GLOBAL, &Globals.szEnumPortsCommand, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"addprinter command", P_STRING, P_GLOBAL, &Globals.szAddPrinterCommand, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"deleteprinter command", P_STRING, P_GLOBAL, &Globals.szDeletePrinterCommand, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"show add printer wizard", P_BOOL, P_GLOBAL, &Globals.bMsAddPrinterWizard, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"os2 driver map", P_STRING, P_GLOBAL, &Globals.szOs2DriverMap, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        
        {"printer name", P_STRING, P_LOCAL, &sDefault.szPrintername, NULL, NULL, FLAG_PRINT},
        {"printer", P_STRING, P_LOCAL, &sDefault.szPrintername, NULL, NULL, FLAG_HIDE},
-       {"use client driver", P_BOOL, P_LOCAL, &sDefault.bUseClientDriver, NULL, NULL, FLAG_PRINT},
-       {"default devmode", P_BOOL, P_LOCAL, &sDefault.bDefaultDevmode, NULL, NULL, FLAG_PRINT},
 
        {"Filename Handling", P_SEP, P_SEPARATOR},
-       {"strip dot", P_BOOL, P_GLOBAL, &Globals.bStripDot, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"mangling method", P_STRING, P_GLOBAL, &Globals.szManglingMethod, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"mangle prefix", P_INTEGER, P_GLOBAL, &Globals.mangle_prefix, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        
-       {"mangled stack", P_INTEGER, P_GLOBAL, &Globals.mangled_stack, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"default case", P_ENUM, P_LOCAL, &sDefault.iDefaultCase, NULL, enum_case, FLAG_SHARE},
-       {"case sensitive", P_BOOL, P_LOCAL, &sDefault.bCaseSensitive, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"casesignames", P_BOOL, P_LOCAL, &sDefault.bCaseSensitive, NULL, NULL, FLAG_HIDE},
-       {"preserve case", P_BOOL, P_LOCAL, &sDefault.bCasePreserve, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"short preserve case", P_BOOL, P_LOCAL, &sDefault.bShortCasePreserve, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"mangle case", P_BOOL, P_LOCAL, &sDefault.bCaseMangle, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"mangling char", P_CHAR, P_LOCAL, &sDefault.magic_char, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"hide dot files", P_BOOL, P_LOCAL, &sDefault.bHideDotFiles, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"hide special files", P_BOOL, P_LOCAL, &sDefault.bHideSpecialFiles, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"hide unreadable", P_BOOL, P_LOCAL, &sDefault.bHideUnReadable, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"hide unwriteable files", P_BOOL, P_LOCAL, &sDefault.bHideUnWriteableFiles, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"delete veto files", P_BOOL, P_LOCAL, &sDefault.bDeleteVetoFiles, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"veto files", P_STRING, P_LOCAL, &sDefault.szVetoFiles, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL },
-       {"hide files", P_STRING, P_LOCAL, &sDefault.szHideFiles, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL },
-       {"veto oplock files", P_STRING, P_LOCAL, &sDefault.szVetoOplockFiles, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL },
        {"map system", P_BOOL, P_LOCAL, &sDefault.bMap_system, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
        {"map hidden", P_BOOL, P_LOCAL, &sDefault.bMap_hidden, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
        {"map archive", P_BOOL, P_LOCAL, &sDefault.bMap_archive, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"mangled names", P_BOOL, P_LOCAL, &sDefault.bMangledNames, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"mangled map", P_STRING, P_LOCAL, &sDefault.szMangledMap, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"stat cache", P_BOOL, P_GLOBAL, &Globals.bStatCache, NULL, NULL, FLAG_DEVELOPER},
 
        {"Domain Options", P_SEP, P_SEPARATOR},
        
@@ -965,15 +685,7 @@ static struct parm_struct parm_table[] = {
        {"Logon Options", P_SEP, P_SEPARATOR},
 
        {"add user script", P_STRING, P_GLOBAL, &Globals.szAddUserScript, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"delete user script", P_STRING, P_GLOBAL, &Globals.szDelUserScript, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"add group script", P_STRING, P_GLOBAL, &Globals.szAddGroupScript, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"delete group script", P_STRING, P_GLOBAL, &Globals.szDelGroupScript, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"add user to group script", P_STRING, P_GLOBAL, &Globals.szAddUserToGroupScript, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"delete user from group script", P_STRING, P_GLOBAL, &Globals.szDelUserFromGroupScript, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"set primary group script", P_STRING, P_GLOBAL, &Globals.szSetPrimaryGroupScript, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"add machine script", P_STRING, P_GLOBAL, &Globals.szAddMachineScript, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"shutdown script", P_STRING, P_GLOBAL, &Globals.szShutdownScript, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"abort shutdown script", P_STRING, P_GLOBAL, &Globals.szAbortShutdownScript, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 
        {"logon script", P_STRING, P_GLOBAL, &Globals.szLogonScript, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"logon path", P_STRING, P_GLOBAL, &Globals.szLogonPath, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
@@ -990,7 +702,6 @@ static struct parm_struct parm_table[] = {
        {"prefered master", P_ENUM, P_GLOBAL, &Globals.bPreferredMaster, NULL, enum_bool_auto, FLAG_HIDE},
        {"local master", P_BOOL, P_GLOBAL, &Globals.bLocalMaster, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_DEVELOPER},
        {"domain master", P_ENUM, P_GLOBAL, &Globals.bDomainMaster, NULL, enum_bool_auto, FLAG_BASIC | FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"browse list", P_BOOL, P_GLOBAL, &Globals.bBrowseList, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"browseable", P_BOOL, P_LOCAL, &sDefault.bBrowseable, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER},
        {"browsable", P_BOOL, P_LOCAL, &sDefault.bBrowseable, NULL, NULL, FLAG_HIDE},
        {"enhanced browsing", P_BOOL, P_GLOBAL, &Globals.enhanced_browsing, NULL, NULL, FLAG_DEVELOPER | FLAG_ADVANCED},
@@ -1006,41 +717,18 @@ static struct parm_struct parm_table[] = {
 
        {"Locking Options", P_SEP, P_SEPARATOR},
        
-       {"blocking locks", P_BOOL, P_LOCAL, &sDefault.bBlockingLocks, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
        {"csc policy", P_ENUM, P_LOCAL, &sDefault.iCSCPolicy, NULL, enum_csc_policy, FLAG_SHARE | FLAG_GLOBAL},
-       {"fake oplocks", P_BOOL, P_LOCAL, &sDefault.bFakeOplocks, NULL, NULL, FLAG_SHARE},
-       {"kernel oplocks", P_BOOL, P_GLOBAL, &Globals.bKernelOplocks, NULL, NULL, FLAG_GLOBAL},
        {"locking", P_BOOL, P_LOCAL, &sDefault.bLocking, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
        {"lock spin count", P_INTEGER, P_GLOBAL, &Globals.iLockSpinCount, NULL, NULL, FLAG_GLOBAL},
        {"lock spin time", P_INTEGER, P_GLOBAL, &Globals.iLockSpinTime, NULL, NULL, FLAG_GLOBAL},
        
        {"oplocks", P_BOOL, P_LOCAL, &sDefault.bOpLocks, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
        {"level2 oplocks", P_BOOL, P_LOCAL, &sDefault.bLevel2OpLocks, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"oplock break wait time", P_INTEGER, P_GLOBAL, &Globals.oplock_break_wait_time, NULL, NULL, FLAG_GLOBAL},
-       {"oplock contention limit", P_INTEGER, P_LOCAL, &sDefault.iOplockContentionLimit, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
        {"posix locking", P_BOOL, P_LOCAL, &sDefault.bPosixLocking, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
        {"strict locking", P_BOOL, P_LOCAL, &sDefault.bStrictLocking, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
        {"share modes", P_BOOL, P_LOCAL,  &sDefault.bShareModes, NULL, NULL, FLAG_SHARE|FLAG_GLOBAL},
 
-       {"Ldap Options", P_SEP, P_SEPARATOR},
-       
-#ifdef WITH_LDAP_SAMCONFIG
-       {"ldap server", P_STRING, P_GLOBAL, &Globals.szLdapServer, NULL, NULL, 0},
-       {"ldap port", P_INTEGER, P_GLOBAL, &Globals.ldap_port, NULL, NULL, 0}, 
-#endif
-       {"ldap suffix", P_STRING, P_GLOBAL, &Globals.szLdapSuffix, handle_ldap_suffix, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"ldap machine suffix", P_STRING, P_GLOBAL, &Globals.szLdapMachineSuffix, handle_ldap_machine_suffix, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"ldap user suffix", P_STRING, P_GLOBAL, &Globals.szLdapUserSuffix, handle_ldap_user_suffix, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"ldap filter", P_STRING, P_GLOBAL, &Globals.szLdapFilter, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"ldap admin dn", P_STRING, P_GLOBAL, &Globals.szLdapAdminDn, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"ldap ssl", P_ENUM, P_GLOBAL, &Globals.ldap_ssl, NULL, enum_ldap_ssl, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"ldap passwd sync", P_ENUM, P_GLOBAL, &Globals.ldap_passwd_sync, NULL, enum_ldap_passwd_sync, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"ldap trust ids", P_BOOL, P_GLOBAL, &Globals.ldap_trust_ids, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-
        {"Miscellaneous Options", P_SEP, P_SEPARATOR},
-       {"add share command", P_STRING, P_GLOBAL, &Globals.szAddShareCommand, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"change share command", P_STRING, P_GLOBAL, &Globals.szChangeShareCommand, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"delete share command", P_STRING, P_GLOBAL, &Globals.szDeleteShareCommand, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        
        {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE},
        {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
@@ -1048,60 +736,25 @@ static struct parm_struct parm_table[] = {
        {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, 
        {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, 
-#ifdef WITH_UTMP
-       {"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"wtmp directory", P_STRING, P_GLOBAL, &Globals.szWtmpDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"utmp",          P_BOOL, P_GLOBAL, &Globals.bUtmp, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-#endif
        
        {"default service", P_STRING, P_GLOBAL, &Globals.szDefaultService, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"default", P_STRING, P_GLOBAL, &Globals.szDefaultService, NULL, NULL,  FLAG_DEVELOPER},
-       {"message command", P_STRING, P_GLOBAL, &Globals.szMsgCommand, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"dfree command", P_STRING, P_GLOBAL, &Globals.szDfree, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"remote announce", P_STRING, P_GLOBAL, &Globals.szRemoteAnnounce, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"remote browse sync", P_STRING, P_GLOBAL, &Globals.szRemoteBrowseSync, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"socket address", P_STRING, P_GLOBAL, &Globals.szSocketAddress, NULL, NULL, FLAG_DEVELOPER},
-       {"homedir map", P_STRING, P_GLOBAL, &Globals.szNISHomeMapName, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"time offset", P_INTEGER, P_GLOBAL, &Globals.time_offset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"NIS homedir", P_BOOL, P_GLOBAL, &Globals.bNISHomeMap, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"-valid", P_BOOL, P_LOCAL, &sDefault.valid, NULL, NULL, FLAG_HIDE},
        
        {"copy", P_STRING, P_LOCAL, &sDefault.szCopy, handle_copy, NULL, FLAG_HIDE},
        {"include", P_STRING, P_LOCAL, &sDefault.szInclude, handle_include, NULL, FLAG_HIDE},
-       {"exec", P_STRING, P_LOCAL, &sDefault.szPreExec, NULL, NULL, FLAG_SHARE | FLAG_PRINT},
-       {"preexec", P_STRING, P_LOCAL, &sDefault.szPreExec, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        
-       {"preexec close", P_BOOL, P_LOCAL, &sDefault.bPreexecClose, NULL, NULL, FLAG_SHARE},
-       {"postexec", P_STRING, P_LOCAL, &sDefault.szPostExec, NULL, NULL, FLAG_SHARE | FLAG_PRINT},
-       {"root preexec", P_STRING, P_LOCAL, &sDefault.szRootPreExec, NULL, NULL, FLAG_SHARE | FLAG_PRINT},
-       {"root preexec close", P_BOOL, P_LOCAL, &sDefault.bRootpreexecClose, NULL, NULL, FLAG_SHARE},
-       {"root postexec", P_STRING, P_LOCAL, &sDefault.szRootPostExec, NULL, NULL, FLAG_SHARE | FLAG_PRINT},
        {"available", P_BOOL, P_LOCAL, &sDefault.bAvailable, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT},
        {"volume", P_STRING, P_LOCAL, &sDefault.volume, NULL, NULL, FLAG_SHARE },
        {"fstype", P_STRING, P_LOCAL, &sDefault.fstype, NULL, NULL, FLAG_SHARE},
-       {"set directory", P_BOOLREV, P_LOCAL, &sDefault.bNo_set_dir, NULL, NULL, FLAG_SHARE},
-       {"source environment", P_STRING, P_GLOBAL, &Globals.szSourceEnv, handle_source_env, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
-       {"wide links", P_BOOL, P_LOCAL, &sDefault.bWidelinks, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"follow symlinks", P_BOOL, P_LOCAL, &sDefault.bSymlinks, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"dont descend", P_STRING, P_LOCAL, &sDefault.szDontdescend, NULL, NULL, FLAG_SHARE},
-       {"magic script", P_STRING, P_LOCAL, &sDefault.szMagicScript, NULL, NULL, FLAG_SHARE},
-       {"magic output", P_STRING, P_LOCAL, &sDefault.szMagicOutput, NULL, NULL, FLAG_SHARE},
-       {"delete readonly", P_BOOL, P_LOCAL, &sDefault.bDeleteReadonly, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"dos filemode", P_BOOL, P_LOCAL, &sDefault.bDosFilemode, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"dos filetimes", P_BOOL, P_LOCAL, &sDefault.bDosFiletimes, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-       {"dos filetime resolution", P_BOOL, P_LOCAL, &sDefault.bDosFiletimeResolution, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
-
-       {"fake directory create times", P_BOOL, P_LOCAL, &sDefault.bFakeDirCreateTimes, NULL, NULL, FLAG_SHARE | FLAG_GLOBAL},
+
        {"panic action", P_STRING, P_GLOBAL, &Globals.szPanicAction, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"hide local users", P_BOOL, P_GLOBAL, &Globals.bHideLocalUsers, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 
-       {"VFS module options", P_SEP, P_SEPARATOR},
-       
-       {"vfs object", P_STRING, P_LOCAL, &sDefault.szVfsObjectFile, handle_vfs_object, NULL, FLAG_SHARE},
-       {"vfs options", P_STRING, P_LOCAL, &sDefault.szVfsOptions, NULL, NULL, FLAG_SHARE},
-       {"vfs path", P_STRING, P_LOCAL, &sDefault.szVfsPath, NULL, NULL, FLAG_SHARE},
-
-       
        {"msdfs root", P_BOOL, P_LOCAL, &sDefault.bMSDfsRoot, NULL, NULL, FLAG_SHARE},
        {"msdfs proxy", P_STRING, P_LOCAL, &sDefault.szMSDfsProxy, NULL, NULL, FLAG_SHARE},
        {"host msdfs", P_BOOL, P_GLOBAL, &Globals.bHostMSDfs, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
@@ -1132,103 +785,103 @@ static void init_printer_values(void)
                case PRINT_AIX:
                case PRINT_LPRNT:
                case PRINT_LPROS2:
-                       string_set(&sDefault.szLpqcommand, "lpq -P'%p'");
-                       string_set(&sDefault.szLprmcommand, "lprm -P'%p' %j");
-                       string_set(&sDefault.szPrintcommand,
+                       do_parameter("Lpqcommand", "lpq -P'%p'");
+                       do_parameter("Lprmcommand", "lprm -P'%p' %j");
+                       do_parameter("Printcommand",
                                   "lpr -r -P'%p' %s");
                        break;
 
                case PRINT_LPRNG:
                case PRINT_PLP:
-                       string_set(&sDefault.szLpqcommand, "lpq -P'%p'");
-                       string_set(&sDefault.szLprmcommand, "lprm -P'%p' %j");
-                       string_set(&sDefault.szPrintcommand,
+                       do_parameter("Lpqcommand", "lpq -P'%p'");
+                       do_parameter("Lprmcommand", "lprm -P'%p' %j");
+                       do_parameter("Printcommand",
                                   "lpr -r -P'%p' %s");
-                       string_set(&sDefault.szQueuepausecommand,
+                       do_parameter("Queuepausecommand",
                                   "lpc stop '%p'");
-                       string_set(&sDefault.szQueueresumecommand,
+                       do_parameter("Queueresumecommand",
                                   "lpc start '%p'");
-                       string_set(&sDefault.szLppausecommand,
+                       do_parameter("Lppausecommand",
                                   "lpc hold '%p' %j");
-                       string_set(&sDefault.szLpresumecommand,
+                       do_parameter("Lpresumecommand",
                                   "lpc release '%p' %j");
                        break;
 
                case PRINT_CUPS:
 #ifdef HAVE_CUPS
-                       string_set(&sDefault.szLpqcommand, "");
-                       string_set(&sDefault.szLprmcommand, "");
-                       string_set(&sDefault.szPrintcommand, "");
-                       string_set(&sDefault.szLppausecommand, "");
-                       string_set(&sDefault.szLpresumecommand, "");
-                       string_set(&sDefault.szQueuepausecommand, "");
-                       string_set(&sDefault.szQueueresumecommand, "");
-
-                       string_set(&Globals.szPrintcapname, "cups");
+                       do_parameter("Lpqcommand", "");
+                       do_parameter("Lprmcommand", "");
+                       do_parameter("Printcommand", "");
+                       do_parameter("Lppausecommand", "");
+                       do_parameter("Lpresumecommand", "");
+                       do_parameter("Queuepausecommand", "");
+                       do_parameter("Queueresumecommand", "");
+
+                       do_parameter("Printcapname", "cups");
 #else
-                       string_set(&sDefault.szLpqcommand,
+                       do_parameter("Lpqcommand",
                                   "/usr/bin/lpstat -o '%p'");
-                       string_set(&sDefault.szLprmcommand,
+                       do_parameter("Lprmcommand",
                                   "/usr/bin/cancel '%p-%j'");
-                       string_set(&sDefault.szPrintcommand,
+                       do_parameter("Printcommand",
                                   "/usr/bin/lp -d '%p' %s; rm %s");
-                       string_set(&sDefault.szLppausecommand,
+                       do_parameter("Lppausecommand",
                                   "lp -i '%p-%j' -H hold");
-                       string_set(&sDefault.szLpresumecommand,
+                       do_parameter("Lpresumecommand",
                                   "lp -i '%p-%j' -H resume");
-                       string_set(&sDefault.szQueuepausecommand,
+                       do_parameter("Queuepausecommand",
                                   "/usr/bin/disable '%p'");
-                       string_set(&sDefault.szQueueresumecommand,
+                       do_parameter("Queueresumecommand",
                                   "/usr/bin/enable '%p'");
-                       string_set(&Globals.szPrintcapname, "lpstat");
+                       do_parameter("Printcapname", "lpstat");
 #endif /* HAVE_CUPS */
                        break;
 
                case PRINT_SYSV:
                case PRINT_HPUX:
-                       string_set(&sDefault.szLpqcommand, "lpstat -o%p");
-                       string_set(&sDefault.szLprmcommand, "cancel %p-%j");
-                       string_set(&sDefault.szPrintcommand,
+                       do_parameter("Lpqcommand", "lpstat -o%p");
+                       do_parameter("Lprmcommand", "cancel %p-%j");
+                       do_parameter("Printcommand",
                                   "lp -c -d%p %s; rm %s");
-                       string_set(&sDefault.szQueuepausecommand,
+                       do_parameter("Queuepausecommand",
                                   "disable %p");
-                       string_set(&sDefault.szQueueresumecommand,
+                       do_parameter("Queueresumecommand",
                                   "enable %p");
 #ifndef HPUX
-                       string_set(&sDefault.szLppausecommand,
+                       do_parameter("Lppausecommand",
                                   "lp -i %p-%j -H hold");
-                       string_set(&sDefault.szLpresumecommand,
+                       do_parameter("Lpresumecommand",
                                   "lp -i %p-%j -H resume");
 #endif /* HPUX */
                        break;
 
                case PRINT_QNX:
-                       string_set(&sDefault.szLpqcommand, "lpq -P%p");
-                       string_set(&sDefault.szLprmcommand, "lprm -P%p %j");
-                       string_set(&sDefault.szPrintcommand, "lp -r -P%p %s");
+                       do_parameter("Lpqcommand", "lpq -P%p");
+                       do_parameter("Lprmcommand", "lprm -P%p %j");
+                       do_parameter("Printcommand", "lp -r -P%p %s");
                        break;
 
                case PRINT_SOFTQ:
-                       string_set(&sDefault.szLpqcommand, "qstat -l -d%p");
-                       string_set(&sDefault.szLprmcommand,
+                       do_parameter("Lpqcommand", "qstat -l -d%p");
+                       do_parameter("Lprmcommand",
                                   "qstat -s -j%j -c");
-                       string_set(&sDefault.szPrintcommand,
+                       do_parameter("Printcommand",
                                   "lp -d%p -s %s; rm %s");
-                       string_set(&sDefault.szLppausecommand,
+                       do_parameter("Lppausecommand",
                                   "qstat -s -j%j -h");
-                       string_set(&sDefault.szLpresumecommand,
+                       do_parameter("Lpresumecommand",
                                   "qstat -s -j%j -r");
                        break;
 #ifdef DEVELOPER
        case PRINT_TEST:
        case PRINT_VLP:
-               string_set(&sDefault.szPrintcommand, "vlp print %p %s");
-               string_set(&sDefault.szLpqcommand, "vlp lpq %p");
-               string_set(&sDefault.szLprmcommand, "vlp lprm %p %j");
-               string_set(&sDefault.szLppausecommand, "vlp lppause %p %j");
-               string_set(&sDefault.szLpresumecommand, "vlp lpresum %p %j");
-               string_set(&sDefault.szQueuepausecommand, "vlp queuepause %p");
-               string_set(&sDefault.szQueueresumecommand, "vlp queueresume %p");
+               do_parameter("Printcommand", "vlp print %p %s");
+               do_parameter("Lpqcommand", "vlp lpq %p");
+               do_parameter("Lprmcommand", "vlp lprm %p %j");
+               do_parameter("Lppausecommand", "vlp lppause %p %j");
+               do_parameter("Lpresumecommand", "vlp lpresum %p %j");
+               do_parameter("Queuepausecommand", "vlp queuepause %p");
+               do_parameter("Queueresumecommand", "vlp queueresume %p");
                break;
 #endif /* DEVELOPER */
 
@@ -1241,8 +894,8 @@ static void init_printer_values(void)
 ***************************************************************************/
 static void init_globals(void)
 {
-       pstring s;
        int i;
+       char *myname;
 
        DEBUG(3, ("Initialising global parameters\n"));
 
@@ -1257,206 +910,139 @@ static void init_globals(void)
 
        /* options that can be set on the command line must be initialised via
           the slower do_parameter() to ensure that FLAG_CMDLINE is obeyed */
-       do_parameter("socket options", DEFAULT_SOCKET_OPTIONS);
+#ifdef TCP_NODELAY
+       do_parameter("socket options", "TCP_NODELAY");
+#endif
        do_parameter("workgroup", DEFAULT_WORKGROUP);
-       do_parameter("netbios name", get_myname());
+       myname = get_myname();
+       do_parameter("netbios name", myname);
+       SAFE_FREE(myname);
        do_parameter("max protocol", "NT1");
        do_parameter("name resolve order", "lmhosts wins host bcast");
 
        init_printer_values();
 
-       string_set(&sDefault.fstype, FSTYPE_STRING);
-       string_set(&sDefault.ntvfs_handler, "default");
-
-       string_set(&Globals.szSMBPasswdFile, dyn_SMB_PASSWD_FILE);
-       string_set(&Globals.szPrivateDir, dyn_PRIVATE_DIR);
+       do_parameter("fstype", FSTYPE_STRING);
+       do_parameter("ntvfs handler", "unixuid default");
+       do_parameter("max connections", "-1");
 
-       /* use the new 'hash2' method by default, with a prefix of 1 */
-       string_set(&Globals.szManglingMethod, "hash2");
-       Globals.mangle_prefix = 1;
-
-       string_set(&Globals.szGuestaccount, GUEST_ACCOUNT);
+       do_parameter("dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg IOXIDResolver IRemoteActivation");
+       do_parameter("server services", "smb rpc");
+       do_parameter("auth methods", "anonymous sam_ignoredomain");
+       do_parameter("smb passwd file", dyn_SMB_PASSWD_FILE);
+       do_parameter("private dir", dyn_PRIVATE_DIR);
+       do_parameter_var("sam database", "tdb://%s/sam.ldb", dyn_PRIVATE_DIR);
+       do_parameter_var("spoolss database", "tdb://%s/spoolss.ldb", dyn_PRIVATE_DIR);
+       do_parameter("guest account", GUEST_ACCOUNT);
 
        /* using UTF8 by default allows us to support all chars */
-       string_set(&Globals.unix_charset, "UTF8");
+       do_parameter("unix charset", "UTF8");
 
        /* Use codepage 850 as a default for the dos character set */
-       string_set(&Globals.dos_charset, "CP850");
+       do_parameter("dos charset", "CP850");
 
        /*
         * Allow the default PASSWD_CHAT to be overridden in local.h.
         */
-       string_set(&Globals.szPasswdChat, DEFAULT_PASSWD_CHAT);
+       do_parameter("passwd chat", DEFAULT_PASSWD_CHAT);
+
+       do_parameter("passwd program", "");
+       do_parameter("printcap name", PRINTCAP_NAME);
        
-       string_set(&Globals.szPasswdProgram, "");
-       string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
-       string_set(&Globals.szPidDir, dyn_PIDDIR);
-       string_set(&Globals.szLockDir, dyn_LOCKDIR);
-       string_set(&Globals.szSocketAddress, "0.0.0.0");
-       pstrcpy(s, "Samba ");
-       pstrcat(s, SAMBA_VERSION);
-       string_set(&Globals.szServerString, s);
-       slprintf(s, sizeof(s) - 1, "%d.%d", DEFAULT_MAJOR_VERSION,
-                DEFAULT_MINOR_VERSION);
-       string_set(&Globals.szAnnounceVersion, s);
-
-       string_set(&Globals.szLogonDrive, "");
-       /* %N is the NIS auto.home server if -DAUTOHOME is used, else same as %L */
-       string_set(&Globals.szLogonHome, "\\\\%N\\%U");
-       string_set(&Globals.szLogonPath, "\\\\%N\\%U\\profile");
-
-       string_set(&Globals.szPasswordServer, "*");
-
-       Globals.AlgorithmicRidBase = BASE_RID;
-
-       Globals.bLoadPrinters = True;
-       Globals.mangled_stack = 50;
-       /* Was 65535 (0xFFFF). 0x4101 matches W2K and causes major speed improvements... */
-       /* Discovered by 2 days of pain by Don McCall @ HP :-). */
-       Globals.max_xmit = 0x4104;
-       Globals.max_mux = 50;   /* This is *needed* for profile support. */
-       Globals.lpqcachetime = 10;
-       Globals.bDisableSpoolss = False;
-       Globals.iMaxSmbdProcesses = 0;/* no limit specified */
-       Globals.iTotalPrintJobs = 0;  /* no limit specified */
-       Globals.pwordlevel = 0;
-       Globals.unamelevel = 0;
-       Globals.deadtime = 0;
-       Globals.bLargeReadwrite = True;
-       Globals.max_log_size = 5000;
-       Globals.max_open_files = MAX_OPEN_FILES;
-       Globals.minprotocol = PROTOCOL_CORE;
-       Globals.security = SEC_USER;
-       Globals.paranoid_server_security = True;
-       Globals.bEncryptPasswords = True;
-       Globals.bUpdateEncrypt = False;
-       Globals.bReadRaw = True;
-       Globals.bWriteRaw = True;
-       Globals.bReadPrediction = False;
-       Globals.bReadbmpx = False;
-       Globals.bNullPasswords = False;
-       Globals.bObeyPamRestrictions = False;
-       Globals.bStripDot = False;
-       Globals.syslog = 1;
-       Globals.bSyslogOnly = False;
-       Globals.bTimestampLogs = True;
-       Globals.bDebugHiresTimestamp = False;
-       Globals.bDebugPid = False;
-       Globals.bDebugUid = False;
-       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.change_notify_timeout = 60;     /* 1 minute default. */
-       Globals.bKernelChangeNotify = True;     /* On if we have it. */
-       Globals.ReadSize = 16 * 1024;
-       Globals.lm_announce = 2;        /* = Auto: send only if LM clients found */
-       Globals.lm_interval = 60;
-       Globals.stat_cache_size = 50;   /* Number of stat translations we'll keep */
-       Globals.announce_as = ANNOUNCE_AS_NT_SERVER;
-#if (defined(HAVE_NETGROUP) && defined(WITH_AUTOMOUNT))
-       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.bUnicode = True;        /* Do unicode on the wire 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.restrict_anonymous = 0;
-       Globals.bClientLanManAuth = True;       /* Do use the LanMan hash if it is available */
-       Globals.bLanmanAuth = True;     /* Do use the LanMan hash if it is available */
-       Globals.bNTLMAuth = True;       /* Do use NTLMv1 if it is available (otherwise NTLMv2) */
+       do_parameter("pid directory", dyn_PIDDIR);
+       do_parameter("lock dir", dyn_LOCKDIR);
+       do_parameter("ncalrpc dir", dyn_NCALRPCDIR);
+
+       do_parameter("socket address", "0.0.0.0");
+       do_parameter_var("server string", "Samba %s", SAMBA_VERSION_STRING);
+
+       do_parameter_var("announce version", "%d.%d", 
+                        DEFAULT_MAJOR_VERSION,
+                        DEFAULT_MINOR_VERSION);
+
+       do_parameter("logon drive", "");
+
+       do_parameter("logon home", "\\\\%N\\%U");
+       do_parameter("logon path", "\\\\%N\\%U\\profile");
+       do_parameter("password server", "*");
+
+       do_parameter("load printers", "True");
+
+       do_parameter("max mux", "50");
+       do_parameter("max xmit", "12288");
+       do_parameter("lpqcachetime", "10");
+       do_parameter("DisableSpoolss", "False");
+       do_parameter("password level", "0");
+       do_parameter("username level", "0");
+       do_parameter("LargeReadwrite", "True");
+       do_parameter("minprotocol", "CORE");
+       do_parameter("security", "USER");
+       do_parameter("paranoid server security", "True");
+       do_parameter("EncryptPasswords", "True");
+       do_parameter("ReadRaw", "True");
+       do_parameter("WriteRaw", "True");
+       do_parameter("NullPasswords", "False");
+       do_parameter("ObeyPamRestrictions", "False");
+       do_parameter("lm announce", "Auto");    
+       do_parameter("lm interval", "60");
+       do_parameter("announce as", "NT SERVER");
+
+       do_parameter("TimeServer", "False");
+       do_parameter("BindInterfacesOnly", "False");
+       do_parameter("PamPasswordChange", "False");
+       do_parameter("Unicode", "True");
+       do_parameter("restrict anonymous", "0");
+       do_parameter("ClientLanManAuth", "True");
+       do_parameter("LanmanAuth", "True");
+       do_parameter("NTLMAuth", "True");
        
-       Globals.map_to_guest = 0;       /* By Default, "Never" */
-       Globals.min_passwd_length = MINPASSWDLENGTH;    /* By Default, 5. */
-       Globals.oplock_break_wait_time = 0;     /* By Default, 0 msecs. */
-       Globals.enhanced_browsing = True; 
-       Globals.iLockSpinCount = 3; /* Try 2 times. */
-       Globals.iLockSpinTime = 10; /* usec. */
+       do_parameter("enhanced browsing", "True"); 
+       do_parameter("LockSpinCount", "3");
+       do_parameter("LockSpinTime", "10");
 #ifdef MMAP_BLACKLIST
-       Globals.bUseMmap = False;
+       do_parameter("UseMmap", "False");
 #else
-       Globals.bUseMmap = True;
+       do_parameter("UseMmap", "True");
 #endif
-       Globals.bUnixExtensions = False;
+       do_parameter("UnixExtensions", "False");
 
        /* hostname lookups can be very expensive and are broken on
           a large number of sites (tridge) */
-       Globals.bHostnameLookups = False;
-
-#ifdef WITH_LDAP_SAMCONFIG
-       string_set(&Globals.szLdapServer, "localhost");
-       Globals.ldap_port = 636;
-       Globals.szPassdbBackend = str_list_make("ldapsam guest", NULL);
-#else
-       Globals.szPassdbBackend = str_list_make("smbpasswd guest", NULL);
-#endif /* WITH_LDAP_SAMCONFIG */
+       do_parameter("HostnameLookups", "False");
 
-       string_set(&Globals.szLdapSuffix, "");
-       string_set(&Globals.szLdapMachineSuffix, "");
-       string_set(&Globals.szLdapUserSuffix, "");
+       do_parameter("PreferredMaster", "Auto");
+       do_parameter("os level", "20");
+       do_parameter("LocalMaster", "True");
+       do_parameter("DomainMaster", "Auto");   /* depending on bDomainLogons */
+       do_parameter("DomainLogons", "False");
+       do_parameter("WINSsupport", "False");
+       do_parameter("WINSproxy", "False");
 
-       string_set(&Globals.szLdapFilter, "(&(uid=%u)(objectclass=sambaAccount))");
-       string_set(&Globals.szLdapAdminDn, "");
-       Globals.ldap_ssl = LDAP_SSL_ON;
-       Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
+       do_parameter("DNSproxy", "True");
 
-/* these parameters are set to defaults that are more appropriate
-   for the increasing samba install base:
+       do_parameter("AllowTrustedDomains", "True");
 
-   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).
+       do_parameter("TemplateShell", "/bin/false");
+       do_parameter("TemplateHomedir", "/home/%D/%U");
+       do_parameter("WinbindSeparator", "\\");
 
-   doesn't provide WINS server service by default (wsupp = False),
-   and doesn't provide domain master browser services by default, either.
+       do_parameter("winbind cache time", "15");
+       do_parameter("WinbindEnumUsers", "True");
+       do_parameter("WinbindEnumGroups", "True");
+       do_parameter("WinbindUseDefaultDomain", "False");
 
-*/
-
-       Globals.bMsAddPrinterWizard = True;
-       Globals.bPreferredMaster = Auto;        /* depending on bDomainMaster */
-       Globals.os_level = 20;
-       Globals.bLocalMaster = True;
-       Globals.bDomainMaster = Auto;   /* depending on bDomainLogons */
-       Globals.bDomainLogons = False;
-       Globals.bBrowseList = True;
-       Globals.bWINSsupport = False;
-       Globals.bWINSproxy = False;
-
-       Globals.bDNSproxy = True;
-
-       /* this just means to use them if they exist */
-       Globals.bKernelOplocks = True;
-
-       Globals.bAllowTrustedDomains = True;
+       do_parameter("IDMapBackend", "tdb");
 
-       string_set(&Globals.szTemplateShell, "/bin/false");
-       string_set(&Globals.szTemplateHomedir, "/home/%D/%U");
-       string_set(&Globals.szWinbindSeparator, "\\");
-       string_set(&Globals.szAclCompat, "");
+       do_parameter("name cache timeout", "660"); /* In seconds */
 
-       Globals.winbind_cache_time = 15;
-       Globals.bWinbindEnumUsers = True;
-       Globals.bWinbindEnumGroups = True;
-       Globals.bWinbindUseDefaultDomain = False;
+       do_parameter("client signing", "Yes");
+       do_parameter("server signing", "auto");
 
-       string_set(&Globals.szIDMapBackend, "tdb");
+       do_parameter("use spnego", "True");
 
-       Globals.name_cache_timeout = 660; /* In seconds */
+       do_parameter("smb ports", SMB_PORTS);
 
-       Globals.bUseSpnego = True;
-       Globals.bClientUseSpnego = True;
-
-       string_set(&Globals.smb_ports, SMB_PORTS);
+       do_parameter("nt status support", "True");
 }
 
 static TALLOC_CTX *lp_talloc;
@@ -1469,7 +1055,7 @@ void lp_talloc_free(void)
 {
        if (!lp_talloc)
                return;
-       talloc_destroy(lp_talloc);
+       talloc_free(lp_talloc);
        lp_talloc = NULL;
 }
 
@@ -1479,10 +1065,12 @@ void lp_talloc_free(void)
  callers without affecting the source string.
 ********************************************************************/
 
-static char *lp_string(const char *s)
+static const char *lp_string(const char *s)
 {
+#if 0  /* until REWRITE done to make thread-safe */
        size_t len = s ? strlen(s) : 0;
        char *ret;
+#endif
 
        /* The follow debug is useful for tracking down memory problems
           especially if you have an inner loop that is calling a lp_*()
@@ -1492,6 +1080,7 @@ static char *lp_string(const char *s)
 #if 0
        DEBUG(10, ("lp_string(%s)\n", s));
 #endif
+
 #if 0  /* until REWRITE done to make thread-safe */
        if (!lp_talloc)
                lp_talloc = talloc_init("lp_talloc");
@@ -1523,7 +1112,7 @@ 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) : ""));}
+ const char *fn_name(void) {return(lp_string(*(char **)(ptr) ? *(char **)(ptr) : ""));}
 #define FN_GLOBAL_CONST_STRING(fn_name,ptr) \
  const char *fn_name(void) {return(*(const char **)(ptr) ? *(const char **)(ptr) : "");}
 #define FN_GLOBAL_LIST(fn_name,ptr) \
@@ -1536,7 +1125,7 @@ static char *lp_string(const char *s)
  int fn_name(void) {return(*(int *)(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));}
+ const char *fn_name(int i) {return(lp_string((LP_SNUM_OK(i) && ServicePtrs[(i)]->val) ? ServicePtrs[(i)]->val : sDefault.val));}
 #define FN_LOCAL_CONST_STRING(fn_name,val) \
  const char *fn_name(int i) {return (const char *)((LP_SNUM_OK(i) && ServicePtrs[(i)]->val) ? ServicePtrs[(i)]->val : sDefault.val);}
 #define FN_LOCAL_LIST(fn_name,val) \
@@ -1548,34 +1137,25 @@ static char *lp_string(const char *s)
 #define FN_LOCAL_INTEGER(fn_name,val) \
  int fn_name(int i) {return(LP_SNUM_OK(i)? ServicePtrs[(i)]->val : sDefault.val);}
 
-FN_GLOBAL_STRING(lp_smb_ports, &Globals.smb_ports)
+FN_GLOBAL_LIST(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_sam_url, &Globals.szSAM_URL)
+FN_GLOBAL_STRING(lp_spoolss_url, &Globals.szSPOOLSS_URL)
 FN_GLOBAL_STRING(lp_private_dir, &Globals.szPrivateDir)
 FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString)
 FN_GLOBAL_STRING(lp_printcapname, &Globals.szPrintcapname)
-FN_GLOBAL_STRING(lp_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_STRING(lp_ncalrpc_dir, &Globals.ncalrpc_dir)
 FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
-FN_GLOBAL_STRING(lp_mangling_method, &Globals.szManglingMethod)
-FN_GLOBAL_INTEGER(lp_mangle_prefix, &Globals.mangle_prefix)
-#ifdef WITH_UTMP
-FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
-FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)
-FN_GLOBAL_BOOL(lp_utmp, &Globals.bUtmp)
-#endif
+FN_GLOBAL_LIST(lp_dcerpc_endpoint_servers, &Globals.dcerpc_ep_servers)
+FN_GLOBAL_LIST(lp_server_services, &Globals.server_services)
 FN_GLOBAL_STRING(lp_rootdir, &Globals.szRootdir)
-FN_GLOBAL_STRING(lp_source_environment, &Globals.szSourceEnv)
 FN_GLOBAL_STRING(lp_defaultservice, &Globals.szDefaultService)
-FN_GLOBAL_STRING(lp_msg_command, &Globals.szMsgCommand)
-FN_GLOBAL_STRING(lp_dfree_command, &Globals.szDfree)
 FN_GLOBAL_STRING(lp_hosts_equiv, &Globals.szHostsEquiv)
 FN_GLOBAL_STRING(lp_auto_services, &Globals.szAutoServices)
 FN_GLOBAL_STRING(lp_passwd_program, &Globals.szPasswdProgram)
@@ -1584,7 +1164,6 @@ 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_STRING(lp_ads_server, &Globals.szADSserver)
-FN_GLOBAL_STRING(lp_username_map, &Globals.szUsernameMap)
 FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options)
 FN_GLOBAL_STRING(lp_workgroup, &Globals.szWorkgroup)
 FN_GLOBAL_STRING(lp_netbios_name, &Globals.szNetbiosName)
@@ -1598,57 +1177,26 @@ FN_GLOBAL_STRING(lp_remote_browse_sync, &Globals.szRemoteBrowseSync)
 FN_GLOBAL_LIST(lp_wins_server_list, &Globals.szWINSservers)
 FN_GLOBAL_LIST(lp_interfaces, &Globals.szInterfaces)
 FN_GLOBAL_STRING(lp_socket_address, &Globals.szSocketAddress)
-FN_GLOBAL_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_LIST(lp_passdb_backend, &Globals.szPassdbBackend)
-FN_GLOBAL_LIST(lp_sam_backend, &Globals.szSamBackend)
 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_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_wins_hook, &Globals.szWINSHook)
 FN_GLOBAL_STRING(lp_wins_partners, &Globals.szWINSPartners)
 FN_GLOBAL_STRING(lp_template_homedir, &Globals.szTemplateHomedir)
 FN_GLOBAL_STRING(lp_template_shell, &Globals.szTemplateShell)
 FN_GLOBAL_CONST_STRING(lp_winbind_separator, &Globals.szWinbindSeparator)
-FN_GLOBAL_STRING(lp_acl_compatibility, &Globals.szAclCompat)
 FN_GLOBAL_BOOL(lp_winbind_enum_users, &Globals.bWinbindEnumUsers)
 FN_GLOBAL_BOOL(lp_winbind_enum_groups, &Globals.bWinbindEnumGroups)
 FN_GLOBAL_BOOL(lp_winbind_use_default_domain, &Globals.bWinbindUseDefaultDomain)
 FN_GLOBAL_STRING(lp_idmap_backend, &Globals.szIDMapBackend)
 
-#ifdef WITH_LDAP_SAMCONFIG
-FN_GLOBAL_STRING(lp_ldap_server, &Globals.szLdapServer)
-FN_GLOBAL_INTEGER(lp_ldap_port, &Globals.ldap_port)
-#endif
-FN_GLOBAL_STRING(lp_ldap_suffix, &Globals.szLdapSuffix)
-FN_GLOBAL_STRING(lp_ldap_machine_suffix, &Globals.szLdapMachineSuffix)
-FN_GLOBAL_STRING(lp_ldap_user_suffix, &Globals.szLdapUserSuffix)
-FN_GLOBAL_STRING(lp_ldap_filter, &Globals.szLdapFilter)
-FN_GLOBAL_STRING(lp_ldap_admin_dn, &Globals.szLdapAdminDn)
-FN_GLOBAL_INTEGER(lp_ldap_ssl, &Globals.ldap_ssl)
-FN_GLOBAL_INTEGER(lp_ldap_passwd_sync, &Globals.ldap_passwd_sync)
-FN_GLOBAL_BOOL(lp_ldap_trust_ids, &Globals.ldap_trust_ids)
-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_BOOL(lp_disable_netbios, &Globals.bDisableNetbios)
-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)
@@ -1656,32 +1204,17 @@ FN_GLOBAL_BOOL(lp_wins_proxy, &Globals.bWINSproxy)
 FN_GLOBAL_BOOL(lp_local_master, &Globals.bLocalMaster)
 FN_GLOBAL_BOOL(lp_domain_logons, &Globals.bDomainLogons)
 FN_GLOBAL_BOOL(lp_load_printers, &Globals.bLoadPrinters)
-FN_GLOBAL_BOOL(lp_readprediction, &Globals.bReadPrediction)
-FN_GLOBAL_BOOL(lp_readbmpx, &Globals.bReadbmpx)
 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_strip_dot, &Globals.bStripDot)
 FN_GLOBAL_BOOL(lp_encrypted_passwords, &Globals.bEncryptPasswords)
-FN_GLOBAL_BOOL(lp_update_encrypted, &Globals.bUpdateEncrypt)
-FN_GLOBAL_BOOL(lp_syslog_only, &Globals.bSyslogOnly)
-FN_GLOBAL_BOOL(lp_timestamp_logs, &Globals.bTimestampLogs)
-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_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_BOOL(lp_unicode, &Globals.bUnicode)
-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_BOOL(lp_allow_trusted_domains, &Globals.bAllowTrustedDomains)
 FN_GLOBAL_INTEGER(lp_restrict_anonymous, &Globals.restrict_anonymous)
 FN_GLOBAL_BOOL(lp_lanman_auth, &Globals.bLanmanAuth)
@@ -1689,58 +1222,37 @@ FN_GLOBAL_BOOL(lp_ntlm_auth, &Globals.bNTLMAuth)
 FN_GLOBAL_BOOL(lp_client_lanman_auth, &Globals.bClientLanManAuth)
 FN_GLOBAL_BOOL(lp_client_ntlmv2_auth, &Globals.bClientNTLMv2Auth)
 FN_GLOBAL_BOOL(lp_host_msdfs, &Globals.bHostMSDfs)
-FN_GLOBAL_BOOL(lp_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_hostname_lookups, &Globals.bHostnameLookups)
-FN_GLOBAL_BOOL(lp_kernel_change_notify, &Globals.bKernelChangeNotify)
+FN_GLOBAL_BOOL(lp_rpc_big_endian, &Globals.bRpcBigEndian)
 FN_GLOBAL_INTEGER(lp_os_level, &Globals.os_level)
 FN_GLOBAL_INTEGER(lp_max_ttl, &Globals.max_ttl)
 FN_GLOBAL_INTEGER(lp_max_wins_ttl, &Globals.max_wins_ttl)
 FN_GLOBAL_INTEGER(lp_min_wins_ttl, &Globals.min_wins_ttl)
-FN_GLOBAL_INTEGER(lp_max_log_size, &Globals.max_log_size)
-FN_GLOBAL_INTEGER(lp_max_open_files, &Globals.max_open_files)
-FN_GLOBAL_INTEGER(lp_maxxmit, &Globals.max_xmit)
 FN_GLOBAL_INTEGER(lp_time_offset, &Globals.time_offset)
 FN_GLOBAL_INTEGER(lp_maxmux, &Globals.max_mux)
+FN_GLOBAL_INTEGER(lp_max_xmit, &Globals.max_xmit)
 FN_GLOBAL_INTEGER(lp_passwordlevel, &Globals.pwordlevel)
 FN_GLOBAL_INTEGER(lp_usernamelevel, &Globals.unamelevel)
-FN_GLOBAL_INTEGER(lp_readsize, &Globals.ReadSize)
-FN_GLOBAL_INTEGER(lp_deadtime, &Globals.deadtime)
-FN_GLOBAL_INTEGER(lp_keepalive, &Globals.keepalive)
 FN_GLOBAL_INTEGER(lp_maxprotocol, &Globals.maxprotocol)
 FN_GLOBAL_INTEGER(lp_minprotocol, &Globals.minprotocol)
 FN_GLOBAL_INTEGER(lp_security, &Globals.security)
 FN_GLOBAL_LIST(lp_auth_methods, &Globals.AuthMethods)
 FN_GLOBAL_BOOL(lp_paranoid_server_security, &Globals.paranoid_server_security)
-FN_GLOBAL_INTEGER(lp_maxdisksize, &Globals.maxdisksize)
 FN_GLOBAL_INTEGER(lp_lpqcachetime, &Globals.lpqcachetime)
-FN_GLOBAL_INTEGER(lp_max_smbd_processes, &Globals.iMaxSmbdProcesses)
 FN_GLOBAL_INTEGER(lp_disable_spoolss, &Globals.bDisableSpoolss)
-FN_GLOBAL_INTEGER(lp_totalprintjobs, &Globals.iTotalPrintJobs)
-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_change_notify_timeout, &Globals.change_notify_timeout)
-FN_GLOBAL_INTEGER(lp_stat_cache_size, &Globals.stat_cache_size)
-FN_GLOBAL_INTEGER(lp_map_to_guest, &Globals.map_to_guest)
-FN_GLOBAL_INTEGER(lp_min_passwd_length, &Globals.min_passwd_length)
-FN_GLOBAL_INTEGER(lp_oplock_break_wait_time, &Globals.oplock_break_wait_time)
 FN_GLOBAL_INTEGER(lp_lock_spin_count, &Globals.iLockSpinCount)
 FN_GLOBAL_INTEGER(lp_lock_sleep_time, &Globals.iLockSpinTime)
-FN_LOCAL_STRING(lp_preexec, szPreExec)
-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_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)
@@ -1755,40 +1267,15 @@ FN_LOCAL_STRING(lp_queueresumecommand, szQueueresumecommand)
 static FN_LOCAL_STRING(_lp_printername, szPrintername)
 FN_LOCAL_LIST(lp_hostsallow, szHostsallow)
 FN_LOCAL_LIST(lp_hostsdeny, szHostsdeny)
-FN_LOCAL_STRING(lp_magicscript, szMagicScript)
-FN_LOCAL_STRING(lp_magicoutput, szMagicOutput)
 FN_LOCAL_STRING(lp_comment, comment)
-FN_LOCAL_STRING(lp_force_user, force_user)
-FN_LOCAL_STRING(lp_force_group, force_group)
-FN_LOCAL_LIST(lp_readlist, readlist)
-FN_LOCAL_LIST(lp_writelist, writelist)
-FN_LOCAL_LIST(lp_printer_admin, printer_admin)
 FN_LOCAL_STRING(lp_fstype, fstype)
-FN_LOCAL_STRING(lp_vfsobj, szVfsObjectFile)
-FN_LOCAL_STRING(lp_vfs_options, szVfsOptions)
-FN_LOCAL_STRING(lp_vfs_path, szVfsPath)
 FN_LOCAL_STRING(lp_msdfs_proxy, szMSDfsProxy)
 static FN_LOCAL_STRING(lp_volume, volume)
-FN_LOCAL_STRING(lp_mangled_map, szMangledMap)
-FN_LOCAL_STRING(lp_veto_files, szVetoFiles)
-FN_LOCAL_STRING(lp_hide_files, szHideFiles)
-FN_LOCAL_STRING(lp_veto_oplocks, szVetoOplockFiles)
-FN_LOCAL_STRING(lp_ntvfs_handler, ntvfs_handler)
+FN_LOCAL_LIST(lp_ntvfs_handler, ntvfs_handler)
 FN_LOCAL_BOOL(lp_msdfs_root, bMSDfsRoot)
 FN_LOCAL_BOOL(lp_autoloaded, autoloaded)
-FN_LOCAL_BOOL(lp_preexec_close, bPreexecClose)
-FN_LOCAL_BOOL(lp_rootpreexec_close, bRootpreexecClose)
-FN_LOCAL_BOOL(lp_casesensitive, bCaseSensitive)
-FN_LOCAL_BOOL(lp_preservecase, bCasePreserve)
-FN_LOCAL_BOOL(lp_shortpreservecase, bShortCasePreserve)
-FN_LOCAL_BOOL(lp_casemangle, bCaseMangle)
-FN_LOCAL_BOOL(lp_hide_dot_files, bHideDotFiles)
-FN_LOCAL_BOOL(lp_hide_special_files, bHideSpecialFiles)
-FN_LOCAL_BOOL(lp_hideunreadable, bHideUnReadable)
-FN_LOCAL_BOOL(lp_hideunwriteable_files, bHideUnWriteableFiles)
 FN_LOCAL_BOOL(lp_browseable, bBrowseable)
 FN_LOCAL_BOOL(lp_readonly, bRead_only)
-FN_LOCAL_BOOL(lp_no_set_dir, bNo_set_dir)
 FN_LOCAL_BOOL(lp_guest_ok, bGuest_ok)
 FN_LOCAL_BOOL(lp_guest_only, bGuest_only)
 FN_LOCAL_BOOL(lp_print_ok, bPrint_ok)
@@ -1797,55 +1284,22 @@ FN_LOCAL_BOOL(lp_map_archive, bMap_archive)
 FN_LOCAL_BOOL(lp_locking, bLocking)
 FN_LOCAL_BOOL(lp_strict_locking, bStrictLocking)
 FN_LOCAL_BOOL(lp_posix_locking, bPosixLocking)
+FN_LOCAL_BOOL(lp_strict_sync, bStrictSync)
+FN_LOCAL_BOOL(lp_ci_filesystem, bCIFileSystem)
 FN_LOCAL_BOOL(lp_share_modes, bShareModes)
 FN_LOCAL_BOOL(lp_oplocks, bOpLocks)
 FN_LOCAL_BOOL(lp_level2_oplocks, bLevel2OpLocks)
 FN_LOCAL_BOOL(lp_onlyuser, bOnlyUser)
-FN_LOCAL_BOOL(lp_manglednames, bMangledNames)
-FN_LOCAL_BOOL(lp_widelinks, bWidelinks)
-FN_LOCAL_BOOL(lp_symlinks, bSymlinks)
-FN_LOCAL_BOOL(lp_syncalways, bSyncAlways)
-FN_LOCAL_BOOL(lp_strict_allocate, bStrictAllocate)
-FN_LOCAL_BOOL(lp_strict_sync, bStrictSync)
 FN_LOCAL_BOOL(lp_map_system, bMap_system)
-FN_LOCAL_BOOL(lp_delete_readonly, bDeleteReadonly)
-FN_LOCAL_BOOL(lp_fake_oplocks, bFakeOplocks)
-FN_LOCAL_BOOL(lp_recursive_veto_delete, bDeleteVetoFiles)
-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_LOCAL_BOOL(lp_blocking_locks, bBlockingLocks)
-FN_LOCAL_BOOL(lp_inherit_perms, bInheritPerms)
-FN_LOCAL_BOOL(lp_inherit_acls, bInheritACLS)
-FN_LOCAL_BOOL(lp_use_client_driver, bUseClientDriver)
-FN_LOCAL_BOOL(lp_default_devmode, bDefaultDevmode)
-FN_LOCAL_BOOL(lp_nt_acl_support, bNTAclSupport)
-FN_LOCAL_BOOL(lp_use_sendfile, bUseSendfile)
-FN_LOCAL_BOOL(lp_profile_acls, bProfileAcls)
-FN_LOCAL_INTEGER(lp_create_mask, iCreate_mask)
-FN_LOCAL_INTEGER(lp_force_create_mode, iCreate_force_mode)
-FN_LOCAL_INTEGER(lp_security_mask, iSecurity_mask)
-FN_LOCAL_INTEGER(lp_force_security_mode, iSecurity_force_mode)
-FN_LOCAL_INTEGER(lp_dir_mask, iDir_mask)
-FN_LOCAL_INTEGER(lp_force_dir_mode, iDir_force_mode)
-FN_LOCAL_INTEGER(lp_dir_security_mask, iDir_Security_mask)
-FN_LOCAL_INTEGER(lp_force_dir_security_mode, iDir_Security_force_mode)
 FN_LOCAL_INTEGER(lp_max_connections, iMaxConnections)
-FN_LOCAL_INTEGER(lp_defaultcase, iDefaultCase)
 FN_LOCAL_INTEGER(lp_minprintspace, iMinPrintSpace)
 FN_LOCAL_INTEGER(lp_printing, iPrinting)
-FN_LOCAL_INTEGER(lp_max_reported_jobs, iMaxReportedPrintJobs)
-FN_LOCAL_INTEGER(lp_oplock_contention_limit, iOplockContentionLimit)
 FN_LOCAL_INTEGER(lp_csc_policy, iCSCPolicy)
-FN_LOCAL_INTEGER(lp_write_cache_size, iWriteCacheSize)
-FN_LOCAL_INTEGER(lp_block_size, iBlock_size)
-FN_LOCAL_CHAR(lp_magicchar, magic_char)
 FN_GLOBAL_INTEGER(lp_winbind_cache_time, &Globals.winbind_cache_time)
 FN_GLOBAL_BOOL(lp_hide_local_users, &Globals.bHideLocalUsers)
-FN_GLOBAL_INTEGER(lp_algorithmic_rid_base, &Globals.AlgorithmicRidBase)
 FN_GLOBAL_INTEGER(lp_name_cache_timeout, &Globals.name_cache_timeout)
-FN_GLOBAL_BOOL(lp_client_signing, &Globals.client_signing)
+FN_GLOBAL_INTEGER(lp_server_signing, &Globals.server_signing)
+FN_GLOBAL_INTEGER(lp_client_signing, &Globals.client_signing)
 
 /* local prototypes */
 
@@ -1950,32 +1404,12 @@ static BOOL lp_bool(const char *s)
        return ret;
 }
 
-/*******************************************************************
-convenience routine to return enum parameters.
-********************************************************************/
-static int lp_enum(const char *s,const struct enum_list *_enum)
-{
-       int i;
-
-       if (!s || !_enum) {
-               DEBUG(0,("lp_enum(%s,enum): is called with NULL!\n",s));
-               return False;
-       }
-       
-       for (i=0; _enum[i].name; i++) {
-               if (strcasecmp(_enum[i].name,s)==0)
-                       return _enum[i].value;
-       }
-
-       DEBUG(0,("lp_enum(%s,enum): value is not in enum_list!\n",s));
-       return (-1);
-}
 
 /* Return parametric option from a given service. Type is a part of option before ':' */
 /* Parametric option has following syntax: 'Type: option = value' */
 /* Returned value is allocated in 'lp_talloc' context */
 
-char *lp_parm_string(int lookup_service, const char *type, const char *option)
+const char *lp_parm_string(int lookup_service, const char *type, const char *option)
 {
        const char *value = get_parametrics(lookup_service, type, option);
        
@@ -2003,27 +1437,27 @@ char **lp_parm_string_list(int lookup_service, const char *type, const char *opt
 /* Return parametric option from a given service. Type is a part of option before ':' */
 /* Parametric option has following syntax: 'Type: option = value' */
 
-int lp_parm_int(int lookup_service, const char *type, const char *option)
+int lp_parm_int(int lookup_service, const char *type, const char *option, int default_v)
 {
        const char *value = get_parametrics(lookup_service, type, option);
        
        if (value)
                return lp_int(value);
 
-       return (-1);
+       return default_v;
 }
 
 /* Return parametric option from a given service. Type is a part of option before ':' */
 /* Parametric option has following syntax: 'Type: option = value' */
 
-unsigned long lp_parm_ulong(int lookup_service, const char *type, const char *option)
+unsigned long lp_parm_ulong(int lookup_service, const char *type, const char *option, unsigned long default_v)
 {
        const char *value = get_parametrics(lookup_service, type, option);
        
        if (value)
                return lp_ulong(value);
 
-       return (0);
+       return default_v;
 }
 
 /* Return parametric option from a given service. Type is a part of option before ':' */
@@ -2039,20 +1473,6 @@ BOOL lp_parm_bool(int lookup_service, const char *type, const char *option, BOOL
        return default_v;
 }
 
-/* Return parametric option from a given service. Type is a part of option before ':' */
-/* Parametric option has following syntax: 'Type: option = value' */
-
-int lp_parm_enum(int lookup_service, const char *type, const char *option,
-                const struct enum_list *_enum)
-{
-       const char *value = get_parametrics(lookup_service, type, option);
-       
-       if (value)
-               return lp_enum(value, _enum);
-
-       return (-1);
-}
-
 
 /***************************************************************************
  Initialise a service to the defaults.
@@ -2152,9 +1572,7 @@ static int add_a_service(const service *pservice, const char *name)
        if (i == iNumServices) {
                service **tsp;
                
-               tsp = (service **) Realloc(ServicePtrs,
-                                          sizeof(service *) *
-                                          num_to_alloc);
+               tsp = realloc_p(ServicePtrs, service *, num_to_alloc);
                                           
                if (!tsp) {
                        DEBUG(0,("add_a_service: failed to enlarge ServicePtrs!\n"));
@@ -2162,8 +1580,7 @@ static int add_a_service(const service *pservice, const char *name)
                }
                else {
                        ServicePtrs = tsp;
-                       ServicePtrs[iNumServices] =
-                               (service *) malloc(sizeof(service));
+                       ServicePtrs[iNumServices] = malloc_p(service);
                }
                if (!ServicePtrs[iNumServices]) {
                        DEBUG(0,("add_a_service: out of memory!\n"));
@@ -2237,30 +1654,34 @@ int lp_add_service(const char *pszService, int iDefaultService)
  Add the IPC service.
 ***************************************************************************/
 
-static BOOL lp_add_ipc(const char *ipc_name, BOOL guest_ok)
+static BOOL lp_add_hidden(const char *name, const char *fstype, BOOL guest_ok)
 {
        pstring comment;
-       int i = add_a_service(&sDefault, ipc_name);
+       int i = add_a_service(&sDefault, name);
 
        if (i < 0)
                return (False);
 
        slprintf(comment, sizeof(comment) - 1,
-                "IPC Service (%s)", Globals.szServerString);
+                "%s Service (%s)", fstype, Globals.szServerString);
 
        string_set(&ServicePtrs[i]->szPath, tmpdir());
        string_set(&ServicePtrs[i]->szUsername, "");
        string_set(&ServicePtrs[i]->comment, comment);
-       string_set(&ServicePtrs[i]->fstype, "IPC");
-       ServicePtrs[i]->iMaxConnections = 0;
+       string_set(&ServicePtrs[i]->fstype, fstype);
+       ServicePtrs[i]->iMaxConnections = -1;
        ServicePtrs[i]->bAvailable = True;
        ServicePtrs[i]->bRead_only = True;
        ServicePtrs[i]->bGuest_only = False;
        ServicePtrs[i]->bGuest_ok = guest_ok;
        ServicePtrs[i]->bPrint_ok = False;
-       ServicePtrs[i]->bBrowseable = sDefault.bBrowseable;
+       ServicePtrs[i]->bBrowseable = False;
+
+       if (strcasecmp(fstype, "IPC") == 0) {
+               lp_do_parameter(i, "ntvfs handler", "default");
+       }
 
-       DEBUG(3, ("adding IPC service\n"));
+       DEBUG(3, ("adding hidden service %s\n", name));
 
        return (True);
 }
@@ -2455,7 +1876,7 @@ static void copy_service(service * pserviceDest, service * pserviceSource, BOOL
                        pdata = pdata->next;
                }
                if (not_added) {
-                       paramo = smb_xmalloc(sizeof(*paramo));
+                       paramo = smb_xmalloc_p(struct param_opt);
                        paramo->key = strdup(data->key);
                        paramo->value = strdup(data->value);
                        DLIST_ADD(pserviceDest->param_opt, paramo);
@@ -2493,13 +1914,6 @@ static BOOL service_ok(int iService)
                        ServicePtrs[iService]->bBrowseable = False;
        }
 
-       if (ServicePtrs[iService]->szPath[0] == '\0' &&
-           strwicmp(ServicePtrs[iService]->szService, HOMES_NAME) != 0) {
-               DEBUG(0, ("No path in service %s - using %s\n",
-                      ServicePtrs[iService]->szService, tmpdir()));
-               string_set(&ServicePtrs[iService]->szPath, tmpdir());
-       }
-
        /* If a service is flagged unavailable, log the fact at level 0. */
        if (!ServicePtrs[iService]->bAvailable)
                DEBUG(1, ("NOTE: Service %s is flagged unavailable.\n",
@@ -2531,7 +1945,7 @@ static void add_to_file_list(const char *fname, const char *subfname)
        }
 
        if (!f) {
-               f = (struct file_lists *)malloc(sizeof(file_lists[0]));
+               f = malloc_p(struct file_lists);
                if (!f)
                        return;
                f->next = file_lists;
@@ -2589,113 +2003,6 @@ BOOL lp_file_list_changed(void)
        return (False);
 }
 
-
-/***************************************************************************
- Do the work of sourcing in environment variable/value pairs.
-***************************************************************************/
-
-static BOOL source_env(char **lines)
-{
-       char *varval;
-       size_t len;
-       int i;
-       char *p;
-
-       for (i = 0; lines[i]; i++) {
-               char *line = lines[i];
-
-               if ((len = strlen(line)) == 0)
-                       continue;
-
-               if (line[len - 1] == '\n')
-                       line[--len] = '\0';
-
-               if ((varval = malloc(len + 1)) == NULL) {
-                       DEBUG(0, ("source_env: Not enough memory!\n"));
-                       return (False);
-               }
-
-               DEBUG(4, ("source_env: Adding to environment: %s\n", line));
-               strncpy(varval, line, len);
-               varval[len] = '\0';
-
-               p = strchr_m(line, (int)'=');
-               if (p == NULL) {
-                       DEBUG(4, ("source_env: missing '=': %s\n", line));
-                       continue;
-               }
-
-               if (putenv(varval)) {
-                       DEBUG(0, ("source_env: Failed to put environment variable %s\n",
-                              varval));
-                       continue;
-               }
-
-               *p = '\0';
-               p++;
-               DEBUG(4, ("source_env: getting var %s = %s\n", line, getenv(line)));
-       }
-
-       DEBUG(4, ("source_env: returning successfully\n"));
-       return (True);
-}
-
-/***************************************************************************
- Handle the source environment operation.
-***************************************************************************/
-
-static BOOL handle_source_env(const char *pszParmValue, char **ptr)
-{
-       pstring fname;
-       char *p = fname;
-       BOOL result;
-       char **lines;
-
-       pstrcpy(fname, pszParmValue);
-
-       standard_sub_basic(fname,sizeof(fname));
-
-       string_set(ptr, pszParmValue);
-
-       DEBUG(4, ("handle_source_env: checking env type\n"));
-
-       /*
-        * Filename starting with '|' means popen and read from stdin.
-        */
-
-       if (*p == '|')
-               lines = file_lines_pload(p + 1, NULL);
-       else
-               lines = file_lines_load(fname, NULL);
-
-       if (!lines) {
-               DEBUG(0, ("handle_source_env: Failed to open file %s, Error was %s\n",
-                      fname, strerror(errno)));
-               return (False);
-       }
-
-       result = source_env(lines);
-       file_lines_free(lines);
-
-       return (result);
-}
-
-/***************************************************************************
- Handle the interpretation of the vfs object parameter.
-*************************************************************************/
-
-static BOOL handle_vfs_object(const char *pszParmValue, char **ptr)
-{
-       /* Set string value */
-
-       string_set(ptr, pszParmValue);
-
-       /* Do any other initialisation required for vfs.  Note that
-          anything done here may have linking repercussions in nmbd. */
-
-       return True;
-}
-
 /***************************************************************************
  Handle the include operation.
 ***************************************************************************/
@@ -2773,7 +2080,7 @@ static BOOL handle_copy(const char *pszParmValue, char **ptr)
 
 static uid_t winbind_uid_low, winbind_uid_high;
 static gid_t winbind_gid_low, winbind_gid_high;
-static uint32 non_unix_account_low, non_unix_account_high;
+static uint32_t non_unix_account_low, non_unix_account_high;
 
 BOOL lp_winbind_uid(uid_t *low, uid_t *high)
 {
@@ -2803,7 +2110,7 @@ BOOL lp_winbind_gid(gid_t *low, gid_t *high)
         return True;
 }
 
-BOOL lp_non_unix_account_range(uint32 *low, uint32 *high)
+BOOL lp_non_unix_account_range(uint32_t *low, uint32_t *high)
 {
         if (non_unix_account_low == 0 || non_unix_account_high == 0)
                 return False;
@@ -2821,7 +2128,7 @@ BOOL lp_non_unix_account_range(uint32 *low, uint32 *high)
 
 static BOOL handle_winbind_uid(const char *pszParmValue, char **ptr)
 {
-       uint32 low, high;
+       uint32_t low, high;
 
        if (sscanf(pszParmValue, "%u-%u", &low, &high) != 2 || high < low)
                return False;
@@ -2838,7 +2145,7 @@ static BOOL handle_winbind_uid(const char *pszParmValue, char **ptr)
 
 static BOOL handle_winbind_gid(const char *pszParmValue, char **ptr)
 {
-       uint32 low, high;
+       uint32_t low, high;
 
        if (sscanf(pszParmValue, "%u-%u", &low, &high) != 2 || high < low)
                return False;
@@ -2859,7 +2166,7 @@ static BOOL handle_winbind_gid(const char *pszParmValue, char **ptr)
 
 static BOOL handle_non_unix_account_range(const char *pszParmValue, char **ptr)
 {
-       uint32 low, high;
+       uint32_t low, high;
 
        if (sscanf(pszParmValue, "%u-%u", &low, &high) != 2 || high < low)
                return False;
@@ -2874,106 +2181,7 @@ static BOOL handle_non_unix_account_range(const char *pszParmValue, char **ptr)
        return True;
 }
 
-/***************************************************************************
- Handle the ldap machine suffix option.
-***************************************************************************/
-
-static BOOL handle_ldap_machine_suffix( const char *pszParmValue, char **ptr)
-{
-       pstring suffix;
-       
-       pstrcpy(suffix, pszParmValue);
-
-       if (! *Globals.szLdapSuffix ) {
-               string_set( ptr, suffix );
-               return True;
-       }
-
-       if (! strstr(suffix, Globals.szLdapSuffix) ) {
-               if ( *pszParmValue )
-                       pstrcat(suffix, ",");
-               pstrcat(suffix, Globals.szLdapSuffix);
-       }
-       string_set( ptr, suffix );
-       return True;
-}
-
-/***************************************************************************
- Handle the ldap user suffix option.
-***************************************************************************/
-
-static BOOL handle_ldap_user_suffix( const char *pszParmValue, char **ptr)
-{
-       pstring suffix;
-       
-       pstrcpy(suffix, pszParmValue);
-
-       if (! *Globals.szLdapSuffix ) {
-               string_set( ptr, suffix );
-               return True;
-       }
-       
-       if (! strstr(suffix, Globals.szLdapSuffix) ) {
-               if ( *pszParmValue )
-                       pstrcat(suffix, ",");
-               pstrcat(suffix, Globals.szLdapSuffix);
-       }
-       string_set( ptr, suffix );
-       return True;
-}
 
-/***************************************************************************
- Handle setting ldap suffix and determines whether ldap machine suffix needs
- to be set as well.
-***************************************************************************/
-
-static BOOL handle_ldap_suffix( const char *pszParmValue, char **ptr)
-{
-       pstring suffix;
-       pstring user_suffix;
-       pstring machine_suffix; 
-                 
-       pstrcpy(suffix, pszParmValue);
-
-       if (! *Globals.szLdapMachineSuffix )
-               string_set(&Globals.szLdapMachineSuffix, suffix);
-       if (! *Globals.szLdapUserSuffix ) 
-               string_set(&Globals.szLdapUserSuffix, suffix);
-         
-       if (! strstr(Globals.szLdapMachineSuffix, suffix)) {
-               pstrcpy(machine_suffix, Globals.szLdapMachineSuffix);
-               if ( *Globals.szLdapMachineSuffix )
-                       pstrcat(machine_suffix, ",");
-               pstrcat(machine_suffix, suffix);
-               string_set(&Globals.szLdapMachineSuffix, machine_suffix);       
-       }
-
-       if (! strstr(Globals.szLdapUserSuffix, suffix)) {
-               pstrcpy(user_suffix, Globals.szLdapUserSuffix);
-               if ( *Globals.szLdapUserSuffix )
-                       pstrcat(user_suffix, ",");
-               pstrcat(user_suffix, suffix);   
-               string_set(&Globals.szLdapUserSuffix, user_suffix);
-       } 
-
-       string_set(ptr, suffix); 
-
-       return True;
-}
-
-static BOOL handle_acl_compatibility(const char *pszParmValue, char **ptr)
-{
-       if (strequal(pszParmValue, "auto"))
-               string_set(ptr, "");
-       else if (strequal(pszParmValue, "winnt"))
-               string_set(ptr, "winnt");
-       else if (strequal(pszParmValue, "win2k"))
-               string_set(ptr, "win2k");
-       else
-               return False;
-
-       return True;
-}
 /***************************************************************************
  Initialise a copymap.
 ***************************************************************************/
@@ -2982,7 +2190,7 @@ static void init_copymap(service * pservice)
 {
        int i;
        SAFE_FREE(pservice->copymap);
-       pservice->copymap = (BOOL *)malloc(sizeof(BOOL) * NUMPARAMETERS);
+       pservice->copymap = malloc_array_p(BOOL, NUMPARAMETERS);
        if (!pservice->copymap)
                DEBUG(0,
                      ("Couldn't allocate copymap!! (size %d)\n",
@@ -3011,10 +2219,13 @@ static BOOL lp_do_parameter_parametric(int snum, const char *pszParmName, const
        struct param_opt *paramo, *data;
        char *name;
 
+       while (isspace(*pszParmName)) {
+               pszParmName++;
+       }
+
        name = strdup(pszParmName);
        if (!name) return False;
 
-       string_sub(name, " ", "", 0);
        strlower(name);
 
        if (snum < 0) {
@@ -3041,7 +2252,7 @@ static BOOL lp_do_parameter_parametric(int snum, const char *pszParmName, const
                }
        }
 
-       paramo = smb_xmalloc(sizeof(*paramo));
+       paramo = smb_xmalloc_p(struct param_opt);
        paramo->key = strdup(name);
        paramo->value = strdup(pszParmValue);
        paramo->flags = flags;
@@ -3169,6 +2380,11 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
                                        break;
                                }
                        }
+                       if (!parm_table[parmnum].enum_list[i].name) {
+                               DEBUG(0,("Unknown enumerated value '%s' for '%s'\n", 
+                                        pszParmValue, pszParmName));
+                               return False;
+                       }
                        break;
                case P_SEP:
                        break;
@@ -3186,12 +2402,29 @@ static BOOL do_parameter(const char *pszParmName, const char *pszParmValue)
        if (!bInGlobalSection && bGlobalOnly)
                return (True);
 
-       DEBUGADD(4, ("doing parameter %s = %s\n", pszParmName, pszParmValue));
-
        return (lp_do_parameter(bInGlobalSection ? -2 : iServiceIndex,
                                pszParmName, pszParmValue));
 }
 
+/*
+  variable argument do parameter
+*/
+static BOOL do_parameter_var(const char *pszParmName, const char *fmt, ...) PRINTF_ATTRIBUTE(2, 3);
+
+static BOOL do_parameter_var(const char *pszParmName, const char *fmt, ...)
+{
+       char *s;
+       BOOL ret;
+       va_list ap;
+
+       va_start(ap, fmt);      
+       s = talloc_vasprintf(NULL, fmt, ap);
+       va_end(ap);
+       ret = do_parameter(pszParmName, s);
+       talloc_free(s);
+       return ret;
+}
+
 
 /*
   set a parameter from the commandline - this is called from command line parameter
@@ -3201,12 +2434,21 @@ static BOOL do_parameter(const char *pszParmName, const char *pszParmValue)
 BOOL lp_set_cmdline(const char *pszParmName, const char *pszParmValue)
 {
        int parmnum = map_parameter(pszParmName);
+       int i;
+
+       while (isspace(*pszParmValue)) pszParmValue++;
+
 
        if (parmnum < 0 && strchr(pszParmName, ':')) {
                /* set a parametric option */
                return lp_do_parameter_parametric(-1, pszParmName, pszParmValue, FLAG_CMDLINE);
        }
 
+       if (parmnum < 0) {
+               DEBUG(0,("Unknown option '%s'\n", pszParmName));
+               return False;
+       }
+
        /* reset the CMDLINE flag in case this has been called before */
        parm_table[parmnum].flags &= ~FLAG_CMDLINE;
 
@@ -3215,9 +2457,45 @@ BOOL lp_set_cmdline(const char *pszParmName, const char *pszParmValue)
        }
 
        parm_table[parmnum].flags |= FLAG_CMDLINE;
+
+       /* we have to also set FLAG_CMDLINE on aliases */
+       for (i=parmnum-1;i>=0 && parm_table[i].ptr == parm_table[parmnum].ptr;i--) {
+               parm_table[i].flags |= FLAG_CMDLINE;
+       }
+       for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].ptr == parm_table[parmnum].ptr;i++) {
+               parm_table[i].flags |= FLAG_CMDLINE;
+       }
+
        return True;
 }
 
+/*
+  set a option from the commandline in 'a=b' format. Use to support --option
+*/
+BOOL lp_set_option(const char *option)
+{
+       char *p, *s;
+       BOOL ret;
+
+       s = strdup(option);
+       if (!s) {
+               return False;
+       }
+
+       p = strchr(s, '=');
+       if (!p) {
+               free(s);
+               return False;
+       }
+
+       *p = 0;
+
+       ret = lp_set_cmdline(s, p+1);
+       free(s);
+       return ret;
+}
+
+
 /***************************************************************************
  Print a parameter of the specified type.
 ***************************************************************************/
@@ -3254,7 +2532,11 @@ static void print_parameter(struct parm_struct *p, void *ptr, FILE * f)
                        break;
 
                case P_OCTAL:
-                       fprintf(f, "%s", octal_string(*(int *)ptr));
+                       if (*(int *)ptr == -1) {
+                               fprintf(f, "-1");
+                       } else {
+                               fprintf(f, "0%o", *(int *)ptr);
+                       }
                        break;
 
                case P_LIST:
@@ -3429,19 +2711,6 @@ static void dump_globals(FILE *f)
 
 }
 
-/***************************************************************************
- 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);
-}
-
 /***************************************************************************
  Display the contents of a single services record.
 ***************************************************************************/
@@ -3547,28 +2816,6 @@ struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters)
 }
 
 
-#if 0
-/***************************************************************************
- Display the contents of a single copy structure.
-***************************************************************************/
-static void dump_copy_map(BOOL *pcopymap)
-{
-       int i;
-       if (!pcopymap)
-               return;
-
-       printf("\n\tNon-Copied parameters:\n");
-
-       for (i = 0; parm_table[i].label; i++)
-               if (parm_table[i].class == P_LOCAL &&
-                   parm_table[i].ptr && !pcopymap[i] &&
-                   (i == 0 || (parm_table[i].ptr != parm_table[i - 1].ptr)))
-               {
-                       printf("\t\t%s\n", parm_table[i].label);
-               }
-}
-#endif
-
 /***************************************************************************
  Return TRUE if the passed service number is within range.
 ***************************************************************************/
@@ -3582,31 +2829,9 @@ BOOL lp_snum_ok(int iService)
  Auto-load some home services.
 ***************************************************************************/
 
-static void lp_add_auto_services(char *str)
+static void lp_add_auto_services(const char *str)
 {
-       char *s;
-       char *p;
-       int homes;
-
-       if (!str)
-               return;
-
-       s = strdup(str);
-       if (!s)
-               return;
-
-       homes = lp_servicenumber(HOMES_NAME);
-
-       for (p = strtok(s, LIST_SEP); p; p = strtok(NULL, LIST_SEP)) {
-               char *home = get_user_home_dir(p);
-
-               if (lp_servicenumber(p) >= 0)
-                       continue;
-
-               if (home && homes >= 0)
-                       lp_add_home(p, homes, p, home);
-       }
-       SAFE_FREE(s);
+       return;
 }
 
 /***************************************************************************
@@ -3649,7 +2874,7 @@ BOOL lp_loaded(void)
  Unload unused services.
 ***************************************************************************/
 
-void lp_killunused(struct server_context *smb, BOOL (*snumused) (struct server_context *, int))
+void lp_killunused(struct smbsrv_connection *smb, BOOL (*snumused) (struct smbsrv_connection *, int))
 {
        int i;
        for (i = 0; i < iNumServices; i++) {
@@ -3795,7 +3020,7 @@ BOOL lp_load(const char *pszFname, BOOL global_only, BOOL save_defaults,
 
        bRetval = False;
 
-       DEBUG(0, ("lp_load: refreshing parameters from %s\n", pszFname));
+       DEBUG(2, ("lp_load: refreshing parameters from %s\n", pszFname));
        
        bInGlobalSection = True;
        bGlobalOnly = global_only;
@@ -3834,8 +3059,8 @@ BOOL lp_load(const char *pszFname, BOOL global_only, BOOL save_defaults,
        if (add_ipc) {
                /* When 'restrict anonymous = 2' guest connections to ipc$
                   are denied */
-               lp_add_ipc("IPC$", (lp_restrict_anonymous() < 2));
-               lp_add_ipc("ADMIN$", False);
+               lp_add_hidden("IPC$", "IPC", (lp_restrict_anonymous() < 2));
+               lp_add_hidden("ADMIN$", "DISK", False);
        }
 
        set_server_role();
@@ -3849,6 +3074,9 @@ BOOL lp_load(const char *pszFname, BOOL global_only, BOOL save_defaults,
                lp_do_parameter(-1, "wins server", "127.0.0.1");
        }
 
+       lp_do_parameter(-1, "gensec:krb5", "False");
+       lp_do_parameter(-1, "gensec:ms_krb5", "False");
+
        init_iconv();
 
        return (bRetval);
@@ -3939,9 +3167,9 @@ int lp_servicenumber(const char *pszServiceName)
 /*******************************************************************
  A useful volume label function. 
 ********************************************************************/
-char *volume_label(int snum)
+const char *volume_label(int snum)
 {
-       char *ret = lp_volume(snum);
+       const char *ret = lp_volume(snum);
        if (!*ret)
                return lp_servicename(snum);
        return (ret);
@@ -4045,7 +3273,7 @@ void lp_remove_service(int snum)
 
 void lp_copy_service(int snum, const char *new_name)
 {
-       char *oldname = lp_servicename(snum);
+       const char *oldname = lp_servicename(snum);
        do_section(new_name);
        if (snum >= 0) {
                snum = lp_servicenumber(new_name);
@@ -4058,60 +3286,11 @@ void lp_copy_service(int snum, const char *new_name)
 /*******************************************************************
  Get the default server type we will announce as via nmbd.
 ********************************************************************/
-
 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;
-}
-
 const char *lp_printername(int snum)
 {
        const char *ret = _lp_printername(snum);