lib/param move source4 param code to the top level

This is done so that the lpcfg_ functions are available across the whole
build, either with the struct loadparm_context loaded from an smb.conf directly
or as a wrapper around the source3 param code.

This is not the final, merged loadparm, but simply one step to make
it easier to solve other problems while we make our slow progress
on this difficult problem.

Andrew Bartlett

6 files changed, 5 insertions, 4621 deletions

diff --git a/source4/param/generic.c b/source4/param/generic.c
deleted file mode 100644
index 8becffbce5..0000000000
--- a/source4/param/generic.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  Copyright (C) Jelmer Vernooij			2005
- *  
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "includes.h"
-#include "../lib/util/dlinklist.h"
-#include "../lib/util/parmlist.h"
-#include "param/param.h"
-#include "param/loadparm.h"
-#include "system/filesys.h"
-
-struct param_section *param_get_section(struct param_context *ctx, const char *name)
-{
-	struct param_section *sect;
-
-	if (name == NULL) 
-		name = GLOBAL_NAME;
-
-	for (sect = ctx->sections; sect; sect = sect->next) {
-		if (!strcasecmp_m(sect->name, name)) 
-			return sect;
-	}
-
-	return NULL;
-}
-
-struct parmlist_entry *param_section_get(struct param_section *section, const char *name)
-{
-	return parmlist_get(section->parameters, name);
-}
-
-struct param_section *param_add_section(struct param_context *ctx, const char *section_name)
-{
-	struct param_section *section;
-	section = talloc_zero(ctx, struct param_section);
-	if (section == NULL)
-		return NULL;
-
-	section->name = talloc_strdup(section, section_name);
-	DLIST_ADD_END(ctx->sections, section, struct param_section *);
-	return section;
-}
-
-/* Look up parameter. If it is not found, add it */
-struct parmlist_entry *param_get_add(struct param_context *ctx, const char *name, const char *section_name)
-{
-	struct param_section *section;
-	struct parmlist_entry *p;
-
-	SMB_ASSERT(section_name != NULL);
-	SMB_ASSERT(name != NULL);
-
-	section = param_get_section(ctx, section_name);
-
-	if (section == NULL) {
-		section = param_add_section(ctx, section_name);
-	}
-
-	p = param_section_get(section, name);
-	if (p == NULL) {
-		p = talloc_zero(section, struct parmlist_entry);
-		if (p == NULL)
-			return NULL;
-
-		p->key = talloc_strdup(p, name);
-		DLIST_ADD_END(section->parameters->entries, p, struct parmlist_entry *);
-	}
-	
-	return p;
-}
-
-const char *param_get_string(struct param_context *ctx, const char *param, const char *section_name)
-{
-	struct param_section *section = param_get_section(ctx, section_name);
-
-	if (section == NULL)
-		return NULL;
-
-	return parmlist_get_string(section->parameters, param, NULL);
-}
-
-int param_set_string(struct param_context *ctx, const char *param, const char *value, const char *section_name)
-{
-	struct param_section *section = param_get_section(ctx, section_name);
-
-	if (section == NULL)
-		return -1;
-
-	return parmlist_set_string(section->parameters, param, value);
-}
-
-const char **param_get_string_list(struct param_context *ctx, const char *param, const char *separator, const char *section_name)
-{
-	struct param_section *section = param_get_section(ctx, section_name);
-
-	if (section == NULL)
-		return NULL;
-
-	return parmlist_get_string_list(section->parameters, param, separator);
-}
-
-int param_set_string_list(struct param_context *ctx, const char *param, const char **list, const char *section)
-{
-	struct parmlist_entry *p = param_get_add(ctx, param, section);	
-
-	p->value = str_list_join(p, list, ' ');
-
-	return 0;
-}
-
-int param_get_int(struct param_context *ctx, const char *param, int default_v, const char *section_name)
-{
-	struct param_section *section = param_get_section(ctx, section_name);
-
-	if (section == NULL)
-		return default_v;
-
-	return parmlist_get_int(section->parameters, param, default_v);
-}
-
-void param_set_int(struct param_context *ctx, const char *param, int value, const char *section)
-{
-	struct parmlist_entry *p = param_get_add(ctx, section, param);
-
-	if (!p) 
-		return;
-
-	p->value = talloc_asprintf(p, "%d", value);
-}
-
-unsigned long param_get_ulong(struct param_context *ctx, const char *param, unsigned long default_v, const char *section)
-{
-	const char *value = param_get_string(ctx, param, section);
-	
-	if (value)
-		return strtoul(value, NULL, 0);
-
-	return default_v;
-}
-
-void param_set_ulong(struct param_context *ctx, const char *name, unsigned long value, const char *section)
-{
-	struct parmlist_entry *p = param_get_add(ctx, name, section);
-
-	if (!p)
-		return;
-
-	p->value = talloc_asprintf(p, "%lu", value);
-}
-
-static bool param_sfunc (const char *name, void *_ctx)
-{
-	struct param_context *ctx = (struct param_context *)_ctx;
-	struct param_section *section = param_get_section(ctx, name);
-
-	if (section == NULL) {
-		section = talloc_zero(ctx, struct param_section);
-		if (section == NULL)
-			return false;
-
-		section->name = talloc_strdup(section, name);
-
-		DLIST_ADD_END(ctx->sections, section, struct param_section *);
-	}
-
-	/* Make sure this section is on top of the list for param_pfunc */
-	DLIST_PROMOTE(ctx->sections, section);
-
-	return true;
-}
-
-static bool param_pfunc (const char *name, const char *value, void *_ctx)
-{
-	struct param_context *ctx = (struct param_context *)_ctx;
-	struct parmlist_entry *p = param_section_get(ctx->sections, name);
-
-	if (!p) {
-		p = talloc_zero(ctx->sections, struct parmlist_entry);
-		if (p == NULL)
-			return false;
-
-		p->key = talloc_strdup(p, name);
-		p->value = talloc_strdup(p, value);
-		DLIST_ADD(ctx->sections->parameters->entries, p);
-	} else { /* Replace current value */
-		talloc_free(p->value);
-		p->value = talloc_strdup(p, value);
-	}
-
-	return true;
-}
-
-struct param_context *param_init(TALLOC_CTX *mem_ctx)
-{
-	return talloc_zero(mem_ctx, struct param_context);
-}
-
-
-int param_read(struct param_context *ctx, const char *fn)
-{
-	ctx->sections = talloc_zero(ctx, struct param_section);
-	if (ctx->sections == NULL)
-		return -1;
-
-	ctx->sections->name = talloc_strdup(ctx->sections, "global");
-	if (!pm_process( fn, param_sfunc, param_pfunc, ctx)) {
-		return -1;
-	}
-
-	return 0;
-}
-
-int param_use(struct loadparm_context *lp_ctx, struct param_context *ctx)
-{
-	struct param_section *section;
-
-	for (section = ctx->sections; section; section = section->next) {
-		struct parmlist_entry *param;
-		bool isglobal = strcmp(section->name, "global") == 0;
-		for (param = section->parameters->entries; param; param = param->next) {
-			if (isglobal)
-				lpcfg_do_global_parameter(lp_ctx, param->key,
-						       param->value);
-			else {
-				struct loadparm_service *service = 
-							lpcfg_service(lp_ctx, section->name);
-				if (service == NULL)
-					service = lpcfg_add_service(lp_ctx, lpcfg_default_service(lp_ctx), section->name);
-				lpcfg_do_service_parameter(lp_ctx, service, param->key, param->value);
-			}
-		}
-	}
-	return 0;
-}
-
-int param_write(struct param_context *ctx, const char *fn)
-{
-	int file;
-	struct param_section *section;
-
-	if (fn == NULL || ctx == NULL)
-		return -1;
-
-	file = open(fn, O_WRONLY|O_CREAT, 0755);
-
-	if (file == -1)
-		return -1;
-	
-	for (section = ctx->sections; section; section = section->next) {
-		struct parmlist_entry *param;
-		
-		fdprintf(file, "[%s]\n", section->name);
-		for (param = section->parameters->entries; param; param = param->next) {
-			fdprintf(file, "\t%s = %s\n", param->key, param->value);
-		}
-		fdprintf(file, "\n");
-	}
-
-	close(file);
-
-	return 0;
-}
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index f31ac0654e..b1c3db6e7e 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -26,3719 +26,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*
- *  Load parameters.
- *
- *  This module provides suitable callback functions for the params
- *  module. It builds the internal table of service details which is
- *  then used by the rest of the server.
- *
- * To add a parameter:
- *
- * 1) add it to the global or service structure definition
- * 2) add it to the parm_table
- * 3) add it to the list of available functions (eg: using FN_GLOBAL_STRING())
- * 4) If it's a global then initialise it in init_globals. If a local
- *    (ie. service) parameter then initialise it in the sDefault structure
- *
- *
- * Notes:
- *   The configuration file is processed sequentially for speed. It is NOT
- *   accessed randomly as happens in 'real' Windows. For this reason, there
- *   is a fair bit of sequence-dependent code here - ie., code which assumes
- *   that certain things happen before others. In particular, the code which
- *   happens at the boundary between sections is delicately poised, so be
- *   careful!
- *
- */
-
 #include "includes.h"
-#include "version.h"
-#include "dynconfig/dynconfig.h"
-#include "system/time.h"
-#include "system/locale.h"
-#include "system/network.h" /* needed for TCP_NODELAY */
-#include "smb_server/smb_server.h"
-#include "libcli/raw/signing.h"
-#include "../lib/util/dlinklist.h"
-#include "param/param.h"
-#include "param/loadparm.h"
+#include "lib/param/param.h"
 #include "libcli/raw/libcliraw.h"
 #include "rpc_server/common/common.h"
-#include "lib/socket/socket.h"
-#include "auth/gensec/gensec.h"
-#include "s3_param.h"
-#include "../lib/util/bitmap.h"
-
-#define standard_sub_basic talloc_strdup
-
-static bool do_parameter(const char *, const char *, void *);
-static bool defaults_saved = false;
-
-#define LOADPARM_EXTRA_GLOBALS \
-	struct parmlist_entry *param_opt;				\
-	char *szRealm;							\
-	char *tls_keyfile;						\
-	char *tls_certfile;						\
-	char *tls_cafile;						\
-	char *tls_crlfile;						\
-	char *tls_dhpfile;						\
-	char *loglevel;							\
-	char *panic_action;						\
-	int bPreferredMaster;
-
-#include "param_global.h"
-
-#define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct))
-
-
-/* prototypes for the special type handlers */
-static bool handle_include(struct loadparm_context *lp_ctx, int unused,
-			   const char *pszParmValue, char **ptr);
-static bool handle_realm(struct loadparm_context *lp_ctx, int unused,
-			 const char *pszParmValue, char **ptr);
-static bool handle_copy(struct loadparm_context *lp_ctx, int unused,
-			const char *pszParmValue, char **ptr);
-static bool handle_debuglevel(struct loadparm_context *lp_ctx, int unused,
-			      const char *pszParmValue, char **ptr);
-static bool handle_logfile(struct loadparm_context *lp_ctx, int unused,
-			   const char *pszParmValue, char **ptr);
-
-static const struct enum_list enum_protocol[] = {
-	{PROTOCOL_SMB2_02, "SMB2"},
-	{PROTOCOL_SMB2_02, "SMB2_02"},
-	{PROTOCOL_NT1, "NT1"},
-	{PROTOCOL_LANMAN2, "LANMAN2"},
-	{PROTOCOL_LANMAN1, "LANMAN1"},
-	{PROTOCOL_CORE, "CORE"},
-	{PROTOCOL_COREPLUS, "COREPLUS"},
-	{PROTOCOL_COREPLUS, "CORE+"},
-	{-1, NULL}
-};
-
-static const struct enum_list enum_security[] = {
-	{SEC_SHARE, "SHARE"},
-	{SEC_USER, "USER"},
-	{SEC_ADS, "ADS"},
-	{-1, NULL}
-};
-
-static const struct enum_list enum_bool_auto[] = {
-	{false, "No"},
-	{false, "False"},
-	{false, "0"},
-	{true, "Yes"},
-	{true, "True"},
-	{true, "1"},
-	{Auto, "Auto"},
-	{-1, NULL}
-};
-
-/* Client-side offline caching policy types */
-enum csc_policy {
-	CSC_POLICY_MANUAL=0,
-	CSC_POLICY_DOCUMENTS=1,
-	CSC_POLICY_PROGRAMS=2,
-	CSC_POLICY_DISABLE=3
-};
-
-static const struct enum_list enum_csc_policy[] = {
-	{CSC_POLICY_MANUAL, "manual"},
-	{CSC_POLICY_DOCUMENTS, "documents"},
-	{CSC_POLICY_PROGRAMS, "programs"},
-	{CSC_POLICY_DISABLE, "disable"},
-	{-1, NULL}
-};
-
-/* 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}
-};
-
-static const struct enum_list enum_server_role[] = {
-	{ROLE_STANDALONE, "standalone"},
-	{ROLE_DOMAIN_MEMBER, "member server"},
-	{ROLE_DOMAIN_MEMBER, "member"},
-	{ROLE_DOMAIN_CONTROLLER, "domain controller"},
-	{ROLE_DOMAIN_CONTROLLER, "dc"},
-	{-1, NULL}
-};
-
-#define GLOBAL_VAR(name) offsetof(struct loadparm_global, name)
-#define LOCAL_VAR(name) offsetof(struct loadparm_service, name)
-
-static struct parm_struct parm_table[] = {
-	{
-		.label		= "server role",
-		.type		= P_ENUM,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(server_role),
-		.special	= NULL,
-		.enum_list	= enum_server_role
-	},
-	{
-		.label		= "dos charset",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(dos_charset),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "unix charset",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(unix_charset),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "ncalrpc dir",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(ncalrpc_dir),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "comment",
-		.type		= P_STRING,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(comment),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "path",
-		.type		= P_STRING,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(szPath),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "directory",
-		.type		= P_STRING,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(szPath),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "workgroup",
-		.type		= P_USTRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szWorkgroup),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "realm",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szRealm),
-		.special	= handle_realm,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "netbios name",
-		.type		= P_USTRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szNetbiosName),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "netbios aliases",
-		.type		= P_LIST,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szNetbiosAliases),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "netbios scope",
-		.type		= P_USTRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szNetbiosScope),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "server string",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szServerString),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "interfaces",
-		.type		= P_LIST,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szInterfaces),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "bind interfaces only",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bBindInterfacesOnly),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "ntvfs handler",
-		.type		= P_LIST,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(ntvfs_handler),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "ntptr providor",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(ntptr_providor),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "passdb backend",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(passdb_backend),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "dcerpc endpoint servers",
-		.type		= P_LIST,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(dcerpc_ep_servers),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "server services",
-		.type		= P_LIST,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(server_services),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "security",
-		.type		= P_ENUM,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(security),
-		.special	= NULL,
-		.enum_list	= enum_security
-	},
-	{
-		.label		= "encrypt passwords",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bEncryptPasswords),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "null passwords",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bNullPasswords),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "obey pam restrictions",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bObeyPamRestrictions),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "password server",
-		.type		= P_LIST,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szPasswordServers),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "spoolss database",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szSPOOLSS_URL),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "wins config database",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szWINS_CONFIG_URL),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "wins database",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szWINS_URL),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "private dir",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szPrivateDir),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "passwd chat",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szPasswdChat),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "password level",
-		.type		= P_INTEGER,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(pwordlevel),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "lanman auth",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bLanmanAuth),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "ntlm auth",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bNTLMAuth),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "client NTLMv2 auth",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bClientNTLMv2Auth),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "client lanman auth",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bClientLanManAuth),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "client plaintext auth",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bClientPlaintextAuth),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "client use spnego principal",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(client_use_spnego_principal),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "read only",
-		.type		= P_BOOL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(bRead_only),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "create mask",
-		.type		= P_OCTAL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(iCreate_mask),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "force create mode",
-		.type		= P_OCTAL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(iCreate_force_mode),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "directory mask",
-		.type		= P_OCTAL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(iDir_mask),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "force directory mode",
-		.type		= P_OCTAL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(iDir_force_mode),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "hosts allow",
-		.type		= P_LIST,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(szHostsallow),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "hosts deny",
-		.type		= P_LIST,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(szHostsdeny),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "log level",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(loglevel),
-		.special	= handle_debuglevel,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "debuglevel",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(loglevel),
-		.special	= handle_debuglevel,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "log file",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(logfile),
-		.special	= handle_logfile,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "smb ports",
-		.type		= P_LIST,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(smb_ports),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "nbt port",
-		.type		= P_INTEGER,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(nbt_port),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "dgram port",
-		.type		= P_INTEGER,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(dgram_port),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "cldap port",
-		.type		= P_INTEGER,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(cldap_port),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "krb5 port",
-		.type		= P_INTEGER,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(krb5_port),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "kpasswd port",
-		.type		= P_INTEGER,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(kpasswd_port),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "web port",
-		.type		= P_INTEGER,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(web_port),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "tls enabled",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(tls_enabled),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "tls keyfile",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(tls_keyfile),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "tls certfile",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(tls_certfile),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "tls cafile",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(tls_cafile),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "tls crlfile",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(tls_crlfile),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "tls dh params file",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(tls_dhpfile),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "large readwrite",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bLargeReadwrite),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "server max protocol",
-		.type		= P_ENUM,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(srv_maxprotocol),
-		.special	= NULL,
-		.enum_list	= enum_protocol
-	},
-	{
-		.label		= "server min protocol",
-		.type		= P_ENUM,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(srv_minprotocol),
-		.special	= NULL,
-		.enum_list	= enum_protocol
-	},
-	{
-		.label		= "client max protocol",
-		.type		= P_ENUM,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(cli_maxprotocol),
-		.special	= NULL,
-		.enum_list	= enum_protocol
-	},
-	{
-		.label		= "client min protocol",
-		.type		= P_ENUM,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(cli_minprotocol),
-		.special	= NULL,
-		.enum_list	= enum_protocol
-	},
-	{
-		.label		= "unicode",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bUnicode),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "read raw",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bReadRaw),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "write raw",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bWriteRaw),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "disable netbios",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bDisableNetbios),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "nt status support",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bNTStatusSupport),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "max mux",
-		.type		= P_INTEGER,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(max_mux),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "max xmit",
-		.type		= P_BYTES,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(max_xmit),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "name resolve order",
-		.type		= P_LIST,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szNameResolveOrder),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "max wins ttl",
-		.type		= P_INTEGER,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(max_wins_ttl),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "min wins ttl",
-		.type		= P_INTEGER,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(min_wins_ttl),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "time server",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bTimeServer),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "unix extensions",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bUnixExtensions),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "use spnego",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bUseSpnego),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "server signing",
-		.type		= P_ENUM,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(server_signing),
-		.special	= NULL,
-		.enum_list	= enum_smb_signing_vals
-	},
-	{
-		.label		= "client signing",
-		.type		= P_ENUM,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(client_signing),
-		.special	= NULL,
-		.enum_list	= enum_smb_signing_vals
-	},
-	{
-		.label		= "rpc big endian",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bRpcBigEndian),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "max connections",
-		.type		= P_INTEGER,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(iMaxConnections),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "paranoid server security",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(paranoid_server_security),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "socket options",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(socket_options),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "strict sync",
-		.type		= P_BOOL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(bStrictSync),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "case insensitive filesystem",
-		.type		= P_BOOL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(bCIFileSystem),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "max print jobs",
-		.type		= P_INTEGER,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(iMaxPrintJobs),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "printable",
-		.type		= P_BOOL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(bPrint_ok),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "print ok",
-		.type		= P_BOOL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(bPrint_ok),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "printer name",
-		.type		= P_STRING,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(szPrintername),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "printer",
-		.type		= P_STRING,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(szPrintername),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "map system",
-		.type		= P_BOOL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(bMap_system),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "map hidden",
-		.type		= P_BOOL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(bMap_hidden),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "map archive",
-		.type		= P_BOOL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(bMap_archive),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "preferred master",
-		.type		= P_ENUM,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bPreferredMaster),
-		.special	= NULL,
-		.enum_list	= enum_bool_auto
-	},
-	{
-		.label		= "prefered master",
-		.type		= P_ENUM,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bPreferredMaster),
-		.special	= NULL,
-		.enum_list	= enum_bool_auto
-	},
-	{
-		.label		= "local master",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bLocalMaster),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "browseable",
-		.type		= P_BOOL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(bBrowseable),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "browsable",
-		.type		= P_BOOL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(bBrowseable),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "wins server",
-		.type		= P_LIST,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szWINSservers),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "wins support",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bWINSsupport),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "dns proxy",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bWINSdnsProxy),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "wins hook",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szWINSHook),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "csc policy",
-		.type		= P_ENUM,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(iCSCPolicy),
-		.special	= NULL,
-		.enum_list	= enum_csc_policy
-	},
-
-	{
-		.label		= "strict locking",
-		.type		= P_BOOL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(iStrictLocking),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "oplocks",
-		.type		= P_BOOL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(bOpLocks),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "share backend",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szShareBackend),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "preload",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szAutoServices),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "auto services",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szAutoServices),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "lock dir",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szLockDir),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "lock directory",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szLockDir),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "state directory",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szStateDir),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "cache directory",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szCacheDir),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "pid directory",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szPidDir),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "socket address",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szSocketAddress),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "copy",
-		.type		= P_STRING,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(szCopy),
-		.special	= handle_copy,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "include",
-		.type		= P_STRING,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(szInclude),
-		.special	= handle_include,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "available",
-		.type		= P_BOOL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(bAvailable),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "volume",
-		.type		= P_STRING,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(volume),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "fstype",
-		.type		= P_STRING,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(fstype),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "panic action",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(panic_action),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "msdfs root",
-		.type		= P_BOOL,
-		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(bMSDfsRoot),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "host msdfs",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bHostMSDfs),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "winbind separator",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szWinbindSeparator),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "winbindd socket directory",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szWinbinddSocketDirectory),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "winbindd privileged socket directory",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szWinbinddPrivilegedSocketDirectory),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "winbind sealed pipes",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bWinbindSealedPipes),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "template shell",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szTemplateShell),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "template homedir",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szTemplateHomedir),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "idmap trusted only",
-		.type		= P_BOOL,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(bIdmapTrustedOnly),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{
-		.label		= "ntp signd socket directory",
-		.type		= P_STRING,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szNTPSignDSocketDirectory),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "rndc command",
-		.type		= P_CMDLIST,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szRNDCCommand),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "dns update command",
-		.type		= P_CMDLIST,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szDNSUpdateCommand),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "spn update command",
-		.type		= P_CMDLIST,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szSPNUpdateCommand),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-	{
-		.label		= "nsupdate command",
-		.type		= P_CMDLIST,
-		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(szNSUpdateCommand),
-		.special	= NULL,
-		.enum_list	= NULL
-	},
-
-	{NULL,  P_BOOL,  P_NONE,  0,  NULL,  NULL,  0}
-};
-
-
-/* local variables */
-struct loadparm_context {
-	const char *szConfigFile;
-	struct loadparm_global *globals;
-	struct loadparm_service **services;
-	struct loadparm_service *sDefault;
-	struct smb_iconv_handle *iconv_handle;
-	int iNumServices;
-	struct loadparm_service *currentService;
-	bool bInGlobalSection;
-	struct file_lists {
-		struct file_lists *next;
-		char *name;
-		char *subfname;
-		time_t modtime;
-	} *file_lists;
-	unsigned int flags[NUMPARAMETERS];
-	bool loaded;
-	bool refuse_free;
-	bool global; /* Is this the global context, which may set
-		      * global variables such as debug level etc? */
-	const struct loadparm_s3_context *s3_fns;
-};
-
-
-struct loadparm_service *lpcfg_default_service(struct loadparm_context *lp_ctx)
-{
-	if (lp_ctx->s3_fns) {
-		return lp_ctx->s3_fns->get_default_loadparm_service();
-	}
-	return lp_ctx->sDefault;
-}
-
-/**
- * Convenience routine to grab string parameters into temporary memory
- * and run standard_sub_basic on them.
- *
- * The buffers can be written to by
- * callers without affecting the source string.
- */
-
-static const char *lp_string(const char *s)
-{
-#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_*()
-	   function that returns a string.  Perhaps this debug should be
-	   present all the time? */
-
-#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");
-
-	ret = talloc_array(lp_talloc, char, len + 100);	/* leave room for substitution */
-
-	if (!ret)
-		return NULL;
-
-	if (!s)
-		*ret = 0;
-	else
-		strlcpy(ret, s, len);
-
-	if (trim_string(ret, "\"", "\"")) {
-		if (strchr(ret,'"') != NULL)
-			strlcpy(ret, s, len);
-	}
-
-	standard_sub_basic(ret,len+100);
-	return (ret);
-#endif
-	return s;
-}
-
-/*
-   In this section all the functions that are used to access the
-   parameters from the rest of the program are defined
-*/
-
-/*
- * the creation of separate lpcfg_*() and lp_*() functions is to allow
- * for code compatibility between existing Samba4 and Samba3 code.
- */
-
-/* this global context supports the lp_*() function varients */
-static struct loadparm_context *global_loadparm_context;
-
-#define lpcfg_default_service global_loadparm_context->sDefault
-#define lpcfg_global_service(i) global_loadparm_context->services[i]
-
-#define FN_GLOBAL_STRING(fn_name,var_name)				\
- _PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) { \
-	if (lp_ctx == NULL) return NULL;				\
-	if (lp_ctx->s3_fns) {						\
-		SMB_ASSERT(lp_ctx->s3_fns->fn_name);			\
-		return lp_ctx->s3_fns->fn_name();			\
-	}								\
-	return lp_ctx->globals->var_name ? lp_string(lp_ctx->globals->var_name) : ""; \
-}
-
-#define FN_GLOBAL_CONST_STRING(fn_name,var_name) \
- _PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {\
-	 if (lp_ctx == NULL) return NULL;				\
-	 if (lp_ctx->s3_fns) {						\
-		 SMB_ASSERT(lp_ctx->s3_fns->fn_name);			\
-		 return lp_ctx->s3_fns->fn_name();			\
-	 }								\
-	 return lp_ctx->globals->var_name ? lp_string(lp_ctx->globals->var_name) : ""; \
- }
-
-#define FN_GLOBAL_LIST(fn_name,var_name)				\
- _PUBLIC_ const char **lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) { \
-	 if (lp_ctx == NULL) return NULL;				\
-	 if (lp_ctx->s3_fns) {						\
-		 SMB_ASSERT(lp_ctx->s3_fns->fn_name);			\
-		 return lp_ctx->s3_fns->fn_name();			\
-	 }								\
-	 return lp_ctx->globals->var_name;				\
- }
-
-#define FN_GLOBAL_BOOL(fn_name,var_name) \
- _PUBLIC_ bool lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {\
-	 if (lp_ctx == NULL) return false;				\
-	 if (lp_ctx->s3_fns) {						\
-		 SMB_ASSERT(lp_ctx->s3_fns->fn_name);			\
-		 return lp_ctx->s3_fns->fn_name();			\
-	 }								\
-	 return lp_ctx->globals->var_name;				\
-}
-
-#define FN_GLOBAL_INTEGER(fn_name,var_name) \
- _PUBLIC_ int lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) { \
-	 if (lp_ctx->s3_fns) {						\
-		 SMB_ASSERT(lp_ctx->s3_fns->fn_name);			\
-		 return lp_ctx->s3_fns->fn_name();			\
-	 }								\
-	 return lp_ctx->globals->var_name;				\
- }
-
-/* Local parameters don't need the ->s3_fns because the struct
- * loadparm_service is shared and lpcfg_service() checks the ->s3_fns
- * hook */
-#define FN_LOCAL_STRING(fn_name,val) \
- _PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_service *service, \
-					struct loadparm_service *sDefault) { \
-	 return(lp_string((const char *)((service != NULL && service->val != NULL) ? service->val : sDefault->val))); \
- }
-
-#define FN_LOCAL_CONST_STRING(fn_name,val) FN_LOCAL_STRING(fn_name, val)
-
-#define FN_LOCAL_LIST(fn_name,val) \
- _PUBLIC_ const char **lpcfg_ ## fn_name(struct loadparm_service *service, \
-					 struct loadparm_service *sDefault) {\
-	 return(const char **)(service != NULL && service->val != NULL? service->val : sDefault->val); \
- }
-
-#define FN_LOCAL_PARM_BOOL(fn_name, val) FN_LOCAL_BOOL(fn_name, val)
-
-#define FN_LOCAL_BOOL(fn_name,val) \
- _PUBLIC_ bool lpcfg_ ## fn_name(struct loadparm_service *service, \
-				 struct loadparm_service *sDefault) {	\
-	 return((service != NULL)? service->val : sDefault->val); \
- }
-
-#define FN_LOCAL_INTEGER(fn_name,val) \
- _PUBLIC_ int lpcfg_ ## fn_name(struct loadparm_service *service, \
-				struct loadparm_service *sDefault) {	\
-	 return((service != NULL)? service->val : sDefault->val); \
- }
-
-#define FN_LOCAL_PARM_INTEGER(fn_name, val) FN_LOCAL_INTEGER(fn_name, val)
-
-#define FN_LOCAL_PARM_CHAR(fn_name, val) FN_LOCAL_CHAR(fn_name, val)
-
-#define FN_LOCAL_CHAR(fn_name,val) \
- _PUBLIC_ char lpcfg_ ## fn_name(struct loadparm_service *service, \
-				struct loadparm_service *sDefault) {	\
-	 return((service != NULL)? service->val : sDefault->val); \
- }
-
-#include "lib/param/param_functions.c"
-
-FN_GLOBAL_INTEGER(server_role, server_role)
-FN_GLOBAL_LIST(smb_ports, smb_ports)
-FN_GLOBAL_INTEGER(nbt_port, nbt_port)
-FN_GLOBAL_INTEGER(dgram_port, dgram_port)
-FN_GLOBAL_INTEGER(cldap_port, cldap_port)
-FN_GLOBAL_INTEGER(krb5_port, krb5_port)
-FN_GLOBAL_INTEGER(kpasswd_port, kpasswd_port)
-FN_GLOBAL_INTEGER(web_port, web_port)
-FN_GLOBAL_BOOL(tls_enabled, tls_enabled)
-FN_GLOBAL_STRING(logfile, logfile)
-FN_GLOBAL_STRING(share_backend, szShareBackend)
-FN_GLOBAL_STRING(spoolss_url, szSPOOLSS_URL)
-FN_GLOBAL_STRING(wins_config_url, szWINS_CONFIG_URL)
-FN_GLOBAL_STRING(wins_url, szWINS_URL)
-FN_GLOBAL_CONST_STRING(winbind_separator, szWinbindSeparator)
-FN_GLOBAL_CONST_STRING(winbindd_socket_directory, szWinbinddSocketDirectory)
-FN_GLOBAL_CONST_STRING(winbindd_privileged_socket_directory, szWinbinddPrivilegedSocketDirectory)
-FN_GLOBAL_CONST_STRING(template_shell, szTemplateShell)
-FN_GLOBAL_CONST_STRING(template_homedir, szTemplateHomedir)
-FN_GLOBAL_BOOL(winbind_sealed_pipes, bWinbindSealedPipes)
-FN_GLOBAL_BOOL(idmap_trusted_only, bIdmapTrustedOnly)
-FN_GLOBAL_STRING(private_dir, szPrivateDir)
-FN_GLOBAL_STRING(serverstring, szServerString)
-FN_GLOBAL_STRING(lockdir, szLockDir)
-FN_GLOBAL_STRING(statedir, szStateDir)
-FN_GLOBAL_STRING(cachedir, szCacheDir)
-FN_GLOBAL_STRING(ncalrpc_dir, ncalrpc_dir)
-FN_GLOBAL_STRING(dos_charset, dos_charset)
-FN_GLOBAL_STRING(unix_charset, unix_charset)
-FN_GLOBAL_STRING(piddir, szPidDir)
-FN_GLOBAL_LIST(rndc_command, szRNDCCommand)
-FN_GLOBAL_LIST(dns_update_command, szDNSUpdateCommand)
-FN_GLOBAL_LIST(spn_update_command, szSPNUpdateCommand)
-FN_GLOBAL_LIST(nsupdate_command, szNSUpdateCommand)
-FN_GLOBAL_LIST(dcerpc_endpoint_servers, dcerpc_ep_servers)
-FN_GLOBAL_LIST(server_services, server_services)
-FN_GLOBAL_STRING(ntptr_providor, ntptr_providor)
-FN_GLOBAL_STRING(passdb_backend, passdb_backend)
-FN_GLOBAL_STRING(auto_services, szAutoServices)
-FN_GLOBAL_STRING(passwd_chat, szPasswdChat)
-FN_GLOBAL_LIST(passwordserver, szPasswordServers)
-FN_GLOBAL_LIST(name_resolve_order, szNameResolveOrder)
-FN_GLOBAL_STRING(realm, szRealm_upper)
-FN_GLOBAL_STRING(dnsdomain, szRealm_lower)
-FN_GLOBAL_STRING(socket_options, socket_options)
-FN_GLOBAL_STRING(workgroup, szWorkgroup)
-FN_GLOBAL_STRING(netbios_name, szNetbiosName)
-FN_GLOBAL_STRING(netbios_scope, szNetbiosScope)
-FN_GLOBAL_LIST(wins_server_list, szWINSservers)
-FN_GLOBAL_LIST(interfaces, szInterfaces)
-FN_GLOBAL_STRING(socket_address, szSocketAddress)
-FN_GLOBAL_LIST(netbios_aliases, szNetbiosAliases)
-FN_GLOBAL_BOOL(disable_netbios, bDisableNetbios)
-FN_GLOBAL_BOOL(we_are_a_wins_server, bWINSsupport)
-FN_GLOBAL_BOOL(wins_dns_proxy, bWINSdnsProxy)
-FN_GLOBAL_STRING(wins_hook, szWINSHook)
-FN_GLOBAL_BOOL(local_master, bLocalMaster)
-FN_GLOBAL_BOOL(readraw, bReadRaw)
-FN_GLOBAL_BOOL(large_readwrite, bLargeReadwrite)
-FN_GLOBAL_BOOL(writeraw, bWriteRaw)
-FN_GLOBAL_BOOL(null_passwords, bNullPasswords)
-FN_GLOBAL_BOOL(obey_pam_restrictions, bObeyPamRestrictions)
-FN_GLOBAL_BOOL(encrypted_passwords, bEncryptPasswords)
-FN_GLOBAL_BOOL(time_server, bTimeServer)
-FN_GLOBAL_BOOL(bind_interfaces_only, bBindInterfacesOnly)
-FN_GLOBAL_BOOL(unicode, bUnicode)
-FN_GLOBAL_BOOL(nt_status_support, bNTStatusSupport)
-FN_GLOBAL_BOOL(lanman_auth, bLanmanAuth)
-FN_GLOBAL_BOOL(ntlm_auth, bNTLMAuth)
-FN_GLOBAL_BOOL(client_plaintext_auth, bClientPlaintextAuth)
-FN_GLOBAL_BOOL(client_lanman_auth, bClientLanManAuth)
-FN_GLOBAL_BOOL(client_ntlmv2_auth, bClientNTLMv2Auth)
-FN_GLOBAL_BOOL(client_use_spnego_principal, client_use_spnego_principal)
-FN_GLOBAL_BOOL(host_msdfs, bHostMSDfs)
-FN_GLOBAL_BOOL(unix_extensions, bUnixExtensions)
-FN_GLOBAL_BOOL(use_spnego, bUseSpnego)
-FN_GLOBAL_BOOL(rpc_big_endian, bRpcBigEndian)
-FN_GLOBAL_INTEGER(max_wins_ttl, max_wins_ttl)
-FN_GLOBAL_INTEGER(min_wins_ttl, min_wins_ttl)
-FN_GLOBAL_INTEGER(maxmux, max_mux)
-FN_GLOBAL_INTEGER(max_xmit, max_xmit)
-FN_GLOBAL_INTEGER(passwordlevel, pwordlevel)
-FN_GLOBAL_INTEGER(srv_maxprotocol, srv_maxprotocol)
-FN_GLOBAL_INTEGER(srv_minprotocol, srv_minprotocol)
-FN_GLOBAL_INTEGER(cli_maxprotocol, cli_maxprotocol)
-FN_GLOBAL_INTEGER(cli_minprotocol, cli_minprotocol)
-FN_GLOBAL_INTEGER(security, security)
-FN_GLOBAL_BOOL(paranoid_server_security, paranoid_server_security)
-
-FN_GLOBAL_INTEGER(server_signing, server_signing)
-FN_GLOBAL_INTEGER(client_signing, client_signing)
-
-FN_GLOBAL_CONST_STRING(ntp_signd_socket_directory, szNTPSignDSocketDirectory)
-
-/* local prototypes */
-static int map_parameter(const char *pszParmName);
-static struct loadparm_service *getservicebyname(struct loadparm_context *lp_ctx,
-					const char *pszServiceName);
-static void copy_service(struct loadparm_service *pserviceDest,
-			 struct loadparm_service *pserviceSource,
-			 struct bitmap *pcopymapDest);
-static bool service_ok(struct loadparm_service *service);
-static bool do_section(const char *pszSectionName, void *);
-static void init_copymap(struct loadparm_service *pservice);
-
-/* This is a helper function for parametrical options support. */
-/* It returns a pointer to parametrical option value if it exists or NULL otherwise */
-/* Actual parametrical functions are quite simple */
-const char *lpcfg_get_parametric(struct loadparm_context *lp_ctx,
-			      struct loadparm_service *service,
-			      const char *type, const char *option)
-{
-	char *vfskey_tmp = NULL;
-	char *vfskey = NULL;
-	struct parmlist_entry *data;
-
-	if (lp_ctx == NULL)
-		return NULL;
-
-	if (lp_ctx->s3_fns) {
-		return lp_ctx->s3_fns->get_parametric(service, type, option);
-	}
-
-	data = (service == NULL ? lp_ctx->globals->param_opt : service->param_opt);
-
-	vfskey_tmp = talloc_asprintf(NULL, "%s:%s", type, option);
-	if (vfskey_tmp == NULL) return NULL;
-	vfskey = strlower_talloc(NULL, vfskey_tmp);
-	talloc_free(vfskey_tmp);
-
-	while (data) {
-		if (strcmp(data->key, vfskey) == 0) {
-			talloc_free(vfskey);
-			return data->value;
-		}
-		data = data->next;
-	}
-
-	if (service != NULL) {
-		/* Try to fetch the same option but from globals */
-		/* but only if we are not already working with globals */
-		for (data = lp_ctx->globals->param_opt; data;
-		     data = data->next) {
-			if (strcmp(data->key, vfskey) == 0) {
-				talloc_free(vfskey);
-				return data->value;
-			}
-		}
-	}
-
-	talloc_free(vfskey);
-
-	return NULL;
-}
-
-
-/**
- * convenience routine to return int parameters.
- */
-static int lp_int(const char *s)
-{
-
-	if (!s) {
-		DEBUG(0,("lp_int(%s): is called with NULL!\n",s));
-		return -1;
-	}
-
-	return strtol(s, NULL, 0);
-}
-
-/**
- * convenience routine to return unsigned long parameters.
- */
-static int lp_ulong(const char *s)
-{
-
-	if (!s) {
-		DEBUG(0,("lp_int(%s): is called with NULL!\n",s));
-		return -1;
-	}
-
-	return strtoul(s, NULL, 0);
-}
-
-/**
- * convenience routine to return unsigned long parameters.
- */
-static double lp_double(const char *s)
-{
-
-	if (!s) {
-		DEBUG(0,("lp_double(%s): is called with NULL!\n",s));
-		return -1;
-	}
-
-	return strtod(s, NULL);
-}
-
-/**
- * convenience routine to return boolean parameters.
- */
-static bool lp_bool(const char *s)
-{
-	bool ret = false;
-
-	if (!s) {
-		DEBUG(0,("lp_bool(%s): is called with NULL!\n",s));
-		return false;
-	}
-
-	if (!set_boolean(s, &ret)) {
-		DEBUG(0,("lp_bool(%s): value is not boolean!\n",s));
-		return false;
-	}
-
-	return ret;
-}
-
-
-/**
- * Return parametric option from a given service. Type is a part of option before ':'
- * Parametric option has following syntax: 'Type: option = value'
- * Returned value is allocated in 'lp_talloc' context
- */
-
-const char *lpcfg_parm_string(struct loadparm_context *lp_ctx,
-			      struct loadparm_service *service, const char *type,
-			      const char *option)
-{
-	const char *value = lpcfg_get_parametric(lp_ctx, service, type, option);
-
-	if (value)
-		return lp_string(value);
-
-	return NULL;
-}
-
-/**
- * Return parametric option from a given service. Type is a part of option before ':'
- * Parametric option has following syntax: 'Type: option = value'
- * Returned value is allocated in 'lp_talloc' context
- */
-
-const char **lpcfg_parm_string_list(TALLOC_CTX *mem_ctx,
-				    struct loadparm_context *lp_ctx,
-				    struct loadparm_service *service,
-				    const char *type,
-				    const char *option, const char *separator)
-{
-	const char *value = lpcfg_get_parametric(lp_ctx, service, type, option);
-
-	if (value != NULL)
-		return (const char **)str_list_make(mem_ctx, value, separator);
-
-	return NULL;
-}
-
-/**
- * Return parametric option from a given service. Type is a part of option before ':'
- * Parametric option has following syntax: 'Type: option = value'
- */
-
-int lpcfg_parm_int(struct loadparm_context *lp_ctx,
-		   struct loadparm_service *service, const char *type,
-		   const char *option, int default_v)
-{
-	const char *value = lpcfg_get_parametric(lp_ctx, service, type, option);
-
-	if (value)
-		return lp_int(value);
-
-	return default_v;
-}
-
-/**
- * Return parametric option from a given service. Type is a part of
- * option before ':'.
- * Parametric option has following syntax: 'Type: option = value'.
- */
-
-int lpcfg_parm_bytes(struct loadparm_context *lp_ctx,
-		  struct loadparm_service *service, const char *type,
-		  const char *option, int default_v)
-{
-	uint64_t bval;
-
-	const char *value = lpcfg_get_parametric(lp_ctx, service, type, option);
-
-	if (value && conv_str_size_error(value, &bval)) {
-		if (bval <= INT_MAX) {
-			return (int)bval;
-		}
-	}
-
-	return default_v;
-}
-
-/**
- * Return parametric option from a given service.
- * Type is a part of option before ':'
- * Parametric option has following syntax: 'Type: option = value'
- */
-unsigned long lpcfg_parm_ulong(struct loadparm_context *lp_ctx,
-			    struct loadparm_service *service, const char *type,
-			    const char *option, unsigned long default_v)
-{
-	const char *value = lpcfg_get_parametric(lp_ctx, service, type, option);
-
-	if (value)
-		return lp_ulong(value);
-
-	return default_v;
-}
-
-
-double lpcfg_parm_double(struct loadparm_context *lp_ctx,
-		      struct loadparm_service *service, const char *type,
-		      const char *option, double default_v)
-{
-	const char *value = lpcfg_get_parametric(lp_ctx, service, type, option);
-
-	if (value != NULL)
-		return lp_double(value);
-
-	return default_v;
-}
-
-/**
- * Return parametric option from a given service. Type is a part of option before ':'
- * Parametric option has following syntax: 'Type: option = value'
- */
-
-bool lpcfg_parm_bool(struct loadparm_context *lp_ctx,
-		     struct loadparm_service *service, const char *type,
-		     const char *option, bool default_v)
-{
-	const char *value = lpcfg_get_parametric(lp_ctx, service, type, option);
-
-	if (value != NULL)
-		return lp_bool(value);
-
-	return default_v;
-}
-
-
-/**
- * Initialise a service to the defaults.
- */
-
-static struct loadparm_service *init_service(TALLOC_CTX *mem_ctx, struct loadparm_service *sDefault)
-{
-	struct loadparm_service *pservice =
-		talloc_zero(mem_ctx, struct loadparm_service);
-	copy_service(pservice, sDefault, NULL);
-	return pservice;
-}
-
-/**
- * Set a string value, deallocating any existing space, and allocing the space
- * for the string
- */
-static bool string_set(TALLOC_CTX *mem_ctx, char **dest, const char *src)
-{
-	talloc_free(*dest);
-
-	if (src == NULL)
-		src = "";
-
-	*dest = talloc_strdup(mem_ctx, src);
-	if ((*dest) == NULL) {
-		DEBUG(0,("Out of memory in string_set\n"));
-		return false;
-	}
-
-	return true;
-}
-
-/**
- * Set a string value, deallocating any existing space, and allocing the space
- * for the string
- */
-static bool string_set_upper(TALLOC_CTX *mem_ctx, char **dest, const char *src)
-{
-	talloc_free(*dest);
-
-	if (src == NULL)
-		src = "";
-
-	*dest = strupper_talloc(mem_ctx, src);
-	if ((*dest) == NULL) {
-		DEBUG(0,("Out of memory in string_set_upper\n"));
-		return false;
-	}
-
-	return true;
-}
-
-
-
-/**
- * Add a new service to the services array initialising it with the given
- * service.
- */
-
-struct loadparm_service *lpcfg_add_service(struct loadparm_context *lp_ctx,
-					   const struct loadparm_service *pservice,
-					   const char *name)
-{
-	int i;
-	struct loadparm_service tservice;
-	int num_to_alloc = lp_ctx->iNumServices + 1;
-	struct parmlist_entry *data, *pdata;
-
-	if (pservice == NULL) {
-		pservice = lp_ctx->sDefault;
-	}
-
-	tservice = *pservice;
-
-	/* it might already exist */
-	if (name) {
-		struct loadparm_service *service = getservicebyname(lp_ctx,
-								    name);
-		if (service != NULL) {
-			/* Clean all parametric options for service */
-			/* They will be added during parsing again */
-			data = service->param_opt;
-			while (data) {
-				pdata = data->next;
-				talloc_free(data);
-				data = pdata;
-			}
-			service->param_opt = NULL;
-			return service;
-		}
-	}
-
-	/* find an invalid one */
-	for (i = 0; i < lp_ctx->iNumServices; i++)
-		if (lp_ctx->services[i] == NULL)
-			break;
-
-	/* if not, then create one */
-	if (i == lp_ctx->iNumServices) {
-		struct loadparm_service **tsp;
-
-		tsp = talloc_realloc(lp_ctx, lp_ctx->services, struct loadparm_service *, num_to_alloc);
-
-		if (!tsp) {
-			DEBUG(0,("lpcfg_add_service: failed to enlarge services!\n"));
-			return NULL;
-		} else {
-			lp_ctx->services = tsp;
-			lp_ctx->services[lp_ctx->iNumServices] = NULL;
-		}
-
-		lp_ctx->iNumServices++;
-	}
-
-	lp_ctx->services[i] = init_service(lp_ctx->services, lp_ctx->sDefault);
-	if (lp_ctx->services[i] == NULL) {
-		DEBUG(0,("lpcfg_add_service: out of memory!\n"));
-		return NULL;
-	}
-	copy_service(lp_ctx->services[i], &tservice, NULL);
-	if (name != NULL)
-		string_set(lp_ctx->services[i], &lp_ctx->services[i]->szService, name);
-	return lp_ctx->services[i];
-}
-
-/**
- * Add a new home service, with the specified home directory, defaults coming
- * from service ifrom.
- */
-
-bool lpcfg_add_home(struct loadparm_context *lp_ctx,
-		 const char *pszHomename,
-		 struct loadparm_service *default_service,
-		 const char *user, const char *pszHomedir)
-{
-	struct loadparm_service *service;
-
-	service = lpcfg_add_service(lp_ctx, default_service, pszHomename);
-
-	if (service == NULL)
-		return false;
-
-	if (!(*(default_service->szPath))
-	    || strequal(default_service->szPath, lp_ctx->sDefault->szPath)) {
-		service->szPath = talloc_strdup(service, pszHomedir);
-	} else {
-		service->szPath = string_sub_talloc(service, lpcfg_pathname(default_service, lp_ctx->sDefault), "%H", pszHomedir);
-	}
-
-	if (!(*(service->comment))) {
-		service->comment = talloc_asprintf(service, "Home directory of %s", user);
-	}
-	service->bAvailable = default_service->bAvailable;
-	service->bBrowseable = default_service->bBrowseable;
-
-	DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n",
-		  pszHomename, user, service->szPath));
-
-	return true;
-}
-
-/**
- * Add a new printer service, with defaults coming from service iFrom.
- */
-
-bool lpcfg_add_printer(struct loadparm_context *lp_ctx,
-		       const char *pszPrintername,
-		       struct loadparm_service *default_service)
-{
-	const char *comment = "From Printcap";
-	struct loadparm_service *service;
-	service = lpcfg_add_service(lp_ctx, default_service, pszPrintername);
-
-	if (service == NULL)
-		return false;
-
-	/* note that we do NOT default the availability flag to True - */
-	/* we take it from the default service passed. This allows all */
-	/* dynamic printers to be disabled by disabling the [printers] */
-	/* entry (if/when the 'available' keyword is implemented!).    */
-
-	/* the printer name is set to the service name. */
-	string_set(service, &service->szPrintername, pszPrintername);
-	string_set(service, &service->comment, comment);
-	service->bBrowseable = default_service->bBrowseable;
-	/* Printers cannot be read_only. */
-	service->bRead_only = false;
-	/* Printer services must be printable. */
-	service->bPrint_ok = true;
-
-	DEBUG(3, ("adding printer service %s\n", pszPrintername));
-
-	return true;
-}
-
-/**
- * Map a parameter's string representation to something we can use.
- * Returns False if the parameter string is not recognised, else TRUE.
- */
-
-static int map_parameter(const char *pszParmName)
-{
-	int iIndex;
-
-	if (*pszParmName == '-')
-		return -1;
-
-	for (iIndex = 0; parm_table[iIndex].label; iIndex++)
-		if (strwicmp(parm_table[iIndex].label, pszParmName) == 0)
-			return iIndex;
-
-	/* Warn only if it isn't parametric option */
-	if (strchr(pszParmName, ':') == NULL)
-		DEBUG(0, ("Unknown parameter encountered: \"%s\"\n", pszParmName));
-	/* We do return 'fail' for parametric options as well because they are
-	   stored in different storage
-	 */
-	return -1;
-}
-
-
-/**
-  return the parameter structure for a parameter
-*/
-struct parm_struct *lpcfg_parm_struct(struct loadparm_context *lp_ctx, const char *name)
-{
-	int parmnum;
-
-	if (lp_ctx->s3_fns) {
-		return lp_ctx->s3_fns->get_parm_struct(name);
-	}
-
-	parmnum = map_parameter(name);
-	if (parmnum == -1) return NULL;
-	return &parm_table[parmnum];
-}
-
-/**
-  return the parameter pointer for a parameter
-*/
-void *lpcfg_parm_ptr(struct loadparm_context *lp_ctx,
-		  struct loadparm_service *service, struct parm_struct *parm)
-{
-	if (lp_ctx->s3_fns) {
-		return lp_ctx->s3_fns->get_parm_ptr(service, parm);
-	}
-
-	if (service == NULL) {
-		if (parm->p_class == P_LOCAL)
-			return ((char *)lp_ctx->sDefault)+parm->offset;
-		else if (parm->p_class == P_GLOBAL)
-			return ((char *)lp_ctx->globals)+parm->offset;
-		else return NULL;
-	} else {
-		return ((char *)service) + parm->offset;
-	}
-}
-
-/**
- * Find a service by name. Otherwise works like get_service.
- */
-
-static struct loadparm_service *getservicebyname(struct loadparm_context *lp_ctx,
-					const char *pszServiceName)
-{
-	int iService;
-
-	if (lp_ctx->s3_fns) {
-		return lp_ctx->s3_fns->get_service(pszServiceName);
-	}
-
-	for (iService = lp_ctx->iNumServices - 1; iService >= 0; iService--)
-		if (lp_ctx->services[iService] != NULL &&
-		    strwicmp(lp_ctx->services[iService]->szService, pszServiceName) == 0) {
-			return lp_ctx->services[iService];
-		}
-
-	return NULL;
-}
-
-/**
- * Copy a service structure to another.
- * If pcopymapDest is NULL then copy all fields
- */
-
-static void copy_service(struct loadparm_service *pserviceDest,
-			 struct loadparm_service *pserviceSource,
-			 struct bitmap *pcopymapDest)
-{
-	int i;
-	bool bcopyall = (pcopymapDest == NULL);
-	struct parmlist_entry *data, *pdata, *paramo;
-	bool not_added;
-
-	for (i = 0; parm_table[i].label; i++)
-		if (parm_table[i].p_class == P_LOCAL &&
-		    (bcopyall || bitmap_query(pcopymapDest, i))) {
-			void *src_ptr =
-				((char *)pserviceSource) + parm_table[i].offset;
-			void *dest_ptr =
-				((char *)pserviceDest) + parm_table[i].offset;
-
-			switch (parm_table[i].type) {
-				case P_BOOL:
-					*(bool *)dest_ptr = *(bool *)src_ptr;
-					break;
-
-				case P_INTEGER:
-				case P_OCTAL:
-				case P_ENUM:
-					*(int *)dest_ptr = *(int *)src_ptr;
-					break;
-
-				case P_STRING:
-					string_set(pserviceDest,
-						   (char **)dest_ptr,
-						   *(char **)src_ptr);
-					break;
-
-				case P_USTRING:
-					string_set_upper(pserviceDest,
-							 (char **)dest_ptr,
-							 *(char **)src_ptr);
-					break;
-				case P_LIST:
-					*(const char ***)dest_ptr = (const char **)str_list_copy(pserviceDest, 
-										  *(const char ***)src_ptr);
-					break;
-				default:
-					break;
-			}
-		}
-
-	if (bcopyall) {
-		init_copymap(pserviceDest);
-		if (pserviceSource->copymap)
-			bitmap_copy(pserviceDest->copymap,
-				    pserviceSource->copymap);
-	}
-
-	data = pserviceSource->param_opt;
-	while (data) {
-		not_added = true;
-		pdata = pserviceDest->param_opt;
-		/* Traverse destination */
-		while (pdata) {
-			/* If we already have same option, override it */
-			if (strcmp(pdata->key, data->key) == 0) {
-				talloc_free(pdata->value);
-				pdata->value = talloc_reference(pdata,
-							     data->value);
-				not_added = false;
-				break;
-			}
-			pdata = pdata->next;
-		}
-		if (not_added) {
-			paramo = talloc_zero(pserviceDest, struct parmlist_entry);
-			if (paramo == NULL)
-				smb_panic("OOM");
-			paramo->key = talloc_reference(paramo, data->key);
-			paramo->value = talloc_reference(paramo, data->value);
-			DLIST_ADD(pserviceDest->param_opt, paramo);
-		}
-		data = data->next;
-	}
-}
-
-/**
- * Check a service for consistency. Return False if the service is in any way
- * incomplete or faulty, else True.
- */
-static bool service_ok(struct loadparm_service *service)
-{
-	bool bRetval;
-
-	bRetval = true;
-	if (service->szService[0] == '\0') {
-		DEBUG(0, ("The following message indicates an internal error:\n"));
-		DEBUG(0, ("No service name in service entry.\n"));
-		bRetval = false;
-	}
-
-	/* The [printers] entry MUST be printable. I'm all for flexibility, but */
-	/* I can't see why you'd want a non-printable printer service...        */
-	if (strwicmp(service->szService, PRINTERS_NAME) == 0) {
-		if (!service->bPrint_ok) {
-			DEBUG(0, ("WARNING: [%s] service MUST be printable!\n",
-			       service->szService));
-			service->bPrint_ok = true;
-		}
-		/* [printers] service must also be non-browsable. */
-		if (service->bBrowseable)
-			service->bBrowseable = false;
-	}
-
-	/* If a service is flagged unavailable, log the fact at level 0. */
-	if (!service->bAvailable)
-		DEBUG(1, ("NOTE: Service %s is flagged unavailable.\n",
-			  service->szService));
-
-	return bRetval;
-}
-
-
-/*******************************************************************
- Keep a linked list of all config files so we know when one has changed
- it's date and needs to be reloaded.
-********************************************************************/
-
-static void add_to_file_list(struct loadparm_context *lp_ctx,
-			     const char *fname, const char *subfname)
-{
-	struct file_lists *f = lp_ctx->file_lists;
-
-	while (f) {
-		if (f->name && !strcmp(f->name, fname))
-			break;
-		f = f->next;
-	}
-
-	if (!f) {
-		f = talloc(lp_ctx, struct file_lists);
-		if (!f)
-			return;
-		f->next = lp_ctx->file_lists;
-		f->name = talloc_strdup(f, fname);
-		if (!f->name) {
-			talloc_free(f);
-			return;
-		}
-		f->subfname = talloc_strdup(f, subfname);
-		if (!f->subfname) {
-			talloc_free(f);
-			return;
-		}
-		lp_ctx->file_lists = f;
-		f->modtime = file_modtime(subfname);
-	} else {
-		time_t t = file_modtime(subfname);
-		if (t)
-			f->modtime = t;
-	}
-}
-
-/*******************************************************************
- Check if a config file has changed date.
-********************************************************************/
-bool lpcfg_file_list_changed(struct loadparm_context *lp_ctx)
-{
-	struct file_lists *f;
-	DEBUG(6, ("lp_file_list_changed()\n"));
-
-	for (f = lp_ctx->file_lists; f != NULL; f = f->next) {
-		char *n2;
-		time_t mod_time;
-
-		n2 = standard_sub_basic(lp_ctx, f->name);
-
-		DEBUGADD(6, ("file %s -> %s  last mod_time: %s\n",
-			     f->name, n2, ctime(&f->modtime)));
-
-		mod_time = file_modtime(n2);
-
-		if (mod_time && ((f->modtime != mod_time) || (f->subfname == NULL) || (strcmp(n2, f->subfname) != 0))) {
-			DEBUGADD(6, ("file %s modified: %s\n", n2,
-				  ctime(&mod_time)));
-			f->modtime = mod_time;
-			talloc_free(f->subfname);
-			f->subfname = talloc_strdup(f, n2);
-			return true;
-		}
-	}
-	return false;
-}
-
-/***************************************************************************
- Handle the "realm" parameter
-***************************************************************************/
-
-static bool handle_realm(struct loadparm_context *lp_ctx, int unused,
-			 const char *pszParmValue, char **ptr)
-{
-	string_set(lp_ctx, ptr, pszParmValue);
-
-	talloc_free(lp_ctx->globals->szRealm_upper);
-	talloc_free(lp_ctx->globals->szRealm_lower);
-
-	lp_ctx->globals->szRealm_upper = strupper_talloc(lp_ctx, pszParmValue);
-	lp_ctx->globals->szRealm_lower = strlower_talloc(lp_ctx, pszParmValue);
-
-	return true;
-}
-
-/***************************************************************************
- Handle the include operation.
-***************************************************************************/
-
-static bool handle_include(struct loadparm_context *lp_ctx, int unused,
-			   const char *pszParmValue, char **ptr)
-{
-	char *fname = standard_sub_basic(lp_ctx, pszParmValue);
-
-	add_to_file_list(lp_ctx, pszParmValue, fname);
-
-	string_set(lp_ctx, ptr, fname);
-
-	if (file_exist(fname))
-		return pm_process(fname, do_section, do_parameter, lp_ctx);
-
-	DEBUG(2, ("Can't find include file %s\n", fname));
-
-	return false;
-}
-
-/***************************************************************************
- Handle the interpretation of the copy parameter.
-***************************************************************************/
-
-static bool handle_copy(struct loadparm_context *lp_ctx, int unused,
-			const char *pszParmValue, char **ptr)
-{
-	bool bRetval;
-	struct loadparm_service *serviceTemp;
-
-	string_set(lp_ctx, ptr, pszParmValue);
-
-	bRetval = false;
-
-	DEBUG(3, ("Copying service from service %s\n", pszParmValue));
-
-	if ((serviceTemp = getservicebyname(lp_ctx, pszParmValue)) != NULL) {
-		if (serviceTemp == lp_ctx->currentService) {
-			DEBUG(0, ("Can't copy service %s - unable to copy self!\n", pszParmValue));
-		} else {
-			copy_service(lp_ctx->currentService,
-				     serviceTemp,
-				     lp_ctx->currentService->copymap);
-			bRetval = true;
-		}
-	} else {
-		DEBUG(0, ("Unable to copy service - source not found: %s\n",
-			  pszParmValue));
-		bRetval = false;
-	}
-
-	return bRetval;
-}
-
-static bool handle_debuglevel(struct loadparm_context *lp_ctx, int unused,
-			const char *pszParmValue, char **ptr)
-{
-
-	string_set(lp_ctx, ptr, pszParmValue);
-	if (lp_ctx->global) {
-		return debug_parse_levels(pszParmValue);
-	}
-	return true;
-}
-
-static bool handle_logfile(struct loadparm_context *lp_ctx, int unused,
-			const char *pszParmValue, char **ptr)
-{
-	debug_set_logfile(pszParmValue);
-	if (lp_ctx->global) {
-		string_set(lp_ctx, ptr, pszParmValue);
-	}
-	return true;
-}
-
-/***************************************************************************
- Initialise a copymap.
-***************************************************************************/
-
-static void init_copymap(struct loadparm_service *pservice)
-{
-	int i;
-
-	TALLOC_FREE(pservice->copymap);
-
-	pservice->copymap = bitmap_talloc(NULL, NUMPARAMETERS);
-	if (!pservice->copymap)
-		DEBUG(0,
-		      ("Couldn't allocate copymap!! (size %d)\n",
-		       (int)NUMPARAMETERS));
-	else
-		for (i = 0; i < NUMPARAMETERS; i++)
-			bitmap_set(pservice->copymap, i);
-}
-
-/**
- * Process a parametric option
- */
-static bool lp_do_parameter_parametric(struct loadparm_context *lp_ctx,
-				       struct loadparm_service *service,
-				       const char *pszParmName,
-				       const char *pszParmValue, int flags)
-{
-	struct parmlist_entry *paramo, *data;
-	char *name;
-	TALLOC_CTX *mem_ctx;
-
-	while (isspace((unsigned char)*pszParmName)) {
-		pszParmName++;
-	}
-
-	name = strlower_talloc(lp_ctx, pszParmName);
-	if (!name) return false;
-
-	if (service == NULL) {
-		data = lp_ctx->globals->param_opt;
-		mem_ctx = lp_ctx->globals;
-	} else {
-		data = service->param_opt;
-		mem_ctx = service;
-	}
-
-	/* Traverse destination */
-	for (paramo=data; paramo; paramo=paramo->next) {
-		/* If we already have the option set, override it unless
-		   it was a command line option and the new one isn't */
-		if (strcmp(paramo->key, name) == 0) {
-			if ((paramo->priority & FLAG_CMDLINE) &&
-			    !(flags & FLAG_CMDLINE)) {
-				talloc_free(name);
-				return true;
-			}
-
-			talloc_free(paramo->value);
-			paramo->value = talloc_strdup(paramo, pszParmValue);
-			paramo->priority = flags;
-			talloc_free(name);
-			return true;
-		}
-	}
-
-	paramo = talloc_zero(mem_ctx, struct parmlist_entry);
-	if (!paramo)
-		smb_panic("OOM");
-	paramo->key = talloc_strdup(paramo, name);
-	paramo->value = talloc_strdup(paramo, pszParmValue);
-	paramo->priority = flags;
-	if (service == NULL) {
-		DLIST_ADD(lp_ctx->globals->param_opt, paramo);
-	} else {
-		DLIST_ADD(service->param_opt, paramo);
-	}
-
-	talloc_free(name);
-
-	return true;
-}
-
-static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
-			 const char *pszParmName, const char *pszParmValue,
-			 struct loadparm_context *lp_ctx, bool on_globals)
-{
-	int i;
-	/* if it is a special case then go ahead */
-	if (parm_table[parmnum].special) {
-		bool ret;
-		ret = parm_table[parmnum].special(lp_ctx, -1, pszParmValue,
-						  (char **)parm_ptr);
-		if (!ret) {
-			return false;
-		}
-		goto mark_non_default;
-	}
-
-	/* now switch on the type of variable it is */
-	switch (parm_table[parmnum].type)
-	{
-		case P_BOOL: {
-			bool b;
-			if (!set_boolean(pszParmValue, &b)) {
-				DEBUG(0,("lp_do_parameter(%s): value is not boolean!\n", pszParmValue));
-				return false;
-			}
-			*(bool *)parm_ptr = b;
-			}
-			break;
-
-		case P_BOOLREV: {
-			bool b;
-			if (!set_boolean(pszParmValue, &b)) {
-				DEBUG(0,("lp_do_parameter(%s): value is not boolean!\n", pszParmValue));
-				return false;
-			}
-			*(bool *)parm_ptr = !b;
-			}
-			break;
-
-		case P_INTEGER:
-			*(int *)parm_ptr = atoi(pszParmValue);
-			break;
-
-		case P_CHAR:
-			*(char *)parm_ptr = *pszParmValue;
-			break;
-
-		case P_OCTAL:
-			*(int *)parm_ptr = strtol(pszParmValue, NULL, 8);
-			break;
-
-		case P_BYTES:
-		{
-			uint64_t val;
-			if (conv_str_size_error(pszParmValue, &val)) {
-				if (val <= INT_MAX) {
-					*(int *)parm_ptr = (int)val;
-					break;
-				}
-			}
-
-			DEBUG(0,("lp_do_parameter(%s): value is not "
-			    "a valid size specifier!\n", pszParmValue));
-			return false;
-		}
-
-		case P_CMDLIST:
-			*(const char ***)parm_ptr = (const char **)str_list_make(mem_ctx,
-								  pszParmValue, NULL);
-			break;
-		case P_LIST:
-		{
-			char **new_list = str_list_make(mem_ctx,
-							pszParmValue, NULL);
-			for (i=0; new_list[i]; i++) {
-				if (new_list[i][0] == '+' && new_list[i][1] &&
-				    (!str_list_check(*(const char ***)parm_ptr,
-						     &new_list[i][1]))) {
-					*(const char ***)parm_ptr = str_list_add(*(const char ***)parm_ptr,
-										 &new_list[i][1]);
-				} else if (new_list[i][0] == '-' && new_list[i][1]) {
-#if 0 /* This is commented out because we sometimes parse the list
-       * twice, and so we can't assert on this */
-					if (!str_list_check(*(const char ***)parm_ptr,
-							    &new_list[i][1])) {
-						DEBUG(0, ("Unsupported value for: %s = %s, %s is not in the original list [%s]\n",
-							  pszParmName, pszParmValue, new_list[i],
-							  str_list_join_shell(mem_ctx, *(const char ***)parm_ptr, ' ')));
-						return false;
-
-					}
-#endif
-					str_list_remove(*(const char ***)parm_ptr,
-							&new_list[i][1]);
-				} else {
-					if (i != 0) {
-						DEBUG(0, ("Unsupported list syntax for: %s = %s\n",
-							  pszParmName, pszParmValue));
-						return false;
-					}
-					*(const char ***)parm_ptr = (const char **) new_list;
-					break;
-				}
-			}
-			break;
-		}
-		case P_STRING:
-			string_set(mem_ctx, (char **)parm_ptr, pszParmValue);
-			break;
-
-		case P_USTRING:
-			string_set_upper(mem_ctx, (char **)parm_ptr, pszParmValue);
-			break;
-
-		case P_ENUM:
-			for (i = 0; parm_table[parmnum].enum_list[i].name; i++) {
-				if (strequal
-				    (pszParmValue,
-				     parm_table[parmnum].enum_list[i].name)) {
-					*(int *)parm_ptr =
-						parm_table[parmnum].
-						enum_list[i].value;
-					break;
-				}
-			}
-			if (!parm_table[parmnum].enum_list[i].name) {
-				DEBUG(0,("Unknown enumerated value '%s' for '%s'\n", 
-					 pszParmValue, pszParmName));
-				return false;
-			}
-			break;
-	}
-
-mark_non_default:
-	if (on_globals && (lp_ctx->flags[parmnum] & FLAG_DEFAULT)) {
-		lp_ctx->flags[parmnum] &= ~FLAG_DEFAULT;
-		/* we have to also unset FLAG_DEFAULT on aliases */
-		for (i=parmnum-1;i>=0 && parm_table[i].offset == parm_table[parmnum].offset;i--) {
-			lp_ctx->flags[i] &= ~FLAG_DEFAULT;
-		}
-		for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].offset == parm_table[parmnum].offset;i++) {
-			lp_ctx->flags[i] &= ~FLAG_DEFAULT;
-		}
-	}
-	return true;
-}
-
-
-bool lpcfg_do_global_parameter(struct loadparm_context *lp_ctx,
-			       const char *pszParmName, const char *pszParmValue)
-{
-	int parmnum = map_parameter(pszParmName);
-	void *parm_ptr;
-
-	if (parmnum < 0) {
-		if (strchr(pszParmName, ':')) {
-			return lp_do_parameter_parametric(lp_ctx, NULL, pszParmName, pszParmValue, 0);
-		}
-		DEBUG(0, ("Ignoring unknown parameter \"%s\"\n", pszParmName));
-		return true;
-	}
-
-	/* if the flag has been set on the command line, then don't allow override,
-	   but don't report an error */
-	if (lp_ctx->flags[parmnum] & FLAG_CMDLINE) {
-		return true;
-	}
-
-	parm_ptr = lpcfg_parm_ptr(lp_ctx, NULL, &parm_table[parmnum]);
-
-	return set_variable(lp_ctx->globals, parmnum, parm_ptr,
-			    pszParmName, pszParmValue, lp_ctx, true);
-}
-
-bool lpcfg_do_service_parameter(struct loadparm_context *lp_ctx,
-				struct loadparm_service *service,
-				const char *pszParmName, const char *pszParmValue)
-{
-	void *parm_ptr;
-	int i;
-	int parmnum = map_parameter(pszParmName);
-
-	if (parmnum < 0) {
-		if (strchr(pszParmName, ':')) {
-			return lp_do_parameter_parametric(lp_ctx, service, pszParmName, pszParmValue, 0);
-		}
-		DEBUG(0, ("Ignoring unknown parameter \"%s\"\n", pszParmName));
-		return true;
-	}
-
-	/* if the flag has been set on the command line, then don't allow override,
-	   but don't report an error */
-	if (lp_ctx->flags[parmnum] & FLAG_CMDLINE) {
-		return true;
-	}
-
-	if (parm_table[parmnum].p_class == P_GLOBAL) {
-		DEBUG(0,
-		      ("Global parameter %s found in service section!\n",
-		       pszParmName));
-		return true;
-	}
-	parm_ptr = ((char *)service) + parm_table[parmnum].offset;
-
-	if (!service->copymap)
-		init_copymap(service);
-
-	/* this handles the aliases - set the copymap for other
-	 * entries with the same data pointer */
-	for (i = 0; parm_table[i].label; i++)
-		if (parm_table[i].offset == parm_table[parmnum].offset &&
-		    parm_table[i].p_class == parm_table[parmnum].p_class)
-			bitmap_clear(service->copymap, i);
-
-	return set_variable(service, parmnum, parm_ptr, pszParmName,
-			    pszParmValue, lp_ctx, false);
-}
-
-/**
- * Process a parameter.
- */
-
-static bool do_parameter(const char *pszParmName, const char *pszParmValue,
-			 void *userdata)
-{
-	struct loadparm_context *lp_ctx = (struct loadparm_context *)userdata;
-
-	if (lp_ctx->bInGlobalSection)
-		return lpcfg_do_global_parameter(lp_ctx, pszParmName,
-					      pszParmValue);
-	else
-		return lpcfg_do_service_parameter(lp_ctx, lp_ctx->currentService,
-						  pszParmName, pszParmValue);
-}
-
-/*
-  variable argument do parameter
-*/
-bool lpcfg_do_global_parameter_var(struct loadparm_context *lp_ctx, const char *pszParmName, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);
-bool lpcfg_do_global_parameter_var(struct loadparm_context *lp_ctx,
-				const char *pszParmName, const char *fmt, ...)
-{
-	char *s;
-	bool ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	s = talloc_vasprintf(NULL, fmt, ap);
-	va_end(ap);
-	ret = lpcfg_do_global_parameter(lp_ctx, pszParmName, s);
-	talloc_free(s);
-	return ret;
-}
-
-
-/*
-  set a parameter from the commandline - this is called from command line parameter
-  parsing code. It sets the parameter then marks the parameter as unable to be modified
-  by smb.conf processing
-*/
-bool lpcfg_set_cmdline(struct loadparm_context *lp_ctx, const char *pszParmName,
-		       const char *pszParmValue)
-{
-	int parmnum;
-	int i;
-
-	if (lp_ctx->s3_fns) {
-		return lp_ctx->s3_fns->set_cmdline(pszParmName, pszParmValue);
-	}
-
-	parmnum = map_parameter(pszParmName);
-
-	while (isspace((unsigned char)*pszParmValue)) pszParmValue++;
-
-
-	if (parmnum < 0 && strchr(pszParmName, ':')) {
-		/* set a parametric option */
-		return lp_do_parameter_parametric(lp_ctx, NULL, 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 */
-	lp_ctx->flags[parmnum] &= ~FLAG_CMDLINE;
-
-	if (!lpcfg_do_global_parameter(lp_ctx, pszParmName, pszParmValue)) {
-		return false;
-	}
-
-	lp_ctx->flags[parmnum] |= FLAG_CMDLINE;
-
-	/* we have to also set FLAG_CMDLINE on aliases */
-	for (i=parmnum-1;i>=0 && parm_table[i].offset == parm_table[parmnum].offset;i--) {
-		lp_ctx->flags[i] |= FLAG_CMDLINE;
-	}
-	for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].offset == parm_table[parmnum].offset;i++) {
-		lp_ctx->flags[i] |= FLAG_CMDLINE;
-	}
-
-	return true;
-}
-
-/*
-  set a option from the commandline in 'a=b' format. Use to support --option
-*/
-bool lpcfg_set_option(struct loadparm_context *lp_ctx, 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 = lpcfg_set_cmdline(lp_ctx, s, p+1);
-	free(s);
-	return ret;
-}
-
-
-#define BOOLSTR(b) ((b) ? "Yes" : "No")
-
-/**
- * Print a parameter of the specified type.
- */
-
-static void print_parameter(struct parm_struct *p, void *ptr, FILE * f)
-{
-	/* For the seperation of lists values that we print below */
-	const char *list_sep = ", ";
-	int i;
-	switch (p->type)
-	{
-		case P_ENUM:
-			for (i = 0; p->enum_list[i].name; i++) {
-				if (*(int *)ptr == p->enum_list[i].value) {
-					fprintf(f, "%s",
-						p->enum_list[i].name);
-					break;
-				}
-			}
-			break;
-
-		case P_BOOL:
-			fprintf(f, "%s", BOOLSTR(*(bool *)ptr));
-			break;
-
-		case P_BOOLREV:
-			fprintf(f, "%s", BOOLSTR(!*(bool *)ptr));
-			break;
-
-		case P_INTEGER:
-		case P_BYTES:
-			fprintf(f, "%d", *(int *)ptr);
-			break;
-
-		case P_CHAR:
-			fprintf(f, "%c", *(char *)ptr);
-			break;
-
-		case P_OCTAL: {
-			int val = *(int *)ptr; 
-			if (val == -1) {
-				fprintf(f, "-1");
-			} else {
-				fprintf(f, "0%o", val);
-			}
-			break;
-		}
-
-		case P_CMDLIST:
-			list_sep = " ";
-			/* fall through */
-		case P_LIST:
-			if ((char ***)ptr && *(char ***)ptr) {
-				char **list = *(char ***)ptr;
-				for (; *list; list++) {
-					/* surround strings with whitespace in double quotes */
-					if (*(list+1) == NULL) {
-						/* last item, no extra separator */
-						list_sep = "";
-					}
-					if ( strchr_m( *list, ' ' ) ) {
-						fprintf(f, "\"%s\"%s", *list, list_sep);
-					} else {
-						fprintf(f, "%s%s", *list, list_sep);
-					}
-				}
-			}
-			break;
-
-		case P_STRING:
-		case P_USTRING:
-			if (*(char **)ptr) {
-				fprintf(f, "%s", *(char **)ptr);
-			}
-			break;
-		case P_SEP:
-			break;
-	}
-}
-
-/**
- * Check if two parameters are equal.
- */
-
-static bool equal_parameter(parm_type type, void *ptr1, void *ptr2)
-{
-	switch (type) {
-		case P_BOOL:
-		case P_BOOLREV:
-			return (*((bool *)ptr1) == *((bool *)ptr2));
-
-		case P_INTEGER:
-		case P_ENUM:
-		case P_OCTAL:
-		case P_BYTES:
-			return (*((int *)ptr1) == *((int *)ptr2));
-
-		case P_CHAR:
-			return (*((char *)ptr1) == *((char *)ptr2));
-
-		case P_LIST:
-		case P_CMDLIST:
-			return str_list_equal(*(const char ***)ptr1, *(const char ***)ptr2);
-
-		case P_STRING:
-		case P_USTRING:
-		{
-			char *p1 = *(char **)ptr1, *p2 = *(char **)ptr2;
-			if (p1 && !*p1)
-				p1 = NULL;
-			if (p2 && !*p2)
-				p2 = NULL;
-			return (p1 == p2 || strequal(p1, p2));
-		}
-		case P_SEP:
-			break;
-	}
-	return false;
-}
-
-/**
- * Process a new section (service).
- *
- * At this stage all sections are services.
- * Later we'll have special sections that permit server parameters to be set.
- * Returns True on success, False on failure.
- */
-
-static bool do_section(const char *pszSectionName, void *userdata)
-{
-	struct loadparm_context *lp_ctx = (struct loadparm_context *)userdata;
-	bool bRetval;
-	bool isglobal = ((strwicmp(pszSectionName, GLOBAL_NAME) == 0) ||
-			 (strwicmp(pszSectionName, GLOBAL_NAME2) == 0));
-	bRetval = false;
-
-	/* if we've just struck a global section, note the fact. */
-	lp_ctx->bInGlobalSection = isglobal;
-
-	/* check for multiple global sections */
-	if (lp_ctx->bInGlobalSection) {
-		DEBUG(4, ("Processing section \"[%s]\"\n", pszSectionName));
-		return true;
-	}
-
-	/* if we have a current service, tidy it up before moving on */
-	bRetval = true;
-
-	if (lp_ctx->currentService != NULL)
-		bRetval = service_ok(lp_ctx->currentService);
-
-	/* if all is still well, move to the next record in the services array */
-	if (bRetval) {
-		/* We put this here to avoid an odd message order if messages are */
-		/* issued by the post-processing of a previous section. */
-		DEBUG(4, ("Processing section \"[%s]\"\n", pszSectionName));
-
-		if ((lp_ctx->currentService = lpcfg_add_service(lp_ctx, lp_ctx->sDefault,
-								   pszSectionName))
-		    == NULL) {
-			DEBUG(0, ("Failed to add a new service\n"));
-			return false;
-		}
-	}
-
-	return bRetval;
-}
-
-
-/**
- * Determine if a particular base parameter is currently set to the default value.
- */
-
-static bool is_default(struct loadparm_service *sDefault, int i)
-{
-	void *def_ptr = ((char *)sDefault) + parm_table[i].offset;
-	if (!defaults_saved)
-		return false;
-	switch (parm_table[i].type) {
-		case P_CMDLIST:
-		case P_LIST:
-			return str_list_equal((const char **)parm_table[i].def.lvalue, 
-					      (const char **)def_ptr);
-		case P_STRING:
-		case P_USTRING:
-			return strequal(parm_table[i].def.svalue,
-					*(char **)def_ptr);
-		case P_BOOL:
-		case P_BOOLREV:
-			return parm_table[i].def.bvalue ==
-				*(bool *)def_ptr;
-		case P_INTEGER:
-		case P_CHAR:
-		case P_OCTAL:
-		case P_BYTES:
-		case P_ENUM:
-			return parm_table[i].def.ivalue ==
-				*(int *)def_ptr;
-	}
-	return false;
-}
-
-/**
- *Display the contents of the global structure.
- */
-
-static void dump_globals(struct loadparm_context *lp_ctx, FILE *f,
-			 bool show_defaults)
-{
-	int i;
-	struct parmlist_entry *data;
-
-	fprintf(f, "# Global parameters\n[global]\n");
-
-	for (i = 0; parm_table[i].label; i++)
-		if (parm_table[i].p_class == P_GLOBAL &&
-		    (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) {
-			if (!show_defaults && (lp_ctx->flags[i] & FLAG_DEFAULT))
-				continue;
-			fprintf(f, "\t%s = ", parm_table[i].label);
-			print_parameter(&parm_table[i], lpcfg_parm_ptr(lp_ctx, NULL, &parm_table[i]), f);
-			fprintf(f, "\n");
-	}
-	if (lp_ctx->globals->param_opt != NULL) {
-		for (data = lp_ctx->globals->param_opt; data;
-		     data = data->next) {
-			if (!show_defaults && (data->priority & FLAG_DEFAULT)) {
-				continue;
-			}
-			fprintf(f, "\t%s = %s\n", data->key, data->value);
-		}
-        }
-
-}
-
-/**
- * Display the contents of a single services record.
- */
-
-static void dump_a_service(struct loadparm_service * pService, struct loadparm_service *sDefault, FILE * f,
-			   unsigned int *flags)
-{
-	int i;
-	struct parmlist_entry *data;
-
-	if (pService != sDefault)
-		fprintf(f, "\n[%s]\n", pService->szService);
-
-	for (i = 0; parm_table[i].label; i++) {
-		if (parm_table[i].p_class == P_LOCAL &&
-		    (*parm_table[i].label != '-') &&
-		    (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset)))
-		{
-			if (pService == sDefault) {
-				if (flags && (flags[i] & FLAG_DEFAULT)) {
-					continue;
-				}
-				if (defaults_saved) {
-					if (is_default(sDefault, i)) {
-						continue;
-					}
-				}
-			} else {
-				if (equal_parameter(parm_table[i].type,
-						    ((char *)pService) +
-						    parm_table[i].offset,
-						    ((char *)sDefault) +
-						    parm_table[i].offset))
-					continue;
-			}
-
-			fprintf(f, "\t%s = ", parm_table[i].label);
-			print_parameter(&parm_table[i],
-					((char *)pService) + parm_table[i].offset, f);
-			fprintf(f, "\n");
-		}
-	}
-	if (pService->param_opt != NULL) {
-		for (data = pService->param_opt; data; data = data->next) {
-			fprintf(f, "\t%s = %s\n", data->key, data->value);
-		}
-        }
-}
-
-bool lpcfg_dump_a_parameter(struct loadparm_context *lp_ctx,
-			    struct loadparm_service *service,
-			    const char *parm_name, FILE * f)
-{
-	struct parm_struct *parm;
-	void *ptr;
-
-	parm = lpcfg_parm_struct(lp_ctx, parm_name);
-	if (!parm) {
-		return false;
-	}
-
-	ptr = lpcfg_parm_ptr(lp_ctx, service,parm);
-
-	print_parameter(parm, ptr, f);
-	fprintf(f, "\n");
-	return true;
-}
-
-/**
- * Return info about the next parameter in a service.
- * snum==-1 gives the globals.
- * Return NULL when out of parameters.
- */
-
-
-struct parm_struct *lpcfg_next_parameter(struct loadparm_context *lp_ctx, int snum, int *i,
-					 int allparameters)
-{
-	if (snum == -1) {
-		/* do the globals */
-		for (; parm_table[*i].label; (*i)++) {
-			if ((*parm_table[*i].label == '-'))
-				continue;
-
-			if ((*i) > 0
-			    && (parm_table[*i].offset ==
-				parm_table[(*i) - 1].offset)
-			    && (parm_table[*i].p_class ==
-				parm_table[(*i) - 1].p_class))
-				continue;
-
-			return &parm_table[(*i)++];
-		}
-	} else {
-		struct loadparm_service *pService = lp_ctx->services[snum];
-
-		for (; parm_table[*i].label; (*i)++) {
-			if (parm_table[*i].p_class == P_LOCAL &&
-			    (*parm_table[*i].label != '-') &&
-			    ((*i) == 0 ||
-			     (parm_table[*i].offset !=
-			      parm_table[(*i) - 1].offset)))
-			{
-				if (allparameters ||
-				    !equal_parameter(parm_table[*i].type,
-						     ((char *)pService) +
-						     parm_table[*i].offset,
-						     ((char *)lp_ctx->sDefault) +
-						     parm_table[*i].offset))
-				{
-					return &parm_table[(*i)++];
-				}
-			}
-		}
-	}
-
-	return NULL;
-}
-
-
-/**
- * Auto-load some home services.
- */
-static void lpcfg_add_auto_services(struct loadparm_context *lp_ctx,
-				    const char *str)
-{
-	return;
-}
-
-
-/**
- * Unload unused services.
- */
-
-void lpcfg_killunused(struct loadparm_context *lp_ctx,
-		   struct smbsrv_connection *smb,
-		   bool (*snumused) (struct smbsrv_connection *, int))
-{
-	int i;
-	for (i = 0; i < lp_ctx->iNumServices; i++) {
-		if (lp_ctx->services[i] == NULL)
-			continue;
-
-		if (!snumused || !snumused(smb, i)) {
-			talloc_free(lp_ctx->services[i]);
-			lp_ctx->services[i] = NULL;
-		}
-	}
-}
-
-
-static int lpcfg_destructor(struct loadparm_context *lp_ctx)
-{
-	struct parmlist_entry *data;
-
-	if (lp_ctx->refuse_free) {
-		/* someone is trying to free the
-		   global_loadparm_context.
-		   We can't allow that. */
-		return -1;
-	}
-
-	if (lp_ctx->globals->param_opt != NULL) {
-		struct parmlist_entry *next;
-		for (data = lp_ctx->globals->param_opt; data; data=next) {
-			next = data->next;
-			if (data->priority & FLAG_CMDLINE) continue;
-			DLIST_REMOVE(lp_ctx->globals->param_opt, data);
-			talloc_free(data);
-		}
-	}
-
-	return 0;
-}
-
-/**
- * Initialise the global parameter structure.
- *
- * Note that most callers should use loadparm_init_global() instead
- */
-struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
-{
-	int i;
-	char *myname;
-	struct loadparm_context *lp_ctx;
-	struct parmlist_entry *parm;
-	char *logfile;
-
-	lp_ctx = talloc_zero(mem_ctx, struct loadparm_context);
-	if (lp_ctx == NULL)
-		return NULL;
-
-	talloc_set_destructor(lp_ctx, lpcfg_destructor);
-	lp_ctx->bInGlobalSection = true;
-	lp_ctx->globals = talloc_zero(lp_ctx, struct loadparm_global);
-	lp_ctx->sDefault = talloc_zero(lp_ctx, struct loadparm_service);
-
-	lp_ctx->sDefault->iMaxPrintJobs = 1000;
-	lp_ctx->sDefault->bAvailable = true;
-	lp_ctx->sDefault->bBrowseable = true;
-	lp_ctx->sDefault->bRead_only = true;
-	lp_ctx->sDefault->bMap_archive = true;
-	lp_ctx->sDefault->iStrictLocking = true;
-	lp_ctx->sDefault->bOpLocks = true;
-	lp_ctx->sDefault->iCreate_mask = 0744;
-	lp_ctx->sDefault->iCreate_force_mode = 0000;
-	lp_ctx->sDefault->iDir_mask = 0755;
-	lp_ctx->sDefault->iDir_force_mode = 0000;
-
-	DEBUG(3, ("Initialising global parameters\n"));
-
-	for (i = 0; parm_table[i].label; i++) {
-		if ((parm_table[i].type == P_STRING ||
-		     parm_table[i].type == P_USTRING) &&
-		    !(lp_ctx->flags[i] & FLAG_CMDLINE)) {
-			char **r;
-			if (parm_table[i].p_class == P_LOCAL) {
-				r = (char **)(((char *)lp_ctx->sDefault) + parm_table[i].offset);
-			} else {
-				r = (char **)(((char *)lp_ctx->globals) + parm_table[i].offset);
-			}
-			*r = talloc_strdup(lp_ctx, "");
-		}
-	}
-
-	logfile = talloc_asprintf(lp_ctx, "%s/log.samba", dyn_LOGFILEBASE);
-	lpcfg_do_global_parameter(lp_ctx, "log file", logfile);
-	talloc_free(logfile);
-
-	lpcfg_do_global_parameter(lp_ctx, "log level", "0");
-
-	lpcfg_do_global_parameter(lp_ctx, "share backend", "classic");
-
-	lpcfg_do_global_parameter(lp_ctx, "share backend", "classic");
-
-	lpcfg_do_global_parameter(lp_ctx, "server role", "standalone");
-
-	/* options that can be set on the command line must be initialised via
-	   the slower lpcfg_do_global_parameter() to ensure that FLAG_CMDLINE is obeyed */
-#ifdef TCP_NODELAY
-	lpcfg_do_global_parameter(lp_ctx, "socket options", "TCP_NODELAY");
-#endif
-	lpcfg_do_global_parameter(lp_ctx, "workgroup", DEFAULT_WORKGROUP);
-	myname = get_myname(lp_ctx);
-	lpcfg_do_global_parameter(lp_ctx, "netbios name", myname);
-	talloc_free(myname);
-	lpcfg_do_global_parameter(lp_ctx, "name resolve order", "wins host bcast");
-
-	lpcfg_do_global_parameter(lp_ctx, "fstype", "NTFS");
-
-	lpcfg_do_global_parameter(lp_ctx, "ntvfs handler", "unixuid default");
-	lpcfg_do_global_parameter(lp_ctx, "max connections", "-1");
-
-	lpcfg_do_global_parameter(lp_ctx, "dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup unixinfo browser eventlog6 backupkey");
-	lpcfg_do_global_parameter(lp_ctx, "server services", "smb rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd kcc dnsupdate");
-	lpcfg_do_global_parameter(lp_ctx, "ntptr providor", "simple_ldb");
-	/* the winbind method for domain controllers is for both RODC
-	   auth forwarding and for trusted domains */
-	lpcfg_do_global_parameter(lp_ctx, "private dir", dyn_PRIVATE_DIR);
-	lpcfg_do_global_parameter(lp_ctx, "spoolss database", "spoolss.ldb");
-	lpcfg_do_global_parameter(lp_ctx, "wins config database", "wins_config.ldb");
-	lpcfg_do_global_parameter(lp_ctx, "wins database", "wins.ldb");
-	lpcfg_do_global_parameter(lp_ctx, "registry:HKEY_LOCAL_MACHINE", "hklm.ldb");
-
-	/* This hive should be dynamically generated by Samba using
-	   data from the sam, but for the moment leave it in a tdb to
-	   keep regedt32 from popping up an annoying dialog. */
-	lpcfg_do_global_parameter(lp_ctx, "registry:HKEY_USERS", "hku.ldb");
-
-	/* using UTF8 by default allows us to support all chars */
-	lpcfg_do_global_parameter(lp_ctx, "unix charset", "UTF8");
-
-	/* Use codepage 850 as a default for the dos character set */
-	lpcfg_do_global_parameter(lp_ctx, "dos charset", "CP850");
-
-	/*
-	 * Allow the default PASSWD_CHAT to be overridden in local.h.
-	 */
-	lpcfg_do_global_parameter(lp_ctx, "passwd chat", DEFAULT_PASSWD_CHAT);
-
-	lpcfg_do_global_parameter(lp_ctx, "pid directory", dyn_PIDDIR);
-	lpcfg_do_global_parameter(lp_ctx, "lock dir", dyn_LOCKDIR);
-	lpcfg_do_global_parameter(lp_ctx, "state directory", dyn_STATEDIR);
-	lpcfg_do_global_parameter(lp_ctx, "cache directory", dyn_CACHEDIR);
-	lpcfg_do_global_parameter(lp_ctx, "ncalrpc dir", dyn_NCALRPCDIR);
-
-	lpcfg_do_global_parameter(lp_ctx, "socket address", "");
-	lpcfg_do_global_parameter_var(lp_ctx, "server string",
-				   "Samba %s", SAMBA_VERSION_STRING);
-
-	lpcfg_do_global_parameter(lp_ctx, "password server", "*");
-
-	lpcfg_do_global_parameter(lp_ctx, "max mux", "50");
-	lpcfg_do_global_parameter(lp_ctx, "max xmit", "12288");
-	lpcfg_do_global_parameter(lp_ctx, "password level", "0");
-	lpcfg_do_global_parameter(lp_ctx, "LargeReadwrite", "True");
-	lpcfg_do_global_parameter(lp_ctx, "server min protocol", "CORE");
-	lpcfg_do_global_parameter(lp_ctx, "server max protocol", "NT1");
-	lpcfg_do_global_parameter(lp_ctx, "client min protocol", "CORE");
-	lpcfg_do_global_parameter(lp_ctx, "client max protocol", "NT1");
-	lpcfg_do_global_parameter(lp_ctx, "security", "USER");
-	lpcfg_do_global_parameter(lp_ctx, "paranoid server security", "True");
-	lpcfg_do_global_parameter(lp_ctx, "EncryptPasswords", "True");
-	lpcfg_do_global_parameter(lp_ctx, "ReadRaw", "True");
-	lpcfg_do_global_parameter(lp_ctx, "WriteRaw", "True");
-	lpcfg_do_global_parameter(lp_ctx, "NullPasswords", "False");
-	lpcfg_do_global_parameter(lp_ctx, "ObeyPamRestrictions", "False");
-
-	lpcfg_do_global_parameter(lp_ctx, "TimeServer", "False");
-	lpcfg_do_global_parameter(lp_ctx, "BindInterfacesOnly", "False");
-	lpcfg_do_global_parameter(lp_ctx, "Unicode", "True");
-	lpcfg_do_global_parameter(lp_ctx, "ClientLanManAuth", "False");
-	lpcfg_do_global_parameter(lp_ctx, "ClientNTLMv2Auth", "True");
-	lpcfg_do_global_parameter(lp_ctx, "LanmanAuth", "False");
-	lpcfg_do_global_parameter(lp_ctx, "NTLMAuth", "True");
-	lpcfg_do_global_parameter(lp_ctx, "client use spnego principal", "False");
-
-	lpcfg_do_global_parameter(lp_ctx, "UnixExtensions", "False");
-
-	lpcfg_do_global_parameter(lp_ctx, "PreferredMaster", "Auto");
-	lpcfg_do_global_parameter(lp_ctx, "LocalMaster", "True");
-
-	lpcfg_do_global_parameter(lp_ctx, "wins support", "False");
-	lpcfg_do_global_parameter(lp_ctx, "dns proxy", "True");
-
-	lpcfg_do_global_parameter(lp_ctx, "winbind separator", "\\");
-	lpcfg_do_global_parameter(lp_ctx, "winbind sealed pipes", "True");
-	lpcfg_do_global_parameter(lp_ctx, "winbindd socket directory", dyn_WINBINDD_SOCKET_DIR);
-	lpcfg_do_global_parameter(lp_ctx, "winbindd privileged socket directory", dyn_WINBINDD_PRIVILEGED_SOCKET_DIR);
-	lpcfg_do_global_parameter(lp_ctx, "template shell", "/bin/false");
-	lpcfg_do_global_parameter(lp_ctx, "template homedir", "/home/%WORKGROUP%/%ACCOUNTNAME%");
-	lpcfg_do_global_parameter(lp_ctx, "idmap trusted only", "False");
-
-	lpcfg_do_global_parameter(lp_ctx, "client signing", "Yes");
-	lpcfg_do_global_parameter(lp_ctx, "server signing", "auto");
-
-	lpcfg_do_global_parameter(lp_ctx, "use spnego", "True");
-
-	lpcfg_do_global_parameter(lp_ctx, "smb ports", "445 139");
-	lpcfg_do_global_parameter(lp_ctx, "nbt port", "137");
-	lpcfg_do_global_parameter(lp_ctx, "dgram port", "138");
-	lpcfg_do_global_parameter(lp_ctx, "cldap port", "389");
-	lpcfg_do_global_parameter(lp_ctx, "krb5 port", "88");
-	lpcfg_do_global_parameter(lp_ctx, "kpasswd port", "464");
-	lpcfg_do_global_parameter(lp_ctx, "web port", "901");
-
-	lpcfg_do_global_parameter(lp_ctx, "nt status support", "True");
-
-	lpcfg_do_global_parameter(lp_ctx, "max wins ttl", "518400"); /* 6 days */
-	lpcfg_do_global_parameter(lp_ctx, "min wins ttl", "10");
-
-	lpcfg_do_global_parameter(lp_ctx, "tls enabled", "True");
-	lpcfg_do_global_parameter(lp_ctx, "tls keyfile", "tls/key.pem");
-	lpcfg_do_global_parameter(lp_ctx, "tls certfile", "tls/cert.pem");
-	lpcfg_do_global_parameter(lp_ctx, "tls cafile", "tls/ca.pem");
-	lpcfg_do_global_parameter(lp_ctx, "prefork children:smb", "4");
-
-	lpcfg_do_global_parameter(lp_ctx, "ntp signd socket directory", dyn_NTP_SIGND_SOCKET_DIR);
-	lpcfg_do_global_parameter(lp_ctx, "rndc command", "/usr/sbin/rndc");
-	lpcfg_do_global_parameter_var(lp_ctx, "dns update command", "%s/samba_dnsupdate", dyn_SCRIPTSBINDIR);
-	lpcfg_do_global_parameter_var(lp_ctx, "spn update command", "%s/samba_spnupdate", dyn_SCRIPTSBINDIR);
-	lpcfg_do_global_parameter(lp_ctx, "nsupdate command", "/usr/bin/nsupdate -g");
-
-	for (i = 0; parm_table[i].label; i++) {
-		if (!(lp_ctx->flags[i] & FLAG_CMDLINE)) {
-			lp_ctx->flags[i] |= FLAG_DEFAULT;
-		}
-	}
-
-	for (parm=lp_ctx->globals->param_opt; parm; parm=parm->next) {
-		if (!(parm->priority & FLAG_CMDLINE)) {
-			parm->priority |= FLAG_DEFAULT;
-		}
-	}
-
-	return lp_ctx;
-}
-
-/**
- * Initialise the global parameter structure.
- */
-struct loadparm_context *loadparm_init_global(bool load_default)
-{
-	if (global_loadparm_context == NULL) {
-		global_loadparm_context = loadparm_init(NULL);
-	}
-	if (global_loadparm_context == NULL) {
-		return NULL;
-	}
-	global_loadparm_context->global = true;
-	if (load_default && !global_loadparm_context->loaded) {
-		lpcfg_load_default(global_loadparm_context);
-	}
-	global_loadparm_context->refuse_free = true;
-	return global_loadparm_context;
-}
-
-/**
- * Initialise the global parameter structure.
- */
-struct loadparm_context *loadparm_init_s3(TALLOC_CTX *mem_ctx, 
-					  const struct loadparm_s3_context *s3_fns)
-{
-	struct loadparm_context *loadparm_context = loadparm_init(mem_ctx);
-	if (!loadparm_context) {
-		return NULL;
-	}
-	loadparm_context->s3_fns = s3_fns;
-	return loadparm_context;
-}
-
-const char *lpcfg_configfile(struct loadparm_context *lp_ctx)
-{
-	return lp_ctx->szConfigFile;
-}
-
-const char *lp_default_path(void)
-{
-    if (getenv("SMB_CONF_PATH"))
-        return getenv("SMB_CONF_PATH");
-    else
-        return dyn_CONFIGFILE;
-}
-
-/**
- * Update the internal state of a loadparm context after settings 
- * have changed.
- */
-static bool lpcfg_update(struct loadparm_context *lp_ctx)
-{
-	struct debug_settings settings;
-	lpcfg_add_auto_services(lp_ctx, lpcfg_auto_services(lp_ctx));
-
-	if (!lp_ctx->globals->szWINSservers && lp_ctx->globals->bWINSsupport) {
-		lpcfg_do_global_parameter(lp_ctx, "wins server", "127.0.0.1");
-	}
-
-	if (!lp_ctx->global) {
-		return true;
-	}
-
-	panic_action = lp_ctx->globals->panic_action;
-
-	reload_charcnv(lp_ctx);
-
-	ZERO_STRUCT(settings);
-	/* Add any more debug-related smb.conf parameters created in
-	 * future here */
-	settings.timestamp_logs = true;
-	debug_set_settings(&settings);
-
-	/* FIXME: This is a bit of a hack, but we can't use a global, since 
-	 * not everything that uses lp also uses the socket library */
-	if (lpcfg_parm_bool(lp_ctx, NULL, "socket", "testnonblock", false)) {
-		setenv("SOCKET_TESTNONBLOCK", "1", 1);
-	} else {
-		unsetenv("SOCKET_TESTNONBLOCK");
-	}
-
-	return true;
-}
-
-bool lpcfg_load_default(struct loadparm_context *lp_ctx)
-{
-    const char *path;
-
-    path = lp_default_path();
-
-    if (!file_exist(path)) {
-	    /* We allow the default smb.conf file to not exist, 
-	     * basically the equivalent of an empty file. */
-	    return lpcfg_update(lp_ctx);
-    }
-
-    return lpcfg_load(lp_ctx, path);
-}
-
-/**
- * Load the services array from the services file.
- *
- * Return True on success, False on failure.
- */
-bool lpcfg_load(struct loadparm_context *lp_ctx, const char *filename)
-{
-	char *n2;
-	bool bRetval;
-
-	filename = talloc_strdup(lp_ctx, filename);
-
-	lp_ctx->szConfigFile = filename;
-
-	if (lp_ctx->s3_fns) {
-		return lp_ctx->s3_fns->load(filename);
-	}
-
-	lp_ctx->bInGlobalSection = true;
-	n2 = standard_sub_basic(lp_ctx, lp_ctx->szConfigFile);
-	DEBUG(2, ("lpcfg_load: refreshing parameters from %s\n", n2));
-
-	add_to_file_list(lp_ctx, lp_ctx->szConfigFile, n2);
-
-	/* We get sections first, so have to start 'behind' to make up */
-	lp_ctx->currentService = NULL;
-	bRetval = pm_process(n2, do_section, do_parameter, lp_ctx);
-
-	/* finish up the last section */
-	DEBUG(4, ("pm_process() returned %s\n", BOOLSTR(bRetval)));
-	if (bRetval)
-		if (lp_ctx->currentService != NULL)
-			bRetval = service_ok(lp_ctx->currentService);
-
-	bRetval = bRetval && lpcfg_update(lp_ctx);
-
-	/* we do this unconditionally, so that it happens even
-	   for a missing smb.conf */
-	reload_charcnv(lp_ctx);
-
-	if (bRetval == true) {
-		/* set this up so that any child python tasks will
-		   find the right smb.conf */
-		setenv("SMB_CONF_PATH", filename, 1);
-
-		/* set the context used by the lp_*() function
-		   varients */
-		global_loadparm_context = lp_ctx;
-		lp_ctx->loaded = true;
-	}
-
-	return bRetval;
-}
-
-/**
- * Return the max number of services.
- */
-
-int lpcfg_numservices(struct loadparm_context *lp_ctx)
-{
-	if (lp_ctx->s3_fns) {
-		return lp_ctx->s3_fns->get_numservices();
-	}
-
-	return lp_ctx->iNumServices;
-}
-
-/**
- * Display the contents of the services array in human-readable form.
- */
-
-void lpcfg_dump(struct loadparm_context *lp_ctx, FILE *f, bool show_defaults,
-	     int maxtoprint)
-{
-	int iService;
-
-	if (lp_ctx->s3_fns) {
-		lp_ctx->s3_fns->dump(f, show_defaults, maxtoprint);
-		return;
-	}
-
-	defaults_saved = !show_defaults;
-
-	dump_globals(lp_ctx, f, show_defaults);
-
-	dump_a_service(lp_ctx->sDefault, lp_ctx->sDefault, f, lp_ctx->flags);
-
-	for (iService = 0; iService < maxtoprint; iService++)
-		lpcfg_dump_one(f, show_defaults, lp_ctx->services[iService], lp_ctx->sDefault);
-}
-
-/**
- * Display the contents of one service in human-readable form.
- */
-void lpcfg_dump_one(FILE *f, bool show_defaults, struct loadparm_service *service, struct loadparm_service *sDefault)
-{
-	if (service != NULL) {
-		if (service->szService[0] == '\0')
-			return;
-		dump_a_service(service, sDefault, f, NULL);
-	}
-}
-
-struct loadparm_service *lpcfg_servicebynum(struct loadparm_context *lp_ctx,
-					    int snum)
-{
-	if (lp_ctx->s3_fns) {
-		return lp_ctx->s3_fns->get_servicebynum(snum);
-	}
-
-	return lp_ctx->services[snum];
-}
-
-struct loadparm_service *lpcfg_service(struct loadparm_context *lp_ctx,
-				    const char *service_name)
-{
-	int iService;
-        char *serviceName;
-
-	if (lp_ctx->s3_fns) {
-		return lp_ctx->s3_fns->get_service(service_name);
-	}
-
-	for (iService = lp_ctx->iNumServices - 1; iService >= 0; iService--) {
-		if (lp_ctx->services[iService] &&
-		    lp_ctx->services[iService]->szService) {
-			/*
-			 * The substitution here is used to support %U is
-			 * service names
-			 */
-			serviceName = standard_sub_basic(
-					lp_ctx->services[iService],
-					lp_ctx->services[iService]->szService);
-			if (strequal(serviceName, service_name)) {
-				talloc_free(serviceName);
-				return lp_ctx->services[iService];
-			}
-			talloc_free(serviceName);
-		}
-	}
-
-	DEBUG(7,("lpcfg_servicenumber: couldn't find %s\n", service_name));
-	return NULL;
-}
-
-const char *lpcfg_servicename(const struct loadparm_service *service)
-{
-	return lp_string((const char *)service->szService);
-}
-
-/**
- * A useful volume label function.
- */
-const char *lpcfg_volume_label(struct loadparm_service *service, struct loadparm_service *sDefault)
-{
-	const char *ret;
-	ret = lp_string((const char *)((service != NULL && service->volume != NULL) ?
-				       service->volume : sDefault->volume));
-	if (!*ret)
-		return lpcfg_servicename(service);
-	return ret;
-}
-
-/**
- * If we are PDC then prefer us as DMB
- */
-const char *lpcfg_printername(struct loadparm_service *service, struct loadparm_service *sDefault)
-{
-	const char *ret;
-	ret = lp_string((const char *)((service != NULL && service->szPrintername != NULL) ?
-				       service->szPrintername : sDefault->szPrintername));
-	if (ret == NULL || (ret != NULL && *ret == '\0'))
-		ret = lpcfg_servicename(service);
-
-	return ret;
-}
-
-
-/**
- * Return the max print jobs per queue.
- */
-int lpcfg_maxprintjobs(struct loadparm_service *service, struct loadparm_service *sDefault)
-{
-	int maxjobs = (service != NULL) ? service->iMaxPrintJobs : sDefault->iMaxPrintJobs;
-	if (maxjobs <= 0 || maxjobs >= PRINT_MAX_JOBID)
-		maxjobs = PRINT_MAX_JOBID - 1;
-
-	return maxjobs;
-}
-
-struct smb_iconv_handle *lpcfg_iconv_handle(struct loadparm_context *lp_ctx)
-{
-	if (lp_ctx == NULL) {
-		return get_iconv_handle();
-	}
-	return lp_ctx->iconv_handle;
-}
-
-_PUBLIC_ void reload_charcnv(struct loadparm_context *lp_ctx)
-{
-	struct smb_iconv_handle *old_ic = lp_ctx->iconv_handle;
-	if (!lp_ctx->global) {
-		return;
-	}
-
-	if (old_ic == NULL) {
-		old_ic = global_iconv_handle;
-	}
-	lp_ctx->iconv_handle = smb_iconv_handle_reinit_lp(lp_ctx, lp_ctx, old_ic);
-	global_iconv_handle = lp_ctx->iconv_handle;
-}
 
 void lpcfg_smbcli_options(struct loadparm_context *lp_ctx,
 			 struct smbcli_options *options)
@@ -3763,31 +54,6 @@ void lpcfg_smbcli_session_options(struct loadparm_context *lp_ctx,
 	options->plaintext_auth = lpcfg_client_plaintext_auth(lp_ctx);
 }
 
-_PUBLIC_ char *lpcfg_tls_keyfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
-{
-	return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_keyfile);
-}
-
-_PUBLIC_ char *lpcfg_tls_certfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
-{
-	return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_certfile);
-}
-
-_PUBLIC_ char *lpcfg_tls_cafile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
-{
-	return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_cafile);
-}
-
-_PUBLIC_ char *lpcfg_tls_crlfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
-{
-	return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_crlfile);
-}
-
-_PUBLIC_ char *lpcfg_tls_dhpfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
-{
-	return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_dhpfile);
-}
-
 _PUBLIC_ struct dcerpc_server_info *lpcfg_dcerpc_server_info(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
 {
 	struct dcerpc_server_info *ret = talloc_zero(mem_ctx, struct dcerpc_server_info);
@@ -3800,14 +66,3 @@ _PUBLIC_ struct dcerpc_server_info *lpcfg_dcerpc_server_info(TALLOC_CTX *mem_ctx
 	return ret;
 }
 
-struct gensec_settings *lpcfg_gensec_settings(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
-{
-	struct gensec_settings *settings = talloc(mem_ctx, struct gensec_settings);
-	if (settings == NULL)
-		return NULL;
-	SMB_ASSERT(lp_ctx != NULL);
-	settings->lp_ctx = talloc_reference(settings, lp_ctx);
-	settings->target_hostname = lpcfg_parm_string(lp_ctx, NULL, "gensec", "target_hostname");
-	return settings;
-}
-
diff --git a/source4/param/param.h b/source4/param/param.h
deleted file mode 100644
index 3b9a75d65a..0000000000
--- a/source4/param/param.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Generic parameter parsing interface
-   Copyright (C) Jelmer Vernooij					  2005
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _PARAM_H /* _PARAM_H */
-#define _PARAM_H 
-
-struct loadparm_s3_context;
-
-struct parmlist_entry;
-
-struct param_context {
-	struct param_section *sections;
-};
-
-struct param_section {
-	const char *name;
-	struct param_section *prev, *next;
-	struct parmlist *parameters;
-};
-
-struct param_context;
-struct smbsrv_connection;
-
-#define Auto (2)
-
-#include "libds/common/roles.h"
-
-struct loadparm_context;
-struct loadparm_service;
-struct smbcli_options;
-struct smbcli_session_options;
-struct gensec_settings;
-
-#ifdef CONFIG_H_IS_FROM_SAMBA
-#include "param/param_proto.h"
-#endif
-
-const char **lpcfg_interfaces(struct loadparm_context *);
-const char *lpcfg_realm(struct loadparm_context *);
-const char *lpcfg_netbios_name(struct loadparm_context *);
-const char *lpcfg_private_dir(struct loadparm_context *);
-int lpcfg_server_role(struct loadparm_context *);
-
-void reload_charcnv(struct loadparm_context *lp_ctx);
-
-struct loadparm_service *lpcfg_default_service(struct loadparm_context *lp_ctx);
-
-
-char *lpcfg_tls_keyfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
-char *lpcfg_tls_certfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
-char *lpcfg_tls_cafile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
-char *lpcfg_tls_dhpfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
-char *lpcfg_tls_crlfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
-
-const char *lpcfg_servicename(const struct loadparm_service *service);
-
-
-const char *lpcfg_get_parametric(struct loadparm_context *lp_ctx,
-			      struct loadparm_service *service,
-			      const char *type, const char *option);
-
-const char *lpcfg_parm_string(struct loadparm_context *lp_ctx,
-			   struct loadparm_service *service, const char *type,
-			   const char *option);
-const char **lpcfg_parm_string_list(TALLOC_CTX *mem_ctx,
-				 struct loadparm_context *lp_ctx,
-				 struct loadparm_service *service,
-				 const char *type,
-				 const char *option, const char *separator);
-int lpcfg_parm_int(struct loadparm_context *lp_ctx,
-		struct loadparm_service *service, const char *type,
-		const char *option, int default_v);
-int lpcfg_parm_bytes(struct loadparm_context *lp_ctx,
-		  struct loadparm_service *service, const char *type,
-		  const char *option, int default_v);
-unsigned long lpcfg_parm_ulong(struct loadparm_context *lp_ctx,
-			    struct loadparm_service *service, const char *type,
-			    const char *option, unsigned long default_v);
-double lpcfg_parm_double(struct loadparm_context *lp_ctx,
-		      struct loadparm_service *service, const char *type,
-		      const char *option, double default_v);
-bool lpcfg_parm_bool(struct loadparm_context *lp_ctx,
-		     struct loadparm_service *service, const char *type,
-		     const char *option, bool default_v);
-struct loadparm_service *lpcfg_add_service(struct loadparm_context *lp_ctx,
-				     const struct loadparm_service *pservice,
-				     const char *name);
-bool lpcfg_add_home(struct loadparm_context *lp_ctx,
-		 const char *pszHomename,
-		 struct loadparm_service *default_service,
-		 const char *user, const char *pszHomedir);
-bool lpcfg_add_printer(struct loadparm_context *lp_ctx,
-		    const char *pszPrintername,
-		    struct loadparm_service *default_service);
-struct parm_struct *lpcfg_parm_struct(struct loadparm_context *lp_ctx, const char *name);
-void *lpcfg_parm_ptr(struct loadparm_context *lp_ctx,
-		  struct loadparm_service *service, struct parm_struct *parm);
-bool lpcfg_file_list_changed(struct loadparm_context *lp_ctx);
-
-bool lpcfg_do_global_parameter(struct loadparm_context *lp_ctx,
-			    const char *pszParmName, const char *pszParmValue);
-bool lpcfg_do_service_parameter(struct loadparm_context *lp_ctx,
-			     struct loadparm_service *service,
-			     const char *pszParmName, const char *pszParmValue);
-
-/**
- * Process a parameter.
- */
-bool lpcfg_do_global_parameter_var(struct loadparm_context *lp_ctx,
-				const char *pszParmName, const char *fmt, ...);
-bool lpcfg_set_cmdline(struct loadparm_context *lp_ctx, const char *pszParmName,
-		    const char *pszParmValue);
-bool lpcfg_set_option(struct loadparm_context *lp_ctx, const char *option);
-
-/**
- * Display the contents of a single services record.
- */
-bool lpcfg_dump_a_parameter(struct loadparm_context *lp_ctx,
-			 struct loadparm_service *service,
-			 const char *parm_name, FILE * f);
-
-/**
- * Return info about the next service  in a service. snum==-1 gives the globals.
- * Return NULL when out of parameters.
- */
-struct parm_struct *lpcfg_next_parameter(struct loadparm_context *lp_ctx, int snum, int *i,
-				      int allparameters);
-
-/**
- * Unload unused services.
- */
-void lpcfg_killunused(struct loadparm_context *lp_ctx,
-		   struct smbsrv_connection *smb,
-		   bool (*snumused) (struct smbsrv_connection *, int));
-
-/**
- * Initialise the global parameter structure.
- */
-struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx);
-struct loadparm_context *loadparm_init_global(bool load_default);
-const char *lpcfg_configfile(struct loadparm_context *lp_ctx);
-bool lpcfg_load_default(struct loadparm_context *lp_ctx);
-const char *lp_default_path(void);
-
-/**
- * Load the services array from the services file.
- *
- * Return True on success, False on failure.
- */
-bool lpcfg_load(struct loadparm_context *lp_ctx, const char *filename);
-
-/**
- * Return the max number of services.
- */
-int lpcfg_numservices(struct loadparm_context *lp_ctx);
-
-/**
- * Display the contents of the services array in human-readable form.
- */
-void lpcfg_dump(struct loadparm_context *lp_ctx, FILE *f, bool show_defaults,
-	     int maxtoprint);
-
-/**
- * Display the contents of one service in human-readable form.
- */
-void lpcfg_dump_one(FILE *f, bool show_defaults, struct loadparm_service *service, struct loadparm_service *sDefault);
-struct loadparm_service *lpcfg_servicebynum(struct loadparm_context *lp_ctx,
-					 int snum);
-struct loadparm_service *lpcfg_service(struct loadparm_context *lp_ctx,
-				    const char *service_name);
-
-/**
- * A useful volume label function.
- */
-const char *lp_cfg_volume_label(struct loadparm_service *service, struct loadparm_service *sDefault);
-
-/**
- * If we are PDC then prefer us as DMB
- */
-const char *lpcfg_printername(struct loadparm_service *service, struct loadparm_service *sDefault);
-
-/**
- * Return the max print jobs per queue.
- */
-int lpcfg_maxprintjobs(struct loadparm_service *service, struct loadparm_service *sDefault);
-struct smb_iconv_handle *lpcfg_iconv_handle(struct loadparm_context *lp_ctx);
-void lpcfg_smbcli_options(struct loadparm_context *lp_ctx,
-			 struct smbcli_options *options);
-void lpcfg_smbcli_session_options(struct loadparm_context *lp_ctx,
-				 struct smbcli_session_options *options);
-struct dcerpc_server_info *lpcfg_dcerpc_server_info(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
-struct gensec_settings *lpcfg_gensec_settings(TALLOC_CTX *, struct loadparm_context *);
-
-
-/* The following definitions come from param/generic.c  */
-
-struct param_section *param_get_section(struct param_context *ctx, const char *name);
-struct parmlist_entry *param_section_get(struct param_section *section, 
-				    const char *name);
-struct parmlist_entry *param_get (struct param_context *ctx, const char *name, const char *section_name);
-struct param_section *param_add_section(struct param_context *ctx, const char *section_name);
-struct parmlist_entry *param_get_add(struct param_context *ctx, const char *name, const char *section_name);
-const char *param_get_string(struct param_context *ctx, const char *param, const char *section);
-int param_set_string(struct param_context *ctx, const char *param, const char *value, const char *section);
-const char **param_get_string_list(struct param_context *ctx, const char *param, const char *separator, const char *section);
-int param_set_string_list(struct param_context *ctx, const char *param, const char **list, const char *section);
-int param_get_int(struct param_context *ctx, const char *param, int default_v, const char *section);
-void param_set_int(struct param_context *ctx, const char *param, int value, const char *section);
-unsigned long param_get_ulong(struct param_context *ctx, const char *param, unsigned long default_v, const char *section);
-void param_set_ulong(struct param_context *ctx, const char *name, unsigned long value, const char *section);
-struct param_context *param_init(TALLOC_CTX *mem_ctx);
-int param_read(struct param_context *ctx, const char *fn);
-int param_use(struct loadparm_context *lp_ctx, struct param_context *ctx);
-int param_write(struct param_context *ctx, const char *fn);
-
-/* The following definitions come from param/util.c  */
-
-
-/**
- * @file
- * @brief Misc utility functions
- */
-bool lpcfg_is_mydomain(struct loadparm_context *lp_ctx,
-			     const char *domain);
-
-bool lpcfg_is_my_domain_or_realm(struct loadparm_context *lp_ctx,
-			      const char *domain);
-
-/**
-  see if a string matches either our primary or one of our secondary 
-  netbios aliases. do a case insensitive match
-*/
-bool lpcfg_is_myname(struct loadparm_context *lp_ctx, const char *name);
-
-/**
- A useful function for returning a path in the Samba lock directory.
-**/
-char *lpcfg_lock_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
-			 const char *name);
-
-/**
- * @brief Returns an absolute path to a file in the directory containing the current config file
- *
- * @param name File to find, relative to the config file directory.
- *
- * @retval Pointer to a talloc'ed string containing the full path.
- **/
-char *lpcfg_config_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
-			   const char *name);
-
-/**
- * @brief Returns an absolute path to a file in the Samba private directory.
- *
- * @param name File to find, relative to PRIVATEDIR.
- * if name is not relative, then use it as-is
- *
- * @retval Pointer to a talloc'ed string containing the full path.
- **/
-char *lpcfg_private_path(TALLOC_CTX* mem_ctx,
-			    struct loadparm_context *lp_ctx,
-			    const char *name);
-
-/**
-  return a path in the smbd.tmp directory, where all temporary file
-  for smbd go. If NULL is passed for name then return the directory 
-  path itself
-*/
-char *smbd_tmp_path(TALLOC_CTX *mem_ctx, 
-			     struct loadparm_context *lp_ctx,
-			     const char *name);
-
-const char *lpcfg_imessaging_path(TALLOC_CTX *mem_ctx,
-				       struct loadparm_context *lp_ctx);
-struct smb_iconv_handle *smb_iconv_handle_reinit_lp(TALLOC_CTX *mem_ctx,
-							      struct loadparm_context *lp_ctx,
-							      struct smb_iconv_handle *old_ic);
-
-const char *lpcfg_sam_name(struct loadparm_context *lp_ctx);
-
-/* The following definitions come from lib/version.c  */
-
-const char *samba_version_string(void);
-
-
-#endif /* _PARAM_H */
diff --git a/source4/param/samba-hostconfig.pc.in b/source4/param/samba-hostconfig.pc.in
deleted file mode 100644
index 307f27ba94..0000000000
--- a/source4/param/samba-hostconfig.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: samba-hostconfig
-Description: Host-wide Samba configuration
-Version: @PACKAGE_VERSION@
-Libs: @LIB_RPATH@ -L${libdir} -lsamba-hostconfig
-Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1
diff --git a/source4/param/util.c b/source4/param/util.c
deleted file mode 100644
index 472096f60d..0000000000
--- a/source4/param/util.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Samba utility functions
-   Copyright (C) Andrew Tridgell 1992-1998
-   Copyright (C) Jeremy Allison 2001-2002
-   Copyright (C) Simo Sorce 2001
-   Copyright (C) Jim McDonough (jmcd@us.ibm.com)  2003.
-   Copyright (C) James J Myers 2003
-   Copyright (C) Jelmer Vernooij 2005-2007
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "dynconfig/dynconfig.h"
-#include "system/network.h"
-#include "system/filesys.h"
-#include "system/dir.h"
-#include "param/param.h"
-
-/**
- * @file
- * @brief Misc utility functions
- */
-
-
-bool lpcfg_is_mydomain(struct loadparm_context *lp_ctx,
-			     const char *domain)
-{
-	return strequal(lpcfg_workgroup(lp_ctx), domain);
-}
-
-bool lpcfg_is_my_domain_or_realm(struct loadparm_context *lp_ctx,
-			     const char *domain)
-{
-	return strequal(lpcfg_workgroup(lp_ctx), domain) ||
-		strequal(lpcfg_realm(lp_ctx), domain);
-}
-
-/**
-  see if a string matches either our primary or one of our secondary 
-  netbios aliases. do a case insensitive match
-*/
-bool lpcfg_is_myname(struct loadparm_context *lp_ctx, const char *name)
-{
-	const char **aliases;
-	int i;
-
-	if (strcasecmp(name, lpcfg_netbios_name(lp_ctx)) == 0) {
-		return true;
-	}
-
-	aliases = lpcfg_netbios_aliases(lp_ctx);
-	for (i=0; aliases && aliases[i]; i++) {
-		if (strcasecmp(name, aliases[i]) == 0) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-
-/**
- A useful function for returning a path in the Samba lock directory.
-**/
-char *lpcfg_lock_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
-			 const char *name)
-{
-	char *fname, *dname;
-	if (name == NULL) {
-		return NULL;
-	}
-	if (name[0] == 0 || name[0] == '/' || strstr(name, ":/")) {
-		return talloc_strdup(mem_ctx, name);
-	}
-
-	dname = talloc_strdup(mem_ctx, lpcfg_lockdir(lp_ctx));
-	trim_string(dname,"","/");
-	
-	if (!directory_exist(dname)) {
-		mkdir(dname,0755);
-	}
-	
-	fname = talloc_asprintf(mem_ctx, "%s/%s", dname, name);
-
-	talloc_free(dname);
-
-	return fname;
-}
-
-/**
- A useful function for returning a path in the Samba state directory.
-**/
-char *lpcfg_state_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
-		       const char *name)
-{
-	char *fname, *dname;
-	if (name == NULL) {
-		return NULL;
-	}
-	if (name[0] == 0 || name[0] == '/' || strstr(name, ":/")) {
-		return talloc_strdup(mem_ctx, name);
-	}
-
-	dname = talloc_strdup(mem_ctx, lpcfg_statedir(lp_ctx));
-	trim_string(dname,"","/");
-
-	if (!directory_exist(dname)) {
-		mkdir(dname,0755);
-	}
-
-	fname = talloc_asprintf(mem_ctx, "%s/%s", dname, name);
-
-	talloc_free(dname);
-
-	return fname;
-}
-
-/**
- A useful function for returning a path in the Samba cache directory.
-**/
-char *lpcfg_cache_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
-		       const char *name)
-{
-	char *fname, *dname;
-	if (name == NULL) {
-		return NULL;
-	}
-	if (name[0] == 0 || name[0] == '/' || strstr(name, ":/")) {
-		return talloc_strdup(mem_ctx, name);
-	}
-
-	dname = talloc_strdup(mem_ctx, lpcfg_cachedir(lp_ctx));
-	trim_string(dname,"","/");
-
-	if (!directory_exist(dname)) {
-		mkdir(dname,0755);
-	}
-
-	fname = talloc_asprintf(mem_ctx, "%s/%s", dname, name);
-
-	talloc_free(dname);
-
-	return fname;
-}
-
-/**
- * @brief Returns an absolute path to a file in the directory containing the current config file
- *
- * @param name File to find, relative to the config file directory.
- *
- * @retval Pointer to a talloc'ed string containing the full path.
- **/
-
-char *lpcfg_config_path(TALLOC_CTX* mem_ctx, struct loadparm_context *lp_ctx,
-			   const char *name)
-{
-	char *fname, *config_dir, *p;
-	config_dir = talloc_strdup(mem_ctx, lpcfg_configfile(lp_ctx));
-	if (config_dir == NULL) {
-		config_dir = talloc_strdup(mem_ctx, lp_default_path());
-	}
-	p = strrchr(config_dir, '/');
-	if (p == NULL) {
-		talloc_free(config_dir);
-		config_dir = talloc_strdup(mem_ctx, ".");
-		if (config_dir == NULL) {
-			return NULL;
-		}
-	} else {
-		p[0] = '\0';
-	}
-	fname = talloc_asprintf(mem_ctx, "%s/%s", config_dir, name);
-	talloc_free(config_dir);
-	return fname;
-}
-
-/**
- * @brief Returns an absolute path to a file in the Samba private directory.
- *
- * @param name File to find, relative to PRIVATEDIR.
- * if name is not relative, then use it as-is
- *
- * @retval Pointer to a talloc'ed string containing the full path.
- **/
-char *lpcfg_private_path(TALLOC_CTX* mem_ctx,
-			    struct loadparm_context *lp_ctx,
-			    const char *name)
-{
-	char *fname;
-	if (name == NULL) {
-		return NULL;
-	}
-	if (name[0] == 0 || name[0] == '/' || strstr(name, ":/")) {
-		return talloc_strdup(mem_ctx, name);
-	}
-	fname = talloc_asprintf(mem_ctx, "%s/%s", lpcfg_private_dir(lp_ctx), name);
-	return fname;
-}
-
-/**
-  return a path in the smbd.tmp directory, where all temporary file
-  for smbd go. If NULL is passed for name then return the directory 
-  path itself
-*/
-char *smbd_tmp_path(TALLOC_CTX *mem_ctx, 
-			     struct loadparm_context *lp_ctx,
-			     const char *name)
-{
-	char *fname, *dname;
-
-	dname = lpcfg_private_path(mem_ctx, lp_ctx, "smbd.tmp");
-	if (!directory_exist(dname)) {
-		mkdir(dname,0755);
-	}
-
-	if (name == NULL) {
-		return dname;
-	}
-
-	fname = talloc_asprintf(mem_ctx, "%s/%s", dname, name);
-	talloc_free(dname);
-
-	return fname;
-}
-
-const char *lpcfg_imessaging_path(TALLOC_CTX *mem_ctx,
-				       struct loadparm_context *lp_ctx)
-{
-	return smbd_tmp_path(mem_ctx, lp_ctx, "msg");
-}
-
-struct smb_iconv_handle *smb_iconv_handle_reinit_lp(TALLOC_CTX *mem_ctx,
-							      struct loadparm_context *lp_ctx,
-							      struct smb_iconv_handle *old_ic)
-{
-	return smb_iconv_handle_reinit(mem_ctx, lpcfg_dos_charset(lp_ctx),
-				       lpcfg_unix_charset(lp_ctx),
-				       true,
-				       old_ic);
-}
-
-
-const char *lpcfg_sam_name(struct loadparm_context *lp_ctx)
-{
-	switch (lpcfg_server_role(lp_ctx)) {
-	case ROLE_DOMAIN_BDC:
-	case ROLE_DOMAIN_PDC:
-		return lpcfg_workgroup(lp_ctx);
-	default:
-		return lpcfg_netbios_name(lp_ctx);
-	}
-}
-
diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index 91e128f916..80b2758766 100644
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -1,27 +1,5 @@
 #!/usr/bin/env python
 
-bld.SAMBA_GENERATOR('s3_param_h',
-                    source= 'loadparm.c ../script/mks3param.pl',
-                    target='s3_param.h',
-                    rule='${PERL} ${SRC[1].abspath(env)} ${SRC[0].abspath(env)} --file ${TGT}')
-
-bld.SAMBA_GENERATOR('param_global_h',
-                    source= 'loadparm.c ../../script/mkparamdefs.pl',
-                    target='param_global.h',
-                    rule='${PERL} ${SRC[1].abspath(env)} ${SRC[0].abspath(env)} --file ${TGT} --generate-scope=GLOBAL')
-
-bld.SAMBA_LIBRARY('samba-hostconfig',
-	source='loadparm.c generic.c util.c',
-	pc_files='samba-hostconfig.pc',
-	vnum='0.0.1',
-	deps='DYNCONFIG',
-	public_deps='samba-util param_local_h',
-	public_headers='param.h',
-	autoproto='param_proto.h',
-	autoproto_extra_source='../../lib/param/param_functions.c'
-	)
-
-
 bld.SAMBA_SUBSYSTEM('PROVISION',
 	source='provision.c pyparam.c',
 	deps='LIBPYTHON pyparam_util ldb pytalloc-util pyldb-util',
@@ -64,6 +42,10 @@ bld.SAMBA_PYTHON('pyparam',
 	realname='samba/param.so'
 	)
 
+bld.SAMBA_SUBSYSTEM('param_options',
+	source='loadparm.c',
+	deps='samba-hostconfig')
+
 
 bld.SAMBA_SUBSYSTEM('pyparam_util',
 	source='pyparam_util.c',