Changeset 740 for vendor/current/source4/param

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source4/param

Files:

• config.mk (deleted)
• generic.c (modified) (2 diffs)
• loadparm.c (modified) (94 diffs)
• loadparm.h (modified) (1 diff)
• param.h (modified) (14 diffs)
• provision.c (modified) (10 diffs)
• provision.h (modified) (2 diffs)
• pyparam.c (modified) (21 diffs)
• pyparam.h (modified) (1 diff)
• pyparam_util.c (modified) (1 diff)
• samba-hostconfig.pc.in (modified) (1 diff)
• secrets.c (modified) (6 diffs)
• secrets.h (modified) (2 diffs)
• share.c (modified) (1 diff)
• share.h (modified) (1 diff)
• share_classic.c (modified) (16 diffs)
• share_ldb.c (modified) (2 diffs)
• tests/bindings.py (deleted)
• tests/loadparm.c (modified) (14 diffs)
• tests/share.c (modified) (2 diffs)
• util.c (modified) (8 diffs)
• wscript_build (added)

vendor/current/source4/param/generic.c

@@ -19 +19 @@
 #include "includes.h"
 #include "../lib/util/dlinklist.h"
+#include "../lib/util/parmlist.h"
 #include "param/param.h"
 #include "param/loadparm.h"
@@ -233 +234 @@
                 for (param = section->parameters->entries; param; param = param->next) {
                         if (isglobal)
-                                lp_do_global_parameter(lp_ctx, param->key,
+                                lpcfg_do_global_parameter(lp_ctx, param->key,
                                                        param->value);
                         else {
                                 struct loadparm_service *service = 
-                                                        lp_service(lp_ctx, section->name);
+                                                        lpcfg_service(lp_ctx, section->name);
                                 if (service == NULL)
-                                        service = lp_add_service(lp_ctx, lp_default_service(lp_ctx), section->name);
-                                lp_do_service_parameter(lp_ctx, service, param->key, param->value);
+                                        service = lpcfg_add_service(lp_ctx, lpcfg_default_service(lp_ctx), section->name);
+                                lpcfg_do_service_parameter(lp_ctx, service, param->key, param->value);
                         }
                 }

vendor/current/source4/param/loadparm.c

@@ -62 +62 @@
 #include "libcli/raw/signing.h"
 #include "../lib/util/dlinklist.h"
+#include "../lib/util/parmlist.h"
 #include "param/param.h"
 #include "param/loadparm.h"
@@ -80 +81 @@
 {
         enum server_role server_role;
+        enum sid_generator sid_generator;
 
         const char **smb_ports;
@@ -89 +91 @@
         char *szModulesDir;
         char *szPidDir;
-        char *szSetupDir;
         char *szServerString;
         char *szAutoServices;
@@ -104 +105 @@
         char *szSocketOptions;
         char *szRealm;
+        char *szRealm_upper;
+        char *szRealm_lower;
         const char **szWINSservers;
         const char **szInterfaces;
@@ -124 +127 @@
         int bWinbindSealedPipes;
         int bIdmapTrustedOnly;
-        char *swat_directory;
         int tls_enabled;
         char *tls_keyfile;
@@ -132 +134 @@
         char *tls_dhpfile;
         char *logfile;
+        char *loglevel;
         char *panic_action;
         int max_mux;
@@ -183 +186 @@
         int bRpcBigEndian;
         char *szNTPSignDSocketDirectory;
+        const char **szRNDCCommand;
+        const char **szDNSUpdateCommand;
+        const char **szSPNUpdateCommand;
+        const char **szNSUpdateCommand;
         struct parmlist_entry *param_opt;
 };
@@ -235 +242 @@
 static bool handle_include(struct loadparm_context *lp_ctx,
                            const char *pszParmValue, char **ptr);
+static bool handle_realm(struct loadparm_context *lp_ctx,
+                         const char *pszParmValue, char **ptr);
 static bool handle_copy(struct loadparm_context *lp_ctx,
                         const char *pszParmValue, char **ptr);
@@ -325 +334 @@
 };
 
+static const struct enum_list enum_sid_generator[] = {
+        {SID_GENERATOR_INTERNAL, "internal"},
+        {SID_GENERATOR_BACKEND, "backend"},
+        {-1, NULL}
+};
 
 #define GLOBAL_VAR(name) offsetof(struct loadparm_global, name)
@@ -331 +345 @@
 static struct parm_struct parm_table[] = {
         {"server role", P_ENUM, P_GLOBAL, GLOBAL_VAR(server_role), NULL, enum_server_role},
+        {"sid generator", P_ENUM, P_GLOBAL, GLOBAL_VAR(sid_generator), NULL, enum_sid_generator},
 
         {"dos charset", P_STRING, P_GLOBAL, GLOBAL_VAR(dos_charset), NULL, NULL},
@@ -340 +355 @@
         {"directory", P_STRING, P_LOCAL, LOCAL_VAR(szPath), NULL, NULL},
         {"workgroup", P_USTRING, P_GLOBAL, GLOBAL_VAR(szWorkgroup), NULL, NULL},
-        {"realm", P_STRING, P_GLOBAL, GLOBAL_VAR(szRealm), NULL, NULL},
+        {"realm", P_STRING, P_GLOBAL, GLOBAL_VAR(szRealm), handle_realm, NULL},
         {"netbios name", P_USTRING, P_GLOBAL, GLOBAL_VAR(szNetbiosName), NULL, NULL},
         {"netbios aliases", P_LIST, P_GLOBAL, GLOBAL_VAR(szNetbiosAliases), NULL, NULL},
@@ -383 +398 @@
         {"hosts deny", P_LIST, P_LOCAL, LOCAL_VAR(szHostsdeny), NULL, NULL},
 
-        {"log level", P_INTEGER, P_GLOBAL, GLOBAL_VAR(debuglevel), handle_debuglevel, NULL},
-        {"debuglevel", P_INTEGER, P_GLOBAL, GLOBAL_VAR(debuglevel), handle_debuglevel, NULL},
+        {"log level", P_STRING, P_GLOBAL, GLOBAL_VAR(loglevel), handle_debuglevel, NULL},
+        {"debuglevel", P_STRING, P_GLOBAL, GLOBAL_VAR(loglevel), handle_debuglevel, NULL},
         {"log file", P_STRING, P_GLOBAL, GLOBAL_VAR(logfile), handle_logfile, NULL},
 
@@ -400 +415 @@
         {"tls crlfile", P_STRING, P_GLOBAL, GLOBAL_VAR(tls_crlfile), NULL, NULL},
         {"tls dh params file", P_STRING, P_GLOBAL, GLOBAL_VAR(tls_dhpfile), NULL, NULL},
-        {"swat directory", P_STRING, P_GLOBAL, GLOBAL_VAR(swat_directory), NULL, NULL},
         {"large readwrite", P_BOOL, P_GLOBAL, GLOBAL_VAR(bLargeReadwrite), NULL, NULL},
         {"server max protocol", P_ENUM, P_GLOBAL, GLOBAL_VAR(srv_maxprotocol), NULL, enum_protocol},
@@ -469 +483 @@
         {"modules dir", P_STRING, P_GLOBAL, GLOBAL_VAR(szModulesDir), NULL, NULL},
         {"pid directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szPidDir), NULL, NULL}, 
-        {"setup directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szSetupDir), NULL, NULL},
 
         {"socket address", P_STRING, P_GLOBAL, GLOBAL_VAR(szSocketAddress), NULL, NULL},
@@ -492 +505 @@
 
         {"ntp signd socket directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szNTPSignDSocketDirectory), NULL, NULL },
+        {"rndc command", P_CMDLIST, P_GLOBAL, GLOBAL_VAR(szRNDCCommand), NULL, NULL },
+        {"dns update command", P_CMDLIST, P_GLOBAL, GLOBAL_VAR(szDNSUpdateCommand), NULL, NULL },
+        {"spn update command", P_CMDLIST, P_GLOBAL, GLOBAL_VAR(szSPNUpdateCommand), NULL, NULL },
+        {"nsupdate command", P_CMDLIST, P_GLOBAL, GLOBAL_VAR(szNSUpdateCommand), NULL, NULL },
 
         {NULL, P_BOOL, P_NONE, 0, NULL, NULL}
@@ -503 +520 @@
         struct loadparm_service **services;
         struct loadparm_service *sDefault;
+        struct smb_iconv_convenience *iconv_convenience;
         int iNumServices;
         struct loadparm_service *currentService;
@@ -513 +531 @@
         } *file_lists;
         unsigned int flags[NUMPARAMETERS];
-        struct smb_iconv_convenience *iconv_convenience;
+        bool loaded;
+        bool refuse_free;
 };
 
 
-struct loadparm_service *lp_default_service(struct loadparm_context *lp_ctx)
+struct loadparm_service *lpcfg_default_service(struct loadparm_context *lp_ctx)
 {
         return lp_ctx->sDefault;
@@ -525 +544 @@
   return the parameter table
 */
-struct parm_struct *lp_parm_table(void)
+struct parm_struct *lpcfg_parm_table(void)
 {
         return parm_table;
@@ -584 +603 @@
 */
 
+/*
+ * 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) \
- const char *fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name ? lp_string(lp_ctx->globals->var_name) : "";}
+ _PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name ? lp_string(lp_ctx->globals->var_name) : "";}
+
 #define FN_GLOBAL_CONST_STRING(fn_name,var_name) \
- const char *fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name ? lp_ctx->globals->var_name : "";}
+ _PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name ? lp_ctx->globals->var_name : "";}
+
 #define FN_GLOBAL_LIST(fn_name,var_name) \
- const char **fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name;}
+ _PUBLIC_ const char **lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return NULL; return lp_ctx->globals->var_name;}
+
 #define FN_GLOBAL_BOOL(fn_name,var_name) \
- bool fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return false; return lp_ctx->globals->var_name;}
-#if 0 /* unused */
-#define FN_GLOBAL_CHAR(fn_name,ptr) \
- char fn_name(void) {return(*(char *)(ptr));}
-#endif
+ _PUBLIC_ bool lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return false; return lp_ctx->globals->var_name;}
+
 #define FN_GLOBAL_INTEGER(fn_name,var_name) \
- int fn_name(struct loadparm_context *lp_ctx) {return lp_ctx->globals->var_name;}
+ _PUBLIC_ int lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {return lp_ctx->globals->var_name;}
 
 #define FN_LOCAL_STRING(fn_name,val) \
- const char *fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return(lp_string((const char *)((service != NULL && service->val != NULL) ? service->val : sDefault->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_LIST(fn_name,val) \
- const char **fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return(const char **)(service != NULL && service->val != NULL? service->val : sDefault->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_BOOL(fn_name,val) \
- bool fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return((service != NULL)? service->val : sDefault->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) \
- int fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return((service != NULL)? service->val : sDefault->val);}
-
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_server_role, server_role)
-_PUBLIC_ FN_GLOBAL_LIST(lp_smb_ports, smb_ports)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_nbt_port, nbt_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_dgram_port, dgram_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_cldap_port, cldap_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_krb5_port, krb5_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_kpasswd_port, kpasswd_port)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_web_port, web_port)
-_PUBLIC_ FN_GLOBAL_STRING(lp_swat_directory, swat_directory)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_tls_enabled, tls_enabled)
-_PUBLIC_ FN_GLOBAL_STRING(lp_share_backend, szShareBackend)
-_PUBLIC_ FN_GLOBAL_STRING(lp_sam_url, szSAM_URL)
-_PUBLIC_ FN_GLOBAL_STRING(lp_idmap_url, szIDMAP_URL)
-_PUBLIC_ FN_GLOBAL_STRING(lp_secrets_url, szSECRETS_URL)
-_PUBLIC_ FN_GLOBAL_STRING(lp_spoolss_url, szSPOOLSS_URL)
-_PUBLIC_ FN_GLOBAL_STRING(lp_wins_config_url, szWINS_CONFIG_URL)
-_PUBLIC_ FN_GLOBAL_STRING(lp_wins_url, szWINS_URL)
-_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_winbind_separator, szWinbindSeparator)
-_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_winbindd_socket_directory, szWinbinddSocketDirectory)
-_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_winbindd_privileged_socket_directory, szWinbinddPrivilegedSocketDirectory)
-_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_template_shell, szTemplateShell)
-_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_template_homedir, szTemplateHomedir)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_winbind_sealed_pipes, bWinbindSealedPipes)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_idmap_trusted_only, bIdmapTrustedOnly)
-_PUBLIC_ FN_GLOBAL_STRING(lp_private_dir, szPrivateDir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_serverstring, szServerString)
-_PUBLIC_ FN_GLOBAL_STRING(lp_lockdir, szLockDir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_modulesdir, szModulesDir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_setupdir, szSetupDir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_ncalrpc_dir, ncalrpc_dir)
-_PUBLIC_ FN_GLOBAL_STRING(lp_dos_charset, dos_charset)
-_PUBLIC_ FN_GLOBAL_STRING(lp_unix_charset, unix_charset)
-_PUBLIC_ FN_GLOBAL_STRING(lp_display_charset, display_charset)
-_PUBLIC_ FN_GLOBAL_STRING(lp_piddir, szPidDir)
-_PUBLIC_ FN_GLOBAL_LIST(lp_dcerpc_endpoint_servers, dcerpc_ep_servers)
-_PUBLIC_ FN_GLOBAL_LIST(lp_server_services, server_services)
-_PUBLIC_ FN_GLOBAL_STRING(lp_ntptr_providor, ntptr_providor)
-_PUBLIC_ FN_GLOBAL_STRING(lp_auto_services, szAutoServices)
-_PUBLIC_ FN_GLOBAL_STRING(lp_passwd_chat, szPasswdChat)
-_PUBLIC_ FN_GLOBAL_LIST(lp_passwordserver, szPasswordServers)
-_PUBLIC_ FN_GLOBAL_LIST(lp_name_resolve_order, szNameResolveOrder)
-_PUBLIC_ FN_GLOBAL_STRING(lp_realm, szRealm)
-_PUBLIC_ FN_GLOBAL_STRING(lp_socket_options, socket_options)
-_PUBLIC_ FN_GLOBAL_STRING(lp_workgroup, szWorkgroup)
-_PUBLIC_ FN_GLOBAL_STRING(lp_netbios_name, szNetbiosName)
-_PUBLIC_ FN_GLOBAL_STRING(lp_netbios_scope, szNetbiosScope)
-_PUBLIC_ FN_GLOBAL_LIST(lp_wins_server_list, szWINSservers)
-_PUBLIC_ FN_GLOBAL_LIST(lp_interfaces, szInterfaces)
-_PUBLIC_ FN_GLOBAL_STRING(lp_socket_address, szSocketAddress)
-_PUBLIC_ FN_GLOBAL_LIST(lp_netbios_aliases, szNetbiosAliases)
-
-_PUBLIC_ FN_GLOBAL_BOOL(lp_disable_netbios, bDisableNetbios)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_wins_support, bWINSsupport)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_wins_dns_proxy, bWINSdnsProxy)
-_PUBLIC_ FN_GLOBAL_STRING(lp_wins_hook, szWINSHook)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_local_master, bLocalMaster)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_readraw, bReadRaw)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_large_readwrite, bLargeReadwrite)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_writeraw, bWriteRaw)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_null_passwords, bNullPasswords)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_obey_pam_restrictions, bObeyPamRestrictions)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_encrypted_passwords, bEncryptPasswords)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_time_server, bTimeServer)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_bind_interfaces_only, bBindInterfacesOnly)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_unicode, bUnicode)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_nt_status_support, bNTStatusSupport)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_lanman_auth, bLanmanAuth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_ntlm_auth, bNTLMAuth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_client_plaintext_auth, bClientPlaintextAuth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_client_lanman_auth, bClientLanManAuth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_client_ntlmv2_auth, bClientNTLMv2Auth)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_client_use_spnego_principal, client_use_spnego_principal)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_host_msdfs, bHostMSDfs)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_unix_extensions, bUnixExtensions)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_use_spnego, bUseSpnego)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_rpc_big_endian, bRpcBigEndian)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_max_wins_ttl, max_wins_ttl)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_min_wins_ttl, min_wins_ttl)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_maxmux, max_mux)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_max_xmit, max_xmit)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_passwordlevel, pwordlevel)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_srv_maxprotocol, srv_maxprotocol)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_srv_minprotocol, srv_minprotocol)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_maxprotocol, cli_maxprotocol)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_minprotocol, cli_minprotocol)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_security, security)
-_PUBLIC_ FN_GLOBAL_BOOL(lp_paranoid_server_security, paranoid_server_security)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_announce_as, announce_as)
-const char *lp_servicename(const struct loadparm_service *service)
-{
-        return lp_string((const char *)service->szService);
-}
-
-_PUBLIC_ FN_LOCAL_STRING(lp_pathname, szPath)
-static FN_LOCAL_STRING(_lp_printername, szPrintername)
-_PUBLIC_ FN_LOCAL_LIST(lp_hostsallow, szHostsallow)
-_PUBLIC_ FN_LOCAL_LIST(lp_hostsdeny, szHostsdeny)
-_PUBLIC_ FN_LOCAL_STRING(lp_comment, comment)
-_PUBLIC_ FN_LOCAL_STRING(lp_fstype, fstype)
-static FN_LOCAL_STRING(lp_volume, volume)
-_PUBLIC_ FN_LOCAL_LIST(lp_ntvfs_handler, ntvfs_handler)
-_PUBLIC_ FN_LOCAL_BOOL(lp_msdfs_root, bMSDfsRoot)
-_PUBLIC_ FN_LOCAL_BOOL(lp_browseable, bBrowseable)
-_PUBLIC_ FN_LOCAL_BOOL(lp_readonly, bRead_only)
-_PUBLIC_ FN_LOCAL_BOOL(lp_print_ok, bPrint_ok)
-_PUBLIC_ FN_LOCAL_BOOL(lp_map_hidden, bMap_hidden)
-_PUBLIC_ FN_LOCAL_BOOL(lp_map_archive, bMap_archive)
-_PUBLIC_ FN_LOCAL_BOOL(lp_strict_locking, bStrictLocking)
-_PUBLIC_ FN_LOCAL_BOOL(lp_oplocks, bOplocks)
-_PUBLIC_ FN_LOCAL_BOOL(lp_strict_sync, bStrictSync)
-_PUBLIC_ FN_LOCAL_BOOL(lp_ci_filesystem, bCIFileSystem)
-_PUBLIC_ FN_LOCAL_BOOL(lp_map_system, bMap_system)
-_PUBLIC_ FN_LOCAL_INTEGER(lp_max_connections, iMaxConnections)
-_PUBLIC_ FN_LOCAL_INTEGER(lp_csc_policy, iCSCPolicy)
-_PUBLIC_ FN_LOCAL_INTEGER(lp_create_mask, iCreate_mask)
-_PUBLIC_ FN_LOCAL_INTEGER(lp_force_create_mode, iCreate_force_mode)
-_PUBLIC_ FN_LOCAL_INTEGER(lp_dir_mask, iDir_mask)
-_PUBLIC_ FN_LOCAL_INTEGER(lp_force_dir_mode, iDir_force_mode)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_server_signing, server_signing)
-_PUBLIC_ FN_GLOBAL_INTEGER(lp_client_signing, client_signing)
-
-_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_ntp_signd_socket_directory, szNTPSignDSocketDirectory)
+ _PUBLIC_ int lpcfg_ ## fn_name(struct loadparm_service *service, struct loadparm_service *sDefault) {return((service != NULL)? service->val : sDefault->val);}
+
+FN_GLOBAL_INTEGER(server_role, server_role)
+FN_GLOBAL_INTEGER(sid_generator, sid_generator)
+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(share_backend, szShareBackend)
+FN_GLOBAL_STRING(sam_url, szSAM_URL)
+FN_GLOBAL_STRING(idmap_url, szIDMAP_URL)
+FN_GLOBAL_STRING(secrets_url, szSECRETS_URL)
+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(modulesdir, szModulesDir)
+FN_GLOBAL_STRING(ncalrpc_dir, ncalrpc_dir)
+FN_GLOBAL_STRING(dos_charset, dos_charset)
+FN_GLOBAL_STRING(unix_charset, unix_charset)
+FN_GLOBAL_STRING(display_charset, display_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(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(wins_support, 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(announce_as, announce_as)
+
+FN_LOCAL_STRING(pathname, szPath)
+FN_LOCAL_LIST(hostsallow, szHostsallow)
+FN_LOCAL_LIST(hostsdeny, szHostsdeny)
+FN_LOCAL_STRING(comment, comment)
+FN_LOCAL_STRING(fstype, fstype)
+FN_LOCAL_LIST(ntvfs_handler, ntvfs_handler)
+FN_LOCAL_BOOL(msdfs_root, bMSDfsRoot)
+FN_LOCAL_BOOL(browseable, bBrowseable)
+FN_LOCAL_BOOL(readonly, bRead_only)
+FN_LOCAL_BOOL(print_ok, bPrint_ok)
+FN_LOCAL_BOOL(map_hidden, bMap_hidden)
+FN_LOCAL_BOOL(map_archive, bMap_archive)
+FN_LOCAL_BOOL(strict_locking, bStrictLocking)
+FN_LOCAL_BOOL(oplocks, bOplocks)
+FN_LOCAL_BOOL(strict_sync, bStrictSync)
+FN_LOCAL_BOOL(ci_filesystem, bCIFileSystem)
+FN_LOCAL_BOOL(map_system, bMap_system)
+FN_LOCAL_INTEGER(max_connections, iMaxConnections)
+FN_LOCAL_INTEGER(csc_policy, iCSCPolicy)
+FN_LOCAL_INTEGER(create_mask, iCreate_mask)
+FN_LOCAL_INTEGER(force_create_mode, iCreate_force_mode)
+FN_LOCAL_INTEGER(dir_mask, iDir_mask)
+FN_LOCAL_INTEGER(force_dir_mode, iDir_force_mode)
+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, 
+static struct loadparm_service *getservicebyname(struct loadparm_context *lp_ctx,
                                         const char *pszServiceName);
 static void copy_service(struct loadparm_service *pserviceDest,
@@ -745 +775 @@
 /* It returns a pointer to parametrical option value if it exists or NULL otherwise */
 /* Actual parametrical functions are quite simple */
-const char *lp_get_parametric(struct loadparm_context *lp_ctx,
+const char *lpcfg_get_parametric(struct loadparm_context *lp_ctx,
                               struct loadparm_service *service,
                               const char *type, const char *option)
 {
-        char *vfskey;
-        struct parmlist_entry *data;
+        char *vfskey = NULL;
+        struct parmlist_entry *data;
 
         if (lp_ctx == NULL)
@@ -758 +788 @@
 
         asprintf(&vfskey, "%s:%s", type, option);
+        if (vfskey == NULL) return NULL;
         strlower(vfskey);
 
@@ -855 +886 @@
  */
 
-const char *lp_parm_string(struct loadparm_context *lp_ctx,
-                           struct loadparm_service *service, const char *type,
-                           const char *option)
-{
-        const char *value = lp_get_parametric(lp_ctx, service, type, option);
+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)
@@ -873 +904 @@
  */
 
-const char **lp_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 = lp_get_parametric(lp_ctx, service, type, 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)
+{
+        const char *value = lpcfg_get_parametric(lp_ctx, service, type, option);
 
         if (value != NULL)
@@ -892 +923 @@
  */
 
-int lp_parm_int(struct loadparm_context *lp_ctx,
-                struct loadparm_service *service, const char *type,
-                const char *option, int default_v)
-{
-        const char *value = lp_get_parametric(lp_ctx, service, type, option);
+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)
@@ -910 +941 @@
  */
 
-int lp_parm_bytes(struct loadparm_context *lp_ctx,
+int lpcfg_parm_bytes(struct loadparm_context *lp_ctx,
                   struct loadparm_service *service, const char *type,
                   const char *option, int default_v)
@@ -916 +947 @@
         uint64_t bval;
 
-        const char *value = lp_get_parametric(lp_ctx, service, type, option);
+        const char *value = lpcfg_get_parametric(lp_ctx, service, type, option);
 
         if (value && conv_str_size(value, &bval)) {
@@ -932 +963 @@
  * Parametric option has following syntax: 'Type: option = value'
  */
-unsigned long lp_parm_ulong(struct loadparm_context *lp_ctx,
+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 = lp_get_parametric(lp_ctx, service, type, option);
+        const char *value = lpcfg_get_parametric(lp_ctx, service, type, option);
 
         if (value)
@@ -945 +976 @@
 
 
-double lp_parm_double(struct loadparm_context *lp_ctx,
+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 = lp_get_parametric(lp_ctx, service, type, option);
+        const char *value = lpcfg_get_parametric(lp_ctx, service, type, option);
 
         if (value != NULL)
@@ -962 +993 @@
  */
 
-bool lp_parm_bool(struct loadparm_context *lp_ctx,
-                  struct loadparm_service *service, const char *type,
-                  const char *option, bool default_v)
-{
-        const char *value = lp_get_parametric(lp_ctx, service, type, option);
+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)
@@ -1014 +1045 @@
  */
 
-struct loadparm_service *lp_add_service(struct loadparm_context *lp_ctx,
-                                     const struct loadparm_service *pservice,
-                                     const char *name)
+struct loadparm_service *lpcfg_add_service(struct loadparm_context *lp_ctx,
+                                           const struct loadparm_service *pservice,
+                                           const char *name)
 {
         int i;
@@ -1022 +1053 @@
         int num_to_alloc = lp_ctx->iNumServices + 1;
         struct parmlist_entry *data, *pdata;
+
+        if (pservice == NULL) {
+                pservice = lp_ctx->sDefault;
+        }
 
         tservice = *pservice;
@@ -1055 +1090 @@
 
                 if (!tsp) {
-                        DEBUG(0,("lp_add_service: failed to enlarge services!\n"));
+                        DEBUG(0,("lpcfg_add_service: failed to enlarge services!\n"));
                         return NULL;
                 } else {
@@ -1067 +1102 @@
         lp_ctx->services[i] = init_service(lp_ctx->services, lp_ctx->sDefault);
         if (lp_ctx->services[i] == NULL) {
-                DEBUG(0,("lp_add_service: out of memory!\n"));
+                DEBUG(0,("lpcfg_add_service: out of memory!\n"));
                 return NULL;
         }
@@ -1081 +1116 @@
  */
 
-bool lp_add_home(struct loadparm_context *lp_ctx,
+bool lpcfg_add_home(struct loadparm_context *lp_ctx,
                  const char *pszHomename,
                  struct loadparm_service *default_service,
@@ -1088 +1123 @@
         struct loadparm_service *service;
 
-        service = lp_add_service(lp_ctx, default_service, pszHomename);
+        service = lpcfg_add_service(lp_ctx, default_service, pszHomename);
 
         if (service == NULL)
@@ -1097 +1132 @@
                 service->szPath = talloc_strdup(service, pszHomedir);
         } else {
-                service->szPath = string_sub_talloc(service, lp_pathname(default_service, lp_ctx->sDefault), "%H", pszHomedir); 
+                service->szPath = string_sub_talloc(service, lpcfg_pathname(default_service, lp_ctx->sDefault), "%H", pszHomedir);
         }
 
@@ -1108 +1143 @@
         DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n",
                   pszHomename, user, service->szPath));
-
-        return true;
-}
-
-/**
- * Add the IPC service.
- */
-
-static bool lp_add_hidden(struct loadparm_context *lp_ctx, const char *name,
-                          const char *fstype)
-{
-        struct loadparm_service *service = lp_add_service(lp_ctx, lp_ctx->sDefault, name);
-
-        if (service == NULL)
-                return false;
-
-        string_set(service, &service->szPath, tmpdir());
-
-        service->comment = talloc_asprintf(service, "%s Service (%s)",
-                                fstype, lp_ctx->globals->szServerString);
-        string_set(service, &service->fstype, fstype);
-        service->iMaxConnections = -1;
-        service->bAvailable = true;
-        service->bRead_only = true;
-        service->bPrint_ok = false;
-        service->bBrowseable = false;
-
-        if (strcasecmp(fstype, "IPC") == 0) {
-                lp_do_service_parameter(lp_ctx, service, "ntvfs handler",
-                                        "default");
-        }
-
-        DEBUG(3, ("adding hidden service %s\n", name));
 
         return true;
@@ -1155 +1157 @@
         const char *comment = "From Printcap";
         struct loadparm_service *service;
-        service = lp_add_service(lp_ctx, default_service, pszPrintername);
+        service = lpcfg_add_service(lp_ctx, default_service, pszPrintername);
 
         if (service == NULL)
@@ -1208 +1210 @@
   return the parameter structure for a parameter
 */
-struct parm_struct *lp_parm_struct(const char *name)
+struct parm_struct *lpcfg_parm_struct(const char *name)
 {
         int parmnum = map_parameter(name);
@@ -1218 +1220 @@
   return the parameter pointer for a parameter
 */
-void *lp_parm_ptr(struct loadparm_context *lp_ctx,
+void *lpcfg_parm_ptr(struct loadparm_context *lp_ctx,
                   struct loadparm_service *service, struct parm_struct *parm)
 {
@@ -1236 +1238 @@
  */
 
-static struct loadparm_service *getservicebyname(struct loadparm_context *lp_ctx, 
+static struct loadparm_service *getservicebyname(struct loadparm_context *lp_ctx,
                                         const char *pszServiceName)
 {
@@ -1329 +1331 @@
                 }
                 if (not_added) {
-                        paramo = talloc(pserviceDest, struct parmlist_entry);
+                        paramo = talloc_zero(pserviceDest, struct parmlist_entry);
                         if (paramo == NULL)
                                 smb_panic("OOM");
@@ -1449 +1451 @@
 
 /***************************************************************************
+ Handle the "realm" parameter
+***************************************************************************/
+
+static bool handle_realm(struct loadparm_context *lp_ctx,
+                         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.
 ***************************************************************************/
@@ -1506 +1526 @@
                         const char *pszParmValue, char **ptr)
 {
-        DEBUGLEVEL = atoi(pszParmValue);
-
-        return true;
+
+        string_set(lp_ctx, ptr, pszParmValue);
+        return debug_parse_levels(pszParmValue);
 }
 
@@ -1514 +1534 @@
                         const char *pszParmValue, char **ptr)
 {
-        logfile = pszParmValue;
+        debug_set_logfile(pszParmValue);
+        string_set(lp_ctx, ptr, pszParmValue);
         return true;
 }
@@ -1584 +1605 @@
         }
 
-        paramo = talloc(mem_ctx, struct parmlist_entry);
+        paramo = talloc_zero(mem_ctx, struct parmlist_entry);
         if (!paramo)
                 smb_panic("OOM");
@@ -1603 +1624 @@
 static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
                          const char *pszParmName, const char *pszParmValue,
-                         struct loadparm_context *lp_ctx)
+                         struct loadparm_context *lp_ctx, bool on_globals)
 {
         int i;
         /* if it is a special case then go ahead */
         if (parm_table[parmnum].special) {
-                parm_table[parmnum].special(lp_ctx, pszParmValue,
-                                            (char **)parm_ptr);
-                return true;
+                bool ret;
+                ret = parm_table[parmnum].special(lp_ctx, pszParmValue,
+                                                  (char **)parm_ptr);
+                if (!ret) {
+                        return false;
+                }
+                goto mark_non_default;
         }
 
@@ -1649 +1674 @@
                 }
 
-                case P_LIST:
+                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]) {
+                                        *(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 (!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\n",
+                                                          pszParmName, pszParmValue, new_list[i]));
+                                                return false;
+
+                                        }
+                                        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);
@@ -1682 +1736 @@
         }
 
-        if (lp_ctx->flags[parmnum] & FLAG_DEFAULT) {
+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 */
@@ -1696 +1751 @@
 
 
-bool lp_do_global_parameter(struct loadparm_context *lp_ctx,
-                            const char *pszParmName, const char *pszParmValue)
+bool lpcfg_do_global_parameter(struct loadparm_context *lp_ctx,
+                               const char *pszParmName, const char *pszParmValue)
 {
         int parmnum = map_parameter(pszParmName);
@@ -1716 +1771 @@
         }
 
-        parm_ptr = lp_parm_ptr(lp_ctx, NULL, &parm_table[parmnum]);
-
-        return set_variable(lp_ctx, parmnum, parm_ptr,
-                            pszParmName, pszParmValue, lp_ctx);
-}
-
-bool lp_do_service_parameter(struct loadparm_context *lp_ctx,
-                             struct loadparm_service *service,
-                             const char *pszParmName, const char *pszParmValue)
+        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;
@@ -1763 +1818 @@
 
         return set_variable(service, parmnum, parm_ptr, pszParmName,
-                            pszParmValue, lp_ctx);
+                            pszParmValue, lp_ctx, false);
 }
 
@@ -1776 +1831 @@
 
         if (lp_ctx->bInGlobalSection)
-                return lp_do_global_parameter(lp_ctx, pszParmName,
+                return lpcfg_do_global_parameter(lp_ctx, pszParmName,
                                               pszParmValue);
         else
-                return lp_do_service_parameter(lp_ctx, lp_ctx->currentService,
-                                               pszParmName, pszParmValue);
+                return lpcfg_do_service_parameter(lp_ctx, lp_ctx->currentService,
+                                                  pszParmName, pszParmValue);
 }
 
@@ -1786 +1841 @@
   variable argument do parameter
 */
-bool lp_do_global_parameter_var(struct loadparm_context *lp_ctx, const char *pszParmName, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);
-bool lp_do_global_parameter_var(struct loadparm_context *lp_ctx,
+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, ...)
 {
@@ -1797 +1852 @@
         s = talloc_vasprintf(NULL, fmt, ap);
         va_end(ap);
-        ret = lp_do_global_parameter(lp_ctx, pszParmName, s);
+        ret = lpcfg_do_global_parameter(lp_ctx, pszParmName, s);
         talloc_free(s);
         return ret;
@@ -1808 +1863 @@
   by smb.conf processing
 */
-bool lp_set_cmdline(struct loadparm_context *lp_ctx, const char *pszParmName,
-                    const char *pszParmValue)
+bool lpcfg_set_cmdline(struct loadparm_context *lp_ctx, const char *pszParmName,
+                       const char *pszParmValue)
 {
         int parmnum = map_parameter(pszParmName);
@@ -1831 +1886 @@
         lp_ctx->flags[parmnum] &= ~FLAG_CMDLINE;
 
-        if (!lp_do_global_parameter(lp_ctx, pszParmName, pszParmValue)) {
+        if (!lpcfg_do_global_parameter(lp_ctx, pszParmName, pszParmValue)) {
                 return false;
         }
@@ -1851 +1906 @@
   set a option from the commandline in 'a=b' format. Use to support --option
 */
-bool lp_set_option(struct loadparm_context *lp_ctx, const char *option)
+bool lpcfg_set_option(struct loadparm_context *lp_ctx, const char *option)
 {
         char *p, *s;
@@ -1869 +1924 @@
         *p = 0;
 
-        ret = lp_set_cmdline(lp_ctx, s, p+1);
+        ret = lpcfg_set_cmdline(lp_ctx, s, p+1);
         free(s);
         return ret;
@@ -1884 +1939 @@
 {
         int i;
+        const char *list_sep = ", "; /* For the seperation of lists values that we print below */
         switch (p->type)
         {
@@ -1909 +1965 @@
                         break;
 
+                case P_CMDLIST:
+                        list_sep = " ";
+                        /* fall through */
                 case P_LIST:
                         if ((char ***)ptr && *(char ***)ptr) {
                                 char **list = *(char ***)ptr;
 
-                                for (; *list; list++)
-                                        fprintf(f, "%s%s", *list,
-                                                ((*(list+1))?", ":""));
+                                for (; *list; list++) {
+                                        if (*(list+1) == NULL) {
+                                                /* last item, print no extra seperator after */
+                                                list_sep = "";
+                                        }
+                                        fprintf(f, "%s%s", *list, list_sep);
+                                }
                         }
                         break;
@@ -1944 +2007 @@
                         return (*((int *)ptr1) == *((int *)ptr2));
 
+                case P_CMDLIST:
                 case P_LIST:
                         return str_list_equal((const char **)(*(char ***)ptr1),
@@ -1999 +2063 @@
                 DEBUG(2, ("Processing section \"[%s]\"\n", pszSectionName));
 
-                if ((lp_ctx->currentService = lp_add_service(lp_ctx, lp_ctx->sDefault,
-                                                             pszSectionName))
+                if ((lp_ctx->currentService = lpcfg_add_service(lp_ctx, lp_ctx->sDefault,
+                                                                   pszSectionName))
                     == NULL) {
                         DEBUG(0, ("Failed to add a new service\n"));
@@ -2021 +2085 @@
                 return false;
         switch (parm_table[i].type) {
+                case P_CMDLIST:
                 case P_LIST:
                         return str_list_equal((const char **)parm_table[i].def.lvalue, 
@@ -2057 +2122 @@
                     parm_table[i].offset != -1 &&
                     (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) {
-                        if (!show_defaults && (lp_ctx->flags[i] & FLAG_DEFAULT)) 
+                        if (!show_defaults && (lp_ctx->flags[i] & FLAG_DEFAULT))
                                 continue;
                         fprintf(f, "\t%s = ", parm_table[i].label);
-                        print_parameter(&parm_table[i], lp_parm_ptr(lp_ctx, NULL, &parm_table[i]), f);
+                        print_parameter(&parm_table[i], lpcfg_parm_ptr(lp_ctx, NULL, &parm_table[i]), f);
                         fprintf(f, "\n");
         }
@@ -2066 +2131 @@
                 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);
                 }
@@ -2076 +2144 @@
  */
 
-static void dump_a_service(struct loadparm_service * pService, struct loadparm_service *sDefault, FILE * f)
+static void dump_a_service(struct loadparm_service * pService, struct loadparm_service *sDefault, FILE * f,
+                           unsigned int *flags)
 {
         int i;
@@ -2091 +2160 @@
                 {
                         if (pService == sDefault) {
-                                if (defaults_saved && is_default(sDefault, i))
+                                if (flags && (flags[i] & FLAG_DEFAULT)) {
                                         continue;
+                                }
+                                if (defaults_saved) {
+                                        if (is_default(sDefault, i)) {
+                                                continue;
+                                        }
+                                }
                         } else {
                                 if (equal_parameter(parm_table[i].type,
@@ -2115 +2190 @@
 }
 
-bool lp_dump_a_parameter(struct loadparm_context *lp_ctx,
-                         struct loadparm_service *service,
-                         const char *parm_name, FILE * f)
+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 = lp_parm_struct(parm_name);
+        parm = lpcfg_parm_struct(parm_name);
         if (!parm) {
                 return false;
         }
 
-        ptr = lp_parm_ptr(lp_ctx, service,parm);
+        ptr = lpcfg_parm_ptr(lp_ctx, service,parm);
 
         print_parameter(parm, ptr, f);
@@ -2140 +2215 @@
  */
 
-struct parm_struct *lp_next_parameter(struct loadparm_context *lp_ctx, int snum, int *i, 
-                                      int allparameters)
+
+struct parm_struct *lpcfg_next_parameter(struct loadparm_context *lp_ctx, int snum, int *i,
+                                         int allparameters)
 {
         if (snum == -1) {
@@ -2188 +2264 @@
  * Auto-load some home services.
  */
-static void lp_add_auto_services(struct loadparm_context *lp_ctx,
-                                 const char *str)
+static void lpcfg_add_auto_services(struct loadparm_context *lp_ctx,
+                                    const char *str)
 {
         return;
@@ -2219 +2295 @@
 {
         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) {
@@ -2235 +2318 @@
 /**
  * Initialise the global parameter structure.
+ *
+ * Note that most callers should use loadparm_init_global() instead
  */
 struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
@@ -2241 +2326 @@
         char *myname;
         struct loadparm_context *lp_ctx;
+        struct parmlist_entry *parm;
 
         lp_ctx = talloc_zero(mem_ctx, struct loadparm_context);
@@ -2280 +2366 @@
         }
 
-        lp_do_global_parameter(lp_ctx, "share backend", "classic");
-
-        lp_do_global_parameter(lp_ctx, "server role", "standalone");
+
+        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 lp_do_global_parameter() to ensure that FLAG_CMDLINE is obeyed */
+           the slower lpcfg_do_global_parameter() to ensure that FLAG_CMDLINE is obeyed */
 #ifdef TCP_NODELAY
-        lp_do_global_parameter(lp_ctx, "socket options", "TCP_NODELAY");
+        lpcfg_do_global_parameter(lp_ctx, "socket options", "TCP_NODELAY");
 #endif
-        lp_do_global_parameter(lp_ctx, "workgroup", DEFAULT_WORKGROUP);
+        lpcfg_do_global_parameter(lp_ctx, "workgroup", DEFAULT_WORKGROUP);
         myname = get_myname(lp_ctx);
-        lp_do_global_parameter(lp_ctx, "netbios name", myname);
+        lpcfg_do_global_parameter(lp_ctx, "netbios name", myname);
         talloc_free(myname);
-        lp_do_global_parameter(lp_ctx, "name resolve order", "wins host bcast");
-
-        lp_do_global_parameter(lp_ctx, "fstype", "NTFS");
-
-        lp_do_global_parameter(lp_ctx, "ntvfs handler", "unixuid default");
-        lp_do_global_parameter(lp_ctx, "max connections", "-1");
-
-        lp_do_global_parameter(lp_ctx, "dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup unixinfo browser");
-        lp_do_global_parameter(lp_ctx, "server services", "smb rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd kcc");
-        lp_do_global_parameter(lp_ctx, "ntptr providor", "simple_ldb");
-        lp_do_global_parameter(lp_ctx, "auth methods:domain controller", "anonymous sam_ignoredomain");
-        lp_do_global_parameter(lp_ctx, "auth methods:member server", "anonymous sam winbind");
-        lp_do_global_parameter(lp_ctx, "auth methods:standalone", "anonymous sam_ignoredomain");
-        lp_do_global_parameter(lp_ctx, "private dir", dyn_PRIVATE_DIR);
-        lp_do_global_parameter(lp_ctx, "sam database", "sam.ldb");
-        lp_do_global_parameter(lp_ctx, "idmap database", "idmap.ldb");
-        lp_do_global_parameter(lp_ctx, "secrets database", "secrets.ldb");
-        lp_do_global_parameter(lp_ctx, "spoolss database", "spoolss.ldb");
-        lp_do_global_parameter(lp_ctx, "wins config database", "wins_config.ldb");
-        lp_do_global_parameter(lp_ctx, "wins database", "wins.ldb");
-        lp_do_global_parameter(lp_ctx, "registry:HKEY_LOCAL_MACHINE", "hklm.ldb");
+        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 web");
+        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, "auth methods:domain controller", "anonymous sam_ignoredomain winbind");
+        lpcfg_do_global_parameter(lp_ctx, "auth methods:member server", "anonymous sam winbind");
+        lpcfg_do_global_parameter(lp_ctx, "auth methods:standalone", "anonymous sam_ignoredomain");
+        lpcfg_do_global_parameter(lp_ctx, "private dir", dyn_PRIVATE_DIR);
+        lpcfg_do_global_parameter(lp_ctx, "sam database", "sam.ldb");
+        lpcfg_do_global_parameter(lp_ctx, "idmap database", "idmap.ldb");
+        lpcfg_do_global_parameter(lp_ctx, "secrets database", "secrets.ldb");
+        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. */
-        lp_do_global_parameter(lp_ctx, "registry:HKEY_USERS", "hku.ldb");
+        lpcfg_do_global_parameter(lp_ctx, "registry:HKEY_USERS", "hku.ldb");
 
         /* using UTF8 by default allows us to support all chars */
-        lp_do_global_parameter(lp_ctx, "unix charset", "UTF8");
+        lpcfg_do_global_parameter(lp_ctx, "unix charset", "UTF8");
 
         /* Use codepage 850 as a default for the dos character set */
-        lp_do_global_parameter(lp_ctx, "dos charset", "CP850");
+        lpcfg_do_global_parameter(lp_ctx, "dos charset", "CP850");
 
         /*
          * Allow the default PASSWD_CHAT to be overridden in local.h.
          */
-        lp_do_global_parameter(lp_ctx, "passwd chat", DEFAULT_PASSWD_CHAT);
-
-        lp_do_global_parameter(lp_ctx, "pid directory", dyn_PIDDIR);
-        lp_do_global_parameter(lp_ctx, "lock dir", dyn_LOCKDIR);
-        lp_do_global_parameter(lp_ctx, "modules dir", dyn_MODULESDIR);
-        lp_do_global_parameter(lp_ctx, "ncalrpc dir", dyn_NCALRPCDIR);
-
-        lp_do_global_parameter(lp_ctx, "socket address", "0.0.0.0");
-        lp_do_global_parameter_var(lp_ctx, "server string",
+        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, "modules dir", dyn_MODULESDIR);
+        lpcfg_do_global_parameter(lp_ctx, "ncalrpc dir", dyn_NCALRPCDIR);
+
+        lpcfg_do_global_parameter(lp_ctx, "socket address", "0.0.0.0");
+        lpcfg_do_global_parameter_var(lp_ctx, "server string",
                                    "Samba %s", SAMBA_VERSION_STRING);
 
-        lp_do_global_parameter_var(lp_ctx, "announce version", "%d.%d",
+        lpcfg_do_global_parameter_var(lp_ctx, "announce version", "%d.%d",
                          DEFAULT_MAJOR_VERSION,
                          DEFAULT_MINOR_VERSION);
 
-        lp_do_global_parameter(lp_ctx, "password server", "*");
-
-        lp_do_global_parameter(lp_ctx, "max mux", "50");
-        lp_do_global_parameter(lp_ctx, "max xmit", "12288");
-        lp_do_global_parameter(lp_ctx, "password level", "0");
-        lp_do_global_parameter(lp_ctx, "LargeReadwrite", "True");
-        lp_do_global_parameter(lp_ctx, "server min protocol", "CORE");
-        lp_do_global_parameter(lp_ctx, "server max protocol", "NT1");
-        lp_do_global_parameter(lp_ctx, "client min protocol", "CORE");
-        lp_do_global_parameter(lp_ctx, "client max protocol", "NT1");
-        lp_do_global_parameter(lp_ctx, "security", "USER");
-        lp_do_global_parameter(lp_ctx, "paranoid server security", "True");
-        lp_do_global_parameter(lp_ctx, "EncryptPasswords", "True");
-        lp_do_global_parameter(lp_ctx, "ReadRaw", "True");
-        lp_do_global_parameter(lp_ctx, "WriteRaw", "True");
-        lp_do_global_parameter(lp_ctx, "NullPasswords", "False");
-        lp_do_global_parameter(lp_ctx, "ObeyPamRestrictions", "False");
-        lp_do_global_parameter(lp_ctx, "announce as", "NT SERVER");
-
-        lp_do_global_parameter(lp_ctx, "TimeServer", "False");
-        lp_do_global_parameter(lp_ctx, "BindInterfacesOnly", "False");
-        lp_do_global_parameter(lp_ctx, "Unicode", "True");
-        lp_do_global_parameter(lp_ctx, "ClientLanManAuth", "False");
-        lp_do_global_parameter(lp_ctx, "LanmanAuth", "False");
-        lp_do_global_parameter(lp_ctx, "NTLMAuth", "True");
-        lp_do_global_parameter(lp_ctx, "client use spnego principal", "False");
-
-        lp_do_global_parameter(lp_ctx, "UnixExtensions", "False");
-
-        lp_do_global_parameter(lp_ctx, "PreferredMaster", "Auto");
-        lp_do_global_parameter(lp_ctx, "LocalMaster", "True");
-
-        lp_do_global_parameter(lp_ctx, "wins support", "False");
-        lp_do_global_parameter(lp_ctx, "dns proxy", "True");
-
-        lp_do_global_parameter(lp_ctx, "winbind separator", "\\");
-        lp_do_global_parameter(lp_ctx, "winbind sealed pipes", "True");
-        lp_do_global_parameter(lp_ctx, "winbindd socket directory", dyn_WINBINDD_SOCKET_DIR);
-        lp_do_global_parameter(lp_ctx, "winbindd privileged socket directory", dyn_WINBINDD_PRIVILEGED_SOCKET_DIR);
-        lp_do_global_parameter(lp_ctx, "template shell", "/bin/false");
-        lp_do_global_parameter(lp_ctx, "template homedir", "/home/%WORKGROUP%/%ACCOUNTNAME%");
-        lp_do_global_parameter(lp_ctx, "idmap trusted only", "False");
-
-        lp_do_global_parameter(lp_ctx, "client signing", "Yes");
-        lp_do_global_parameter(lp_ctx, "server signing", "auto");
-
-        lp_do_global_parameter(lp_ctx, "use spnego", "True");
-
-        lp_do_global_parameter(lp_ctx, "smb ports", "445 139");
-        lp_do_global_parameter(lp_ctx, "nbt port", "137");
-        lp_do_global_parameter(lp_ctx, "dgram port", "138");
-        lp_do_global_parameter(lp_ctx, "cldap port", "389");
-        lp_do_global_parameter(lp_ctx, "krb5 port", "88");
-        lp_do_global_parameter(lp_ctx, "kpasswd port", "464");
-        lp_do_global_parameter(lp_ctx, "web port", "901");
-        lp_do_global_parameter(lp_ctx, "swat directory", dyn_SWATDIR);
-
-        lp_do_global_parameter(lp_ctx, "nt status support", "True");
-
-        lp_do_global_parameter(lp_ctx, "max wins ttl", "518400"); /* 6 days */
-        lp_do_global_parameter(lp_ctx, "min wins ttl", "10");
-
-        lp_do_global_parameter(lp_ctx, "tls enabled", "True");
-        lp_do_global_parameter(lp_ctx, "tls keyfile", "tls/key.pem");
-        lp_do_global_parameter(lp_ctx, "tls certfile", "tls/cert.pem");
-        lp_do_global_parameter(lp_ctx, "tls cafile", "tls/ca.pem");
-        lp_do_global_parameter_var(lp_ctx, "setup directory", "%s",
-                                   dyn_SETUPDIR);
-
-        lp_do_global_parameter(lp_ctx, "prefork children:smb", "4");
-
-        lp_do_global_parameter(lp_ctx, "ntp signd socket directory", dyn_NTP_SIGND_SOCKET_DIR);
+        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, "announce as", "NT SERVER");
+
+        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++) {
@@ -2423 +2517 @@
         }
 
+        for (parm=lp_ctx->globals->param_opt; parm; parm=parm->next) {
+                if (!(parm->priority & FLAG_CMDLINE)) {
+                        parm->priority |= FLAG_DEFAULT;
+                }
+        }
+
         return lp_ctx;
 }
 
-const char *lp_configfile(struct loadparm_context *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 (load_default && !global_loadparm_context->loaded) {
+                lpcfg_load_default(global_loadparm_context);
+        }
+        global_loadparm_context->refuse_free = true;
+        return global_loadparm_context;
+}
+
+const char *lpcfg_configfile(struct loadparm_context *lp_ctx)
 {
         return lp_ctx->szConfigFile;
@@ -2443 +2558 @@
  * have changed.
  */
-static bool lp_update(struct loadparm_context *lp_ctx)
-{
-        lp_add_auto_services(lp_ctx, lp_auto_services(lp_ctx));
-
-        lp_add_hidden(lp_ctx, "IPC$", "IPC");
-        lp_add_hidden(lp_ctx, "ADMIN$", "DISK");
+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) {
-                lp_do_global_parameter(lp_ctx, "wins server", "127.0.0.1");
+                lpcfg_do_global_parameter(lp_ctx, "wins server", "127.0.0.1");
         }
 
@@ -2458 +2571 @@
         reload_charcnv(lp_ctx);
 
-        /* FIXME: ntstatus_check_dos_mapping = lp_nt_status_support(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: ntstatus_check_dos_mapping = lpcfg_nt_status_support(lp_ctx); */
 
         /* 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 (lp_parm_bool(lp_ctx, NULL, "socket", "testnonblock", false)) {
+        if (lpcfg_parm_bool(lp_ctx, NULL, "socket", "testnonblock", false)) {
                 setenv("SOCKET_TESTNONBLOCK", "1", 1);
         } else {
@@ -2469 +2588 @@
 
         /* FIXME: Check locale in environment for this: */
-        if (strcmp(lp_display_charset(lp_ctx), lp_unix_charset(lp_ctx)) != 0)
-                d_set_iconv(smb_iconv_open(lp_display_charset(lp_ctx), lp_unix_charset(lp_ctx)));
+        if (strcmp(lpcfg_display_charset(lp_ctx), lpcfg_unix_charset(lp_ctx)) != 0)
+                d_set_iconv(smb_iconv_open(lpcfg_display_charset(lp_ctx), lpcfg_unix_charset(lp_ctx)));
         else
                 d_set_iconv((smb_iconv_t)-1);
@@ -2477 +2596 @@
 }
 
-bool lp_load_default(struct loadparm_context *lp_ctx)
+bool lpcfg_load_default(struct loadparm_context *lp_ctx)
 {
     const char *path;
@@ -2486 +2605 @@
             /* We allow the default smb.conf file to not exist, 
              * basically the equivalent of an empty file. */
-            return lp_update(lp_ctx);
+            return lpcfg_update(lp_ctx);
     }
 
-    return lp_load(lp_ctx, path);
+    return lpcfg_load(lp_ctx, path);
 }
 
@@ -2497 +2616 @@
  * Return True on success, False on failure.
  */
-bool lp_load(struct loadparm_context *lp_ctx, const char *filename)
+bool lpcfg_load(struct loadparm_context *lp_ctx, const char *filename)
 {
         char *n2;
@@ -2508 +2627 @@
         lp_ctx->bInGlobalSection = true;
         n2 = standard_sub_basic(lp_ctx, lp_ctx->szConfigFile);
-        DEBUG(2, ("lp_load: refreshing parameters from %s\n", n2));
+        DEBUG(2, ("lpcfg_load: refreshing parameters from %s\n", n2));
 
         add_to_file_list(lp_ctx, lp_ctx->szConfigFile, n2);
@@ -2522 +2641 @@
                         bRetval = service_ok(lp_ctx->currentService);
 
-        bRetval = bRetval && lp_update(lp_ctx);
+        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;
@@ -2531 +2665 @@
  */
 
-int lp_numservices(struct loadparm_context *lp_ctx)
+int lpcfg_numservices(struct loadparm_context *lp_ctx)
 {
         return lp_ctx->iNumServices;
@@ -2540 +2674 @@
  */
 
-void lp_dump(struct loadparm_context *lp_ctx, FILE *f, bool show_defaults,
+void lpcfg_dump(struct loadparm_context *lp_ctx, FILE *f, bool show_defaults,
              int maxtoprint)
 {
         int iService;
 
-        if (show_defaults)
-                defaults_saved = false;
+        defaults_saved = !show_defaults;
 
         dump_globals(lp_ctx, f, show_defaults);
 
-        dump_a_service(lp_ctx->sDefault, lp_ctx->sDefault, f);
+        dump_a_service(lp_ctx->sDefault, lp_ctx->sDefault, f, lp_ctx->flags);
 
         for (iService = 0; iService < maxtoprint; iService++)
-                lp_dump_one(f, show_defaults, lp_ctx->services[iService], lp_ctx->sDefault);
+                lpcfg_dump_one(f, show_defaults, lp_ctx->services[iService], lp_ctx->sDefault);
 }
 
@@ -2559 +2692 @@
  * Display the contents of one service in human-readable form.
  */
-void lp_dump_one(FILE *f, bool show_defaults, struct loadparm_service *service, struct loadparm_service *sDefault)
+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);
-        }
-}
-
-struct loadparm_service *lp_servicebynum(struct loadparm_context *lp_ctx,
+                dump_a_service(service, sDefault, f, NULL);
+        }
+}
+
+struct loadparm_service *lpcfg_servicebynum(struct loadparm_context *lp_ctx,
                                          int snum)
 {
@@ -2574 +2707 @@
 }
 
-struct loadparm_service *lp_service(struct loadparm_context *lp_ctx,
+struct loadparm_service *lpcfg_service(struct loadparm_context *lp_ctx,
                                     const char *service_name)
 {
@@ -2590 +2723 @@
                                         lp_ctx->services[iService],
                                         lp_ctx->services[iService]->szService);
-                        if (strequal(serviceName, service_name))
+                        if (strequal(serviceName, service_name)) {
+                                talloc_free(serviceName);
                                 return lp_ctx->services[iService];
-                }
-        }
-
-        DEBUG(7,("lp_servicenumber: couldn't find %s\n", service_name));
+                        }
+                        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);
+}
 
 /**
@@ -2605 +2745 @@
 const char *volume_label(struct loadparm_service *service, struct loadparm_service *sDefault)
 {
-        const char *ret = lp_volume(service, sDefault);
+        const char *ret;
+        ret = lp_string((const char *)((service != NULL && service->volume != NULL) ?
+                                       service->volume : sDefault->volume));
         if (!*ret)
-                return lp_servicename(service);
+                return lpcfg_servicename(service);
         return ret;
 }
 
-
 /**
  * If we are PDC then prefer us as DMB
  */
-const char *lp_printername(struct loadparm_service *service, struct loadparm_service *sDefault)
-{
-        const char *ret = _lp_printername(service, sDefault);
+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 = lp_servicename(service);
+                ret = lpcfg_servicename(service);
 
         return ret;
@@ -2628 +2771 @@
  * Return the max print jobs per queue.
  */
-int lp_maxprintjobs(struct loadparm_service *service, struct loadparm_service *sDefault)
+int lpcfg_maxprintjobs(struct loadparm_service *service, struct loadparm_service *sDefault)
 {
         int maxjobs = (service != NULL) ? service->iMaxPrintJobs : sDefault->iMaxPrintJobs;
@@ -2637 +2780 @@
 }
 
-struct smb_iconv_convenience *lp_iconv_convenience(struct loadparm_context *lp_ctx)
+struct smb_iconv_convenience *lpcfg_iconv_convenience(struct loadparm_context *lp_ctx)
 {
         if (lp_ctx == NULL) {
-                static struct smb_iconv_convenience *fallback_ic = NULL;
-                if (fallback_ic == NULL)
-                        fallback_ic = smb_iconv_convenience_init(talloc_autofree_context(), 
-                                                  "CP850", "UTF8", true);
-                return fallback_ic;
+                return get_iconv_convenience();
         }
         return lp_ctx->iconv_convenience;
@@ -2651 +2790 @@
 _PUBLIC_ void reload_charcnv(struct loadparm_context *lp_ctx)
 {
-        talloc_unlink(lp_ctx, lp_ctx->iconv_convenience);
-        global_iconv_convenience = lp_ctx->iconv_convenience = smb_iconv_convenience_init_lp(lp_ctx, lp_ctx);
-}
-
-void lp_smbcli_options(struct loadparm_context *lp_ctx,
+        struct smb_iconv_convenience *old_ic = lp_ctx->iconv_convenience;
+        if (old_ic == NULL) {
+                old_ic = global_iconv_convenience;
+        }
+        lp_ctx->iconv_convenience = smb_iconv_convenience_reinit_lp(lp_ctx, lp_ctx, old_ic);
+        global_iconv_convenience = lp_ctx->iconv_convenience;
+}
+
+void lpcfg_smbcli_options(struct loadparm_context *lp_ctx,
                          struct smbcli_options *options)
 {
-        options->max_xmit = lp_max_xmit(lp_ctx);
-        options->max_mux = lp_maxmux(lp_ctx);
-        options->use_spnego = lp_nt_status_support(lp_ctx) && lp_use_spnego(lp_ctx); 
-        options->signing = lp_client_signing(lp_ctx);
+        options->max_xmit = lpcfg_max_xmit(lp_ctx);
+        options->max_mux = lpcfg_maxmux(lp_ctx);
+        options->use_spnego = lpcfg_nt_status_support(lp_ctx) && lpcfg_use_spnego(lp_ctx);
+        options->signing = lpcfg_client_signing(lp_ctx);
         options->request_timeout = SMB_REQUEST_TIMEOUT;
-        options->ntstatus_support = lp_nt_status_support(lp_ctx);
-        options->max_protocol = lp_cli_maxprotocol(lp_ctx);
-        options->unicode = lp_unicode(lp_ctx);
+        options->ntstatus_support = lpcfg_nt_status_support(lp_ctx);
+        options->max_protocol = lpcfg_cli_maxprotocol(lp_ctx);
+        options->unicode = lpcfg_unicode(lp_ctx);
         options->use_oplocks = true;
         options->use_level2_oplocks = true;
 }
 
-void lp_smbcli_session_options(struct loadparm_context *lp_ctx,
+void lpcfg_smbcli_session_options(struct loadparm_context *lp_ctx,
                                  struct smbcli_session_options *options)
 {
-        options->lanman_auth = lp_client_lanman_auth(lp_ctx);
-        options->ntlmv2_auth = lp_client_ntlmv2_auth(lp_ctx);
-        options->plaintext_auth = lp_client_plaintext_auth(lp_ctx);
-}
-
-_PUBLIC_ char *lp_tls_keyfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+        options->lanman_auth = lpcfg_client_lanman_auth(lp_ctx);
+        options->ntlmv2_auth = lpcfg_client_ntlmv2_auth(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 private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_keyfile);
 }
 
-_PUBLIC_ char *lp_tls_certfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+_PUBLIC_ char *lpcfg_tls_certfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
 {
         return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_certfile);
 }
 
-_PUBLIC_ char *lp_tls_cafile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+_PUBLIC_ char *lpcfg_tls_cafile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
 {
         return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_cafile);
 }
 
-_PUBLIC_ char *lp_tls_crlfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+_PUBLIC_ char *lpcfg_tls_crlfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
 {
         return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_crlfile);
 }
 
-_PUBLIC_ char *lp_tls_dhpfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+_PUBLIC_ char *lpcfg_tls_dhpfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
 {
         return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_dhpfile);
 }
 
-_PUBLIC_ struct dcerpc_server_info *lp_dcerpc_server_info(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+_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);
 
-        ret->domain_name = talloc_reference(mem_ctx, lp_workgroup(lp_ctx));
-        ret->version_major = lp_parm_int(lp_ctx, NULL, "server_info", "version_major", 5);
-        ret->version_minor = lp_parm_int(lp_ctx, NULL, "server_info", "version_minor", 2);
-        ret->version_build = lp_parm_int(lp_ctx, NULL, "server_info", "version_build", 3790);
+        ret->domain_name = talloc_reference(mem_ctx, lpcfg_workgroup(lp_ctx));
+        ret->version_major = lpcfg_parm_int(lp_ctx, NULL, "server_info", "version_major", 5);
+        ret->version_minor = lpcfg_parm_int(lp_ctx, NULL, "server_info", "version_minor", 2);
+        ret->version_build = lpcfg_parm_int(lp_ctx, NULL, "server_info", "version_build", 3790);
 
         return ret;
 }
 
-struct gensec_settings *lp_gensec_settings(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+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);
@@ -2722 +2865 @@
         SMB_ASSERT(lp_ctx != NULL);
         settings->lp_ctx = talloc_reference(settings, lp_ctx);
-        settings->iconv_convenience = lp_iconv_convenience(lp_ctx);
-        settings->target_hostname = lp_parm_string(lp_ctx, NULL, "gensec", "target_hostname");
+        settings->target_hostname = lpcfg_parm_string(lp_ctx, NULL, "gensec", "target_hostname");
         return settings;
 }

vendor/current/source4/param/loadparm.h

@@ -30 +30 @@
 /* the following are used by loadparm for option lists */
 typedef enum {
-        P_BOOL,P_INTEGER,P_OCTAL,P_BYTES,P_LIST,P_STRING,P_USTRING,P_ENUM
+        P_BOOL,P_INTEGER,P_OCTAL,P_BYTES,P_LIST,P_CMDLIST,P_STRING,P_USTRING,P_ENUM
 } parm_type;
 

vendor/current/source4/param/param.h

@@ -21 +21 @@
 #define _PARAM_H 
 
-#include "../lib/util/parmlist.h"
+struct parmlist_entry;
 
 struct param_context {
@@ -52 +52 @@
 };
 
+enum sid_generator {
+        SID_GENERATOR_INTERNAL=0,
+        SID_GENERATOR_BACKEND=1,
+};
+
 enum announce_as {/* Types of machine we can announce as. */
         ANNOUNCE_AS_NT_SERVER=1,
@@ -65 +70 @@
 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 *lp_default_service(struct loadparm_context *lp_ctx);
-struct parm_struct *lp_parm_table(void);
-int lp_server_role(struct loadparm_context *);
-const char **lp_smb_ports(struct loadparm_context *);
-int lp_nbt_port(struct loadparm_context *);
-int lp_dgram_port(struct loadparm_context *);
-int lp_cldap_port(struct loadparm_context *);
-int lp_krb5_port(struct loadparm_context *);
-int lp_kpasswd_port(struct loadparm_context *);
-int lp_web_port(struct loadparm_context *);
-const char *lp_swat_directory(struct loadparm_context *);
-bool lp_tls_enabled(struct loadparm_context *);
-char *lp_tls_keyfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
-char *lp_tls_certfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
-char *lp_tls_cafile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
-char *lp_tls_crlfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
-char *lp_tls_dhpfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
-const char *lp_share_backend(struct loadparm_context *);
-const char *lp_sam_url(struct loadparm_context *);
-const char *lp_idmap_url(struct loadparm_context *);
-const char *lp_secrets_url(struct loadparm_context *);
-const char *lp_spoolss_url(struct loadparm_context *);
-const char *lp_wins_config_url(struct loadparm_context *);
-const char *lp_wins_url(struct loadparm_context *);
-const char *lp_winbind_separator(struct loadparm_context *);
-const char *lp_winbindd_socket_directory(struct loadparm_context *);
-const char *lp_winbindd_privileged_socket_directory(struct loadparm_context *);
-const char *lp_template_shell(struct loadparm_context *);
-const char *lp_template_homedir(struct loadparm_context *);
-bool lp_winbind_sealed_pipes(struct loadparm_context *);
-bool lp_idmap_trusted_only(struct loadparm_context *);
-const char *lp_private_dir(struct loadparm_context *);
-const char *lp_serverstring(struct loadparm_context *);
-const char *lp_lockdir(struct loadparm_context *);
-const char *lp_modulesdir(struct loadparm_context *);
-const char *lp_setupdir(struct loadparm_context *);
-const char *lp_ncalrpc_dir(struct loadparm_context *);
-const char *lp_dos_charset(struct loadparm_context *);
-const char *lp_unix_charset(struct loadparm_context *);
-const char *lp_display_charset(struct loadparm_context *);
-const char *lp_piddir(struct loadparm_context *);
-const char **lp_dcerpc_endpoint_servers(struct loadparm_context *);
-const char **lp_server_services(struct loadparm_context *);
-const char *lp_ntptr_providor(struct loadparm_context *);
-const char *lp_auto_services(struct loadparm_context *);
-const char *lp_passwd_chat(struct loadparm_context *);
-const char **lp_passwordserver(struct loadparm_context *);
-const char **lp_name_resolve_order(struct loadparm_context *);
-const char *lp_realm(struct loadparm_context *);
-const char *lp_socket_options(struct loadparm_context *);
-const char *lp_workgroup(struct loadparm_context *);
-const char *lp_netbios_name(struct loadparm_context *);
-const char *lp_netbios_scope(struct loadparm_context *);
-const char **lp_wins_server_list(struct loadparm_context *);
-const char **lp_interfaces(struct loadparm_context *);
-const char *lp_socket_address(struct loadparm_context *);
-const char **lp_netbios_aliases(struct loadparm_context *);
-bool lp_disable_netbios(struct loadparm_context *);
-bool lp_wins_support(struct loadparm_context *);
-bool lp_wins_dns_proxy(struct loadparm_context *);
-const char *lp_wins_hook(struct loadparm_context *);
-bool lp_local_master(struct loadparm_context *);
-bool lp_readraw(struct loadparm_context *);
-bool lp_large_readwrite(struct loadparm_context *);
-bool lp_writeraw(struct loadparm_context *);
-bool lp_null_passwords(struct loadparm_context *);
-bool lp_obey_pam_restrictions(struct loadparm_context *);
-bool lp_encrypted_passwords(struct loadparm_context *);
-bool lp_time_server(struct loadparm_context *);
-bool lp_bind_interfaces_only(struct loadparm_context *);
-bool lp_unicode(struct loadparm_context *);
-bool lp_nt_status_support(struct loadparm_context *);
-bool lp_lanman_auth(struct loadparm_context *);
-bool lp_ntlm_auth(struct loadparm_context *);
-bool lp_client_plaintext_auth(struct loadparm_context *);
-bool lp_client_lanman_auth(struct loadparm_context *);
-bool lp_client_ntlmv2_auth(struct loadparm_context *);
-bool lp_client_use_spnego_principal(struct loadparm_context *);
-bool lp_host_msdfs(struct loadparm_context *);
-bool lp_unix_extensions(struct loadparm_context *);
-bool lp_use_spnego(struct loadparm_context *);
-bool lp_rpc_big_endian(struct loadparm_context *);
-int lp_max_wins_ttl(struct loadparm_context *);
-int lp_min_wins_ttl(struct loadparm_context *);
-int lp_maxmux(struct loadparm_context *);
-int lp_max_xmit(struct loadparm_context *);
-int lp_passwordlevel(struct loadparm_context *);
-int lp_srv_maxprotocol(struct loadparm_context *);
-int lp_srv_minprotocol(struct loadparm_context *);
-int lp_cli_maxprotocol(struct loadparm_context *);
-int lp_cli_minprotocol(struct loadparm_context *);
-int lp_security(struct loadparm_context *);
-bool lp_paranoid_server_security(struct loadparm_context *);
-int lp_announce_as(struct loadparm_context *);
-
-const char *lp_servicename(const struct loadparm_service *service);
-const char *lp_pathname(struct loadparm_service *, struct loadparm_service *);
-const char **lp_hostsallow(struct loadparm_service *, struct loadparm_service *);
-const char **lp_hostsdeny(struct loadparm_service *, struct loadparm_service *);
-const char *lp_comment(struct loadparm_service *, struct loadparm_service *);
-const char *lp_fstype(struct loadparm_service *, struct loadparm_service *);
-const char **lp_ntvfs_handler(struct loadparm_service *, struct loadparm_service *);
-bool lp_msdfs_root(struct loadparm_service *, struct loadparm_service *);
-bool lp_browseable(struct loadparm_service *, struct loadparm_service *);
-bool lp_readonly(struct loadparm_service *, struct loadparm_service *);
-bool lp_print_ok(struct loadparm_service *, struct loadparm_service *);
-bool lp_map_hidden(struct loadparm_service *, struct loadparm_service *);
-bool lp_map_archive(struct loadparm_service *, struct loadparm_service *);
-bool lp_strict_locking(struct loadparm_service *, struct loadparm_service *);
-bool lp_oplocks(struct loadparm_service *, struct loadparm_service *);
-bool lp_strict_sync(struct loadparm_service *, struct loadparm_service *);
-bool lp_ci_filesystem(struct loadparm_service *, struct loadparm_service *);
-bool lp_map_system(struct loadparm_service *, struct loadparm_service *);
-int lp_max_connections(struct loadparm_service *, struct loadparm_service *);
-int lp_csc_policy(struct loadparm_service *, struct loadparm_service *);
-int lp_create_mask(struct loadparm_service *, struct loadparm_service *);
-int lp_force_create_mode(struct loadparm_service *, struct loadparm_service *);
-int lp_dir_mask(struct loadparm_service *, struct loadparm_service *);
-int lp_force_dir_mode(struct loadparm_service *, struct loadparm_service *);
-int lp_server_signing(struct loadparm_context *);
-int lp_client_signing(struct loadparm_context *);
-const char *lp_ntp_signd_socket_directory(struct loadparm_context *);
-
-
-const char *lp_get_parametric(struct loadparm_context *lp_ctx,
+struct loadparm_service *lpcfg_default_service(struct loadparm_context *lp_ctx);
+struct parm_struct *lpcfg_parm_table(void);
+
+
+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 *lp_parm_string(struct loadparm_context *lp_ctx,
+const char *lpcfg_parm_string(struct loadparm_context *lp_ctx,
                            struct loadparm_service *service, const char *type,
                            const char *option);
-const char **lp_parm_string_list(TALLOC_CTX *mem_ctx,
+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 lp_parm_int(struct loadparm_context *lp_ctx,
+int lpcfg_parm_int(struct loadparm_context *lp_ctx,
                 struct loadparm_service *service, const char *type,
                 const char *option, int default_v);
-int lp_parm_bytes(struct loadparm_context *lp_ctx,
+int lpcfg_parm_bytes(struct loadparm_context *lp_ctx,
                   struct loadparm_service *service, const char *type,
                   const char *option, int default_v);
-unsigned long lp_parm_ulong(struct loadparm_context *lp_ctx,
+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 lp_parm_double(struct loadparm_context *lp_ctx,
+double lpcfg_parm_double(struct loadparm_context *lp_ctx,
                       struct loadparm_service *service, const char *type,
                       const char *option, double default_v);
-bool lp_parm_bool(struct loadparm_context *lp_ctx,
-                  struct loadparm_service *service, const char *type,
-                  const char *option, bool default_v);
-struct loadparm_service *lp_add_service(struct loadparm_context *lp_ctx,
+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 lp_add_home(struct loadparm_context *lp_ctx,
+bool lpcfg_add_home(struct loadparm_context *lp_ctx,
                  const char *pszHomename,
                  struct loadparm_service *default_service,
                  const char *user, const char *pszHomedir);
-bool lp_add_printer(struct loadparm_context *lp_ctx,
+bool lpcfg_add_printer(struct loadparm_context *lp_ctx,
                     const char *pszPrintername,
                     struct loadparm_service *default_service);
-struct parm_struct *lp_parm_struct(const char *name);
-void *lp_parm_ptr(struct loadparm_context *lp_ctx,
+struct parm_struct *lpcfg_parm_struct(const char *name);
+void *lpcfg_parm_ptr(struct loadparm_context *lp_ctx,
                   struct loadparm_service *service, struct parm_struct *parm);
-bool lp_file_list_changed(struct loadparm_context *lp_ctx);
-
-bool lp_do_global_parameter(struct loadparm_context *lp_ctx,
+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 lp_do_service_parameter(struct loadparm_context *lp_ctx,
+bool lpcfg_do_service_parameter(struct loadparm_context *lp_ctx,
                              struct loadparm_service *service,
                              const char *pszParmName, const char *pszParmValue);
@@ -242 +146 @@
  * Process a parameter.
  */
-bool lp_do_global_parameter_var(struct loadparm_context *lp_ctx,
+bool lpcfg_do_global_parameter_var(struct loadparm_context *lp_ctx,
                                 const char *pszParmName, const char *fmt, ...);
-bool lp_set_cmdline(struct loadparm_context *lp_ctx, const char *pszParmName,
+bool lpcfg_set_cmdline(struct loadparm_context *lp_ctx, const char *pszParmName,
                     const char *pszParmValue);
-bool lp_set_option(struct loadparm_context *lp_ctx, const char *option);
+bool lpcfg_set_option(struct loadparm_context *lp_ctx, const char *option);
 
 /**
  * Display the contents of a single services record.
  */
-bool lp_dump_a_parameter(struct loadparm_context *lp_ctx,
+bool lpcfg_dump_a_parameter(struct loadparm_context *lp_ctx,
                          struct loadparm_service *service,
                          const char *parm_name, FILE * f);
@@ -259 +163 @@
  * Return NULL when out of parameters.
  */
-struct parm_struct *lp_next_parameter(struct loadparm_context *lp_ctx, int snum, int *i, 
+struct parm_struct *lpcfg_next_parameter(struct loadparm_context *lp_ctx, int snum, int *i,
                                       int allparameters);
 
@@ -265 +169 @@
  * Unload unused services.
  */
-void lp_killunused(struct loadparm_context *lp_ctx,
+void lpcfg_killunused(struct loadparm_context *lp_ctx,
                    struct smbsrv_connection *smb,
                    bool (*snumused) (struct smbsrv_connection *, int));
@@ -273 +177 @@
  */
 struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx);
-const char *lp_configfile(struct loadparm_context *lp_ctx);
-bool lp_load_default(struct loadparm_context *lp_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);
 
@@ -282 +187 @@
  * Return True on success, False on failure.
  */
-bool lp_load(struct loadparm_context *lp_ctx, const char *filename);
+bool lpcfg_load(struct loadparm_context *lp_ctx, const char *filename);
 
 /**
  * Return the max number of services.
  */
-int lp_numservices(struct loadparm_context *lp_ctx);
+int lpcfg_numservices(struct loadparm_context *lp_ctx);
 
 /**
  * Display the contents of the services array in human-readable form.
  */
-void lp_dump(struct loadparm_context *lp_ctx, FILE *f, bool show_defaults,
+void lpcfg_dump(struct loadparm_context *lp_ctx, FILE *f, bool show_defaults,
              int maxtoprint);
 
@@ -298 +203 @@
  * Display the contents of one service in human-readable form.
  */
-void lp_dump_one(FILE *f, bool show_defaults, struct loadparm_service *service, struct loadparm_service *sDefault);
-struct loadparm_service *lp_servicebynum(struct loadparm_context *lp_ctx,
+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 *lp_service(struct loadparm_context *lp_ctx,
+struct loadparm_service *lpcfg_service(struct loadparm_context *lp_ctx,
                                     const char *service_name);
 
@@ -312 +217 @@
  * If we are PDC then prefer us as DMB
  */
-const char *lp_printername(struct loadparm_service *service, struct loadparm_service *sDefault);
+const char *lpcfg_printername(struct loadparm_service *service, struct loadparm_service *sDefault);
 
 /**
  * Return the max print jobs per queue.
  */
-int lp_maxprintjobs(struct loadparm_service *service, struct loadparm_service *sDefault);
-struct smb_iconv_convenience *lp_iconv_convenience(struct loadparm_context *lp_ctx);
-void lp_smbcli_options(struct loadparm_context *lp_ctx,
+int lpcfg_maxprintjobs(struct loadparm_service *service, struct loadparm_service *sDefault);
+struct smb_iconv_convenience *lpcfg_iconv_convenience(struct loadparm_context *lp_ctx);
+void lpcfg_smbcli_options(struct loadparm_context *lp_ctx,
                          struct smbcli_options *options);
-void lp_smbcli_session_options(struct loadparm_context *lp_ctx,
+void lpcfg_smbcli_session_options(struct loadparm_context *lp_ctx,
                                  struct smbcli_session_options *options);
-struct dcerpc_server_info *lp_dcerpc_server_info(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
-struct gensec_settings *lp_gensec_settings(TALLOC_CTX *, struct loadparm_context *);
+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 *);
 
 
@@ -355 +260 @@
  * @brief Misc utility functions
  */
-bool lp_is_mydomain(struct loadparm_context *lp_ctx, 
+bool lpcfg_is_mydomain(struct loadparm_context *lp_ctx,
                              const char *domain);
 
-bool lp_is_my_domain_or_realm(struct loadparm_context *lp_ctx, 
+bool lpcfg_is_my_domain_or_realm(struct loadparm_context *lp_ctx,
                               const char *domain);
 
@@ -365 +270 @@
   netbios aliases. do a case insensitive match
 */
-bool lp_is_myname(struct loadparm_context *lp_ctx, const char *name);
+bool lpcfg_is_myname(struct loadparm_context *lp_ctx, const char *name);
 
 /**
@@ -401 +306 @@
 */
 char *smbd_tmp_path(TALLOC_CTX *mem_ctx, 
-                             struct loadparm_context *lp_ctx, 
+                             struct loadparm_context *lp_ctx,
                              const char *name);
 
@@ -428 +333 @@
  */
 init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *subsystem);
-const char *lp_messaging_path(TALLOC_CTX *mem_ctx, 
+const char *lpcfg_messaging_path(TALLOC_CTX *mem_ctx,
                                        struct loadparm_context *lp_ctx);
-struct smb_iconv_convenience *smb_iconv_convenience_init_lp(TALLOC_CTX *mem_ctx,
-                                                         struct loadparm_context *lp_ctx);
-
-const char *lp_sam_name(struct loadparm_context *lp_ctx);
+struct smb_iconv_convenience *smb_iconv_convenience_reinit_lp(TALLOC_CTX *mem_ctx,
+                                                              struct loadparm_context *lp_ctx,
+                                                              struct smb_iconv_convenience *old_ic);
+
+const char *lpcfg_sam_name(struct loadparm_context *lp_ctx);
 
 /* The following definitions come from lib/version.c  */

vendor/current/source4/param/provision.c

@@ -19 +19 @@
 */
 
+#include <Python.h>
+#include <ldb.h>
+#include <pyldb.h>
 #include "includes.h"
-#include "auth/auth.h"
-#include "lib/ldb_wrap.h"
-#include "ldb/include/ldb.h"
-#include "ldb_errors.h"
-#include "libcli/raw/libcliraw.h"
 #include "librpc/ndr/libndr.h"
-
-#include "param/param.h"
 #include "param/provision.h"
 #include "param/secrets.h"
-#include <Python.h>
 #include "lib/talloc/pytalloc.h"
-#include "librpc/rpc/pyrpc.h"
 #include "scripting/python/modules.h"
-#include "lib/ldb/pyldb.h"
 #include "param/pyparam.h"
+#include "dynconfig/dynconfig.h"
 
 static PyObject *provision_module(void)
@@ -43 +37 @@
                 return NULL;
         return PyImport_Import(name);
+}
+
+static PyObject *schema_module(void)
+{
+        PyObject *name = PyString_FromString("samba.schema");
+        if (name == NULL)
+                return NULL;
+        return PyImport_Import(name);
+}
+
+static PyObject *ldb_module(void)
+{
+        PyObject *name = PyString_FromString("ldb");
+        if (name == NULL)
+                return NULL;
+        return PyImport_Import(name);
+}
+
+static PyObject *PyLdb_FromLdbContext(struct ldb_context *ldb_ctx)
+{
+        PyLdbObject *ret;
+        PyObject *ldb_mod = ldb_module();
+        PyTypeObject *ldb_ctx_type;
+        if (ldb_mod == NULL)
+                return NULL;
+
+        ldb_ctx_type = (PyTypeObject *)PyObject_GetAttrString(ldb_mod, "Ldb");
+
+        ret = (PyLdbObject *)ldb_ctx_type->tp_alloc(ldb_ctx_type, 0);
+        if (ret == NULL) {
+                PyErr_NoMemory();
+                return NULL;
+        }
+        ret->mem_ctx = talloc_new(NULL);
+        ret->ldb_ctx = talloc_reference(ret->mem_ctx, ldb_ctx);
+        return (PyObject *)ret;
 }
 
@@ -50 +80 @@
 {
         const char *configfile;
-        PyObject *provision_mod, *provision_dict, *provision_fn, *py_result, *parameters;
+        PyObject *provision_mod, *provision_dict, *provision_fn, *py_result, *parameters, *py_lp_ctx;
         
         DEBUG(0,("Provision for Become-DC test using python\n"));
 
-        py_load_samba_modules();
         Py_Initialize();
-        py_update_path("bin"); /* FIXME: Can't assume this is always the case */
+        py_update_path(); /* Put the samba path at the start of sys.path */
 
         provision_mod = provision_module();
@@ -88 +117 @@
                 settings->invocation_id == NULL?"None":GUID_string(mem_ctx, settings->invocation_id)));
 
-        DEBUG(0,("Pathes under targetdir[%s]\n",
+        DEBUG(0,("Paths under targetdir[%s]\n",
                  settings->targetdir));
         parameters = PyDict_New();
 
-        configfile = lp_configfile(lp_ctx);
+        configfile = lpcfg_configfile(lp_ctx);
         if (configfile != NULL) {
                 PyDict_SetItemString(parameters, "smbconf", 
@@ -103 +132 @@
                 PyDict_SetItemString(parameters, "targetdir", 
                                                          PyString_FromString(settings->targetdir));
-        PyDict_SetItemString(parameters, "setup_dir", 
-                             PyString_FromString("setup"));
         PyDict_SetItemString(parameters, "hostname", 
                                                  PyString_FromString(settings->netbios_name));
@@ -154 +181 @@
 
         /* FIXME paths */
-        result->lp_ctx = lp_from_py_object(PyObject_GetAttrString(py_result, "lp"));
+        py_lp_ctx = PyObject_GetAttrString(py_result, "lp");
+        if (py_lp_ctx == NULL) {
+                DEBUG(0, ("Missing 'lp' attribute"));
+                return NT_STATUS_UNSUCCESSFUL;
+        }
+        result->lp_ctx = lpcfg_from_py_object(mem_ctx, py_lp_ctx);
         result->samdb = PyLdb_AsLdbContext(PyObject_GetAttrString(py_result, "samdb"));
 
         return NT_STATUS_OK;
 }
-
-extern void initldb(void);
 
 static PyObject *py_dom_sid_FromSid(struct dom_sid *sid)
@@ -191 +221 @@
 
         /* Open the secrets database */
-        ldb = secrets_db_connect(tmp_mem, event_ctx, lp_ctx);
+        ldb = secrets_db_connect(tmp_mem, lp_ctx);
         if (!ldb) {
                 *error_string
@@ -210 +240 @@
         }
 
-        py_load_samba_modules();
         Py_Initialize();
-        py_update_path("bin"); /* FIXME: Can't assume this is always the case */
-        initldb();
+        py_update_path(); /* Put the samba path at the start of sys.path */
         provision_mod = provision_module();
 
@@ -248 +276 @@
         PyDict_SetItemString(parameters, "domain", 
                              PyString_FromString(settings->domain_name));
-        PyDict_SetItemString(parameters, "domain", 
-                             PyString_FromString(settings->domain_name));
-        PyDict_SetItemString(parameters, "realm", 
-                             PyString_FromString(settings->realm));
+        if (settings->realm != NULL) {
+                PyDict_SetItemString(parameters, "realm",
+                                     PyString_FromString(settings->realm));
+        }
         PyDict_SetItemString(parameters, "machinepass", 
                              PyString_FromString(settings->machine_password));
@@ -301 +329 @@
         return NT_STATUS_UNSUCCESSFUL;
 }
+
+
+struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
+                                         DATA_BLOB *override_prefixmap)
+{
+        PyObject *schema_mod, *schema_dict, *schema_fn, *py_result, *parameters;
+        
+        Py_Initialize();
+        py_update_path(); /* Put the samba path at the start of sys.path */
+
+        schema_mod = schema_module();
+
+        if (schema_mod == NULL) {
+                PyErr_Print();
+                DEBUG(0, ("Unable to import schema Python module.\n"));
+                return NULL;
+        }
+
+        schema_dict = PyModule_GetDict(schema_mod);
+
+        if (schema_dict == NULL) {
+                DEBUG(0, ("Unable to get dictionary for schema module\n"));
+                return NULL;
+        }
+
+        schema_fn = PyDict_GetItemString(schema_dict, "ldb_with_schema");
+        if (schema_fn == NULL) {
+                PyErr_Print();
+                DEBUG(0, ("Unable to get schema_get_ldb function\n"));
+                return NULL;
+        }
+        
+        parameters = PyDict_New();
+
+        if (override_prefixmap) {
+                PyDict_SetItemString(parameters, "override_prefixmap",
+                                     PyString_FromStringAndSize((const char *)override_prefixmap->data,
+                                                                override_prefixmap->length));
+        }
+
+        py_result = PyEval_CallObjectWithKeywords(schema_fn, NULL, parameters);
+
+        Py_DECREF(parameters);
+
+        if (py_result == NULL) {
+                PyErr_Print();
+                PyErr_Clear();
+                return NULL;
+        }
+
+        return PyLdb_AsLdbContext(PyObject_GetAttrString(py_result, "ldb"));
+}

vendor/current/source4/param/provision.h

@@ -49 +49 @@
         const char *realm;
         const char *netbios_name;
-        const char *account_name;
         enum netr_SchannelType secure_channel_type;
         const char *machine_password;
@@ -65 +64 @@
                                    const char **error_string);
 
+struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
+                                         DATA_BLOB *override_prefixmap);
+
 #endif /* _PROVISION_H_ */

vendor/current/source4/param/pyparam.c

@@ -18 +18 @@
 */
 
-#include <stdint.h>
-#include <stdbool.h>
-
+#include <Python.h>
 #include "includes.h"
 #include "param/param.h"
 #include "param/loadparm.h"
-#include <Python.h>
-#include "pytalloc.h"
+#include "lib/talloc/pytalloc.h"
+#include "dynconfig/dynconfig.h"
 
 /* There's no Py_ssize_t in 2.4, apparently */
@@ -33 +31 @@
 #endif
 
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
 #define PyLoadparmContext_AsLoadparmContext(obj) py_talloc_get_type(obj, struct loadparm_context)
-
-PyAPI_DATA(PyTypeObject) PyLoadparmContext;
-PyAPI_DATA(PyTypeObject) PyLoadparmService;
+#define PyLoadparmService_AsLoadparmService(obj) py_talloc_get_type(obj, struct loadparm_service)
+
+extern PyTypeObject PyLoadparmContext;
+extern PyTypeObject PyLoadparmService;
 
 PyObject *PyLoadparmService_FromService(struct loadparm_service *service)
@@ -49 +44 @@
 static PyObject *py_lp_ctx_get_helper(struct loadparm_context *lp_ctx, const char *service_name, const char *param_name)
 {
-    struct parm_struct *parm = NULL;
-    void *parm_ptr = NULL;
-    int i;
-
-    if (service_name != NULL) {
-        struct loadparm_service *service;
-        /* its a share parameter */
-        service = lp_service(lp_ctx, service_name);
-        if (service == NULL) {
-            return NULL;
-        }
-        if (strchr(param_name, ':')) {
-            /* its a parametric option on a share */
-            const char *type = talloc_strndup(lp_ctx, 
-                              param_name, 
-                              strcspn(param_name, ":"));
-            const char *option = strchr(param_name, ':') + 1;
-            const char *value;
-            if (type == NULL || option == NULL) {
-                return NULL;
-            }
-            value = lp_get_parametric(lp_ctx, service, type, option);
-            if (value == NULL) {
-                return NULL;
-            }
-            return PyString_FromString(value);
-        }
-
-        parm = lp_parm_struct(param_name);
-        if (parm == NULL || parm->pclass == P_GLOBAL) {
-            return NULL;
-        }
-        parm_ptr = lp_parm_ptr(lp_ctx, service, parm);
+        struct parm_struct *parm = NULL;
+        void *parm_ptr = NULL;
+        int i;
+
+        if (service_name != NULL && strwicmp(service_name, GLOBAL_NAME) && 
+                strwicmp(service_name, GLOBAL_NAME2)) {
+                struct loadparm_service *service;
+                /* its a share parameter */
+                service = lpcfg_service(lp_ctx, service_name);
+                if (service == NULL) {
+                        return NULL;
+                }
+                if (strchr(param_name, ':')) {
+                        /* its a parametric option on a share */
+                        const char *type = talloc_strndup(lp_ctx, param_name,
+                                                                                          strcspn(param_name, ":"));
+                        const char *option = strchr(param_name, ':') + 1;
+                        const char *value;
+                        if (type == NULL || option == NULL) {
+                        return NULL;
+                        }
+                        value = lpcfg_get_parametric(lp_ctx, service, type, option);
+                        if (value == NULL) {
+                        return NULL;
+                        }
+                        return PyString_FromString(value);
+                }
+
+                parm = lpcfg_parm_struct(param_name);
+                if (parm == NULL || parm->pclass == P_GLOBAL) {
+                        return NULL;
+                }
+                parm_ptr = lpcfg_parm_ptr(lp_ctx, service, parm);
     } else if (strchr(param_name, ':')) {
-        /* its a global parametric option */
-        const char *type = talloc_strndup(lp_ctx, 
-                          param_name, strcspn(param_name, ":"));
-        const char *option = strchr(param_name, ':') + 1;
-        const char *value;
-        if (type == NULL || option == NULL) {
-            return NULL;
-        }
-        value = lp_get_parametric(lp_ctx, NULL, type, option);
-        if (value == NULL)
-            return NULL;
-        return PyString_FromString(value);
-    } else {
-        /* its a global parameter */
-        parm = lp_parm_struct(param_name);
-        if (parm == NULL) {
-            return NULL;
-        }
-        parm_ptr = lp_parm_ptr(lp_ctx, NULL, parm);
-    }
-
-    if (parm == NULL || parm_ptr == NULL) {
-        return NULL;
+                /* its a global parametric option */
+                const char *type = talloc_strndup(lp_ctx,
+                                  param_name, strcspn(param_name, ":"));
+                const char *option = strchr(param_name, ':') + 1;
+                const char *value;
+                if (type == NULL || option == NULL) {
+                        return NULL;
+                }
+                value = lpcfg_get_parametric(lp_ctx, NULL, type, option);
+                if (value == NULL)
+                        return NULL;
+                return PyString_FromString(value);
+        } else {
+                /* its a global parameter */
+                parm = lpcfg_parm_struct(param_name);
+                if (parm == NULL) {
+                        return NULL;
+                }
+                parm_ptr = lpcfg_parm_ptr(lp_ctx, NULL, parm);
+        }
+
+        if (parm == NULL || parm_ptr == NULL) {
+                return NULL;
     }
 
@@ -126 +121 @@
         }
         return NULL;
+    case P_CMDLIST:
     case P_LIST: 
         {
@@ -156 +152 @@
                 return NULL;
 
-        ret = lp_load(PyLoadparmContext_AsLoadparmContext(self), filename);
+        ret = lpcfg_load(PyLoadparmContext_AsLoadparmContext(self), filename);
 
         if (!ret) {
@@ -168 +164 @@
 {
         bool ret;
-        ret = lp_load_default(PyLoadparmContext_AsLoadparmContext(self));
+        ret = lpcfg_load_default(PyLoadparmContext_AsLoadparmContext(self));
 
         if (!ret) {
@@ -182 +178 @@
         char *section_name = NULL;
         PyObject *ret;
-        if (!PyArg_ParseTuple(args, "s|s", &param_name, &section_name))
+        if (!PyArg_ParseTuple(args, "s|z", &param_name, &section_name))
                 return NULL;
 
@@ -197 +193 @@
                 return NULL;
 
-        return PyBool_FromLong(lp_is_myname(PyLoadparmContext_AsLoadparmContext(self), name));
+        return PyBool_FromLong(lpcfg_is_myname(PyLoadparmContext_AsLoadparmContext(self), name));
 }
 
@@ -206 +202 @@
                 return NULL;
 
-        return PyBool_FromLong(lp_is_mydomain(PyLoadparmContext_AsLoadparmContext(self), name));
+        return PyBool_FromLong(lpcfg_is_mydomain(PyLoadparmContext_AsLoadparmContext(self), name));
 }
 
@@ -216 +212 @@
                 return NULL;
 
-        ret = lp_set_cmdline(PyLoadparmContext_AsLoadparmContext(self), name, value);
+        ret = lpcfg_set_cmdline(PyLoadparmContext_AsLoadparmContext(self), name, value);
         if (!ret) {
                 PyErr_SetString(PyExc_RuntimeError, "Unable to set parameter");
@@ -244 +240 @@
         PyObject *ret;
         int i;
-        ret = PyList_New(lp_numservices(lp_ctx));
-        for (i = 0; i < lp_numservices(lp_ctx); i++) {
-                struct loadparm_service *service = lp_servicebynum(lp_ctx, i);
+        ret = PyList_New(lpcfg_numservices(lp_ctx));
+        for (i = 0; i < lpcfg_numservices(lp_ctx); i++) {
+                struct loadparm_service *service = lpcfg_servicebynum(lp_ctx, i);
                 if (service != NULL) {
-                        PyList_SetItem(ret, i, PyString_FromString(lp_servicename(service)));
+                        PyList_SetItem(ret, i, PyString_FromString(lpcfg_servicename(service)));
                 }
         }
         return ret;
 }
+
+static PyObject *py_lp_dump(PyObject *self, PyObject *args)
+{
+        PyObject *py_stream;
+        bool show_defaults = false;
+        FILE *f;
+        struct loadparm_context *lp_ctx = PyLoadparmContext_AsLoadparmContext(self);
+
+        if (!PyArg_ParseTuple(args, "O|b", &py_stream, &show_defaults))
+                return NULL;
+
+        f = PyFile_AsFile(py_stream);
+        if (f == NULL) {
+                PyErr_SetString(PyExc_TypeError, "Not a file stream");
+                return NULL;
+        }
+
+        lpcfg_dump(lp_ctx, f, show_defaults, lpcfg_numservices(lp_ctx));
+
+        Py_RETURN_NONE;
+}
+
 
 static PyMethodDef py_lp_ctx_methods[] = {
@@ -277 +295 @@
         { "services", (PyCFunction)py_lp_ctx_services, METH_NOARGS,
                 "S.services() -> list" },
+        { "dump", (PyCFunction)py_lp_dump, METH_VARARGS, 
+                "S.dump(stream, show_defaults=False)" },
         { NULL }
 };
@@ -282 +302 @@
 static PyObject *py_lp_ctx_default_service(py_talloc_Object *self, void *closure)
 {
-        return PyLoadparmService_FromService(lp_default_service(PyLoadparmContext_AsLoadparmContext(self)));
+        return PyLoadparmService_FromService(lpcfg_default_service(PyLoadparmContext_AsLoadparmContext(self)));
 }
 
 static PyObject *py_lp_ctx_config_file(py_talloc_Object *self, void *closure)
 {
-        const char *configfile = lp_configfile(PyLoadparmContext_AsLoadparmContext(self));
+        const char *configfile = lpcfg_configfile(PyLoadparmContext_AsLoadparmContext(self));
         if (configfile == NULL)
                 Py_RETURN_NONE;
@@ -313 +333 @@
                 return NULL;
         }
-        ret->ptr = loadparm_init(ret->talloc_ctx);
+        ret->ptr = loadparm_init_global(false);
         return (PyObject *)ret;
 }
@@ -319 +339 @@
 static Py_ssize_t py_lp_ctx_len(py_talloc_Object *self)
 {
-        return lp_numservices(PyLoadparmContext_AsLoadparmContext(self));
+        return lpcfg_numservices(PyLoadparmContext_AsLoadparmContext(self));
 }
 
@@ -329 +349 @@
                 return NULL;
         }
-        service = lp_service(PyLoadparmContext_AsLoadparmContext(self), PyString_AsString(name));
+        service = lpcfg_service(PyLoadparmContext_AsLoadparmContext(self), PyString_AsString(name));
         if (service == NULL) {
                 PyErr_SetString(PyExc_KeyError, "No such section");
@@ -345 +365 @@
         .tp_name = "LoadParm",
         .tp_basicsize = sizeof(py_talloc_Object),
-        .tp_dealloc = py_talloc_dealloc,
         .tp_getset = py_lp_ctx_getset,
         .tp_methods = py_lp_ctx_methods,
@@ -353 +372 @@
 };
 
+static PyObject *py_lp_service_dump(PyObject *self, PyObject *args)
+{
+        PyObject *py_stream;
+        bool show_defaults = false;
+        FILE *f;
+        struct loadparm_service *service = PyLoadparmService_AsLoadparmService(self);
+        struct loadparm_service *default_service;
+        PyObject *py_default_service;
+
+        if (!PyArg_ParseTuple(args, "OO|b", &py_stream, &py_default_service,
+                                                  &show_defaults))
+                return NULL;
+
+        f = PyFile_AsFile(py_stream);
+        if (f == NULL) {
+                PyErr_SetString(PyExc_TypeError, "Not a file stream");
+                return NULL;
+        }
+
+        if (!PyObject_TypeCheck(py_default_service, &PyLoadparmService)) {
+                PyErr_SetNone(PyExc_TypeError);
+                return NULL;
+        }
+
+        default_service = PyLoadparmService_AsLoadparmService(py_default_service);
+
+        lpcfg_dump_one(f, show_defaults, service, default_service);
+
+        Py_RETURN_NONE;
+}
+
+static PyMethodDef py_lp_service_methods[] = {
+        { "dump", (PyCFunction)py_lp_service_dump, METH_VARARGS, 
+                "S.dump(f, default_service, show_defaults=False)" },
+        { NULL }
+};
+
 PyTypeObject PyLoadparmService = {
         .tp_name = "LoadparmService",
-        .tp_dealloc = py_talloc_dealloc,
         .tp_basicsize = sizeof(py_talloc_Object),
+        .tp_methods = py_lp_service_methods,
         .tp_flags = Py_TPFLAGS_DEFAULT,
 };
@@ -363 +419 @@
 {
     return PyString_FromString(lp_default_path());
+}
+
+static PyObject *py_setup_dir(PyObject *self)
+{
+    return PyString_FromString(dyn_SETUPDIR);
 }
 
@@ -368 +429 @@
     { "default_path", (PyCFunction)py_default_path, METH_NOARGS, 
         "Returns the default smb.conf path." },
+    { "setup_dir", (PyCFunction)py_setup_dir, METH_NOARGS,
+        "Returns the compiled in location of provision tempates." },
     { NULL }
 };
@@ -374 +437 @@
 {
         PyObject *m;
+        PyTypeObject *talloc_type = PyTalloc_GetObjectType();
+        if (talloc_type == NULL)
+                return;
+
+        PyLoadparmContext.tp_base = talloc_type;
+        PyLoadparmService.tp_base = talloc_type;
 
         if (PyType_Ready(&PyLoadparmContext) < 0)
+                return;
+
+        if (PyType_Ready(&PyLoadparmService) < 0)
                 return;
 

vendor/current/source4/param/pyparam.h

@@ -21 +21 @@
 #define _PYPARAM_H_
 
-_PUBLIC_ struct loadparm_context *lp_from_py_object(PyObject *py_obj);
+#include "param/param.h"
+
+_PUBLIC_ struct loadparm_context *lpcfg_from_py_object(TALLOC_CTX *mem_ctx, PyObject *py_obj);
 _PUBLIC_ struct loadparm_context *py_default_loadparm_context(TALLOC_CTX *mem_ctx);
 

vendor/current/source4/param/pyparam_util.c

@@ -18 +18 @@
 */
 
-#include <stdint.h>
-#include <stdbool.h>
-
+#include <Python.h>
 #include "includes.h"
 #include "param/param.h"
 #include "param/loadparm.h"
-#include <Python.h>
-#include "pytalloc.h"
+#include "lib/talloc/pytalloc.h"
 
 #define PyLoadparmContext_AsLoadparmContext(obj) py_talloc_get_type(obj, struct loadparm_context)
 
-_PUBLIC_ struct loadparm_context *lp_from_py_object(PyObject *py_obj)
+_PUBLIC_ struct loadparm_context *lpcfg_from_py_object(TALLOC_CTX *mem_ctx, PyObject *py_obj)
 {
-    struct loadparm_context *lp_ctx;
+        struct loadparm_context *lp_ctx;
+        PyObject *param_mod;
+        PyTypeObject *lp_type;
+        bool is_lpobj;
 
-    if (PyString_Check(py_obj)) {
-        lp_ctx = loadparm_init(NULL);
-        if (!lp_load(lp_ctx, PyString_AsString(py_obj))) {
-            talloc_free(lp_ctx);
+        if (PyString_Check(py_obj)) {
+                lp_ctx = loadparm_init_global(false);
+                if (!lpcfg_load(lp_ctx, PyString_AsString(py_obj))) {
                         PyErr_Format(PyExc_RuntimeError, "Unable to load %s", 
-                                                 PyString_AsString(py_obj));
-            return NULL;
-        }
-        return lp_ctx;
-    }
+                                     PyString_AsString(py_obj));
+                        return NULL;
+                }
+                return lp_ctx;
+        }
 
-    if (py_obj == Py_None) {
-        lp_ctx = loadparm_init(NULL);
-                /* We're not checking that loading the file succeeded *on purpose */
-        lp_load_default(lp_ctx);
-        return lp_ctx;
-    }
+        if (py_obj == Py_None) {
+                return loadparm_init_global(true);
+        }
 
-    return PyLoadparmContext_AsLoadparmContext(py_obj);
+        param_mod = PyImport_ImportModule("samba.param");
+        if (param_mod == NULL) {
+                return NULL;
+        }
+
+        lp_type = (PyTypeObject *)PyObject_GetAttrString(param_mod, "LoadParm");
+        Py_DECREF(param_mod);
+        if (lp_type == NULL) {
+                PyErr_SetString(PyExc_RuntimeError, "Unable to import LoadParm");
+                return NULL;
+        }
+
+        is_lpobj = PyObject_TypeCheck(py_obj, lp_type);
+        Py_DECREF(lp_type);
+        if (is_lpobj) {
+                return talloc_reference(mem_ctx, PyLoadparmContext_AsLoadparmContext(py_obj));
+        }
+
+        PyErr_SetNone(PyExc_TypeError);
+        return NULL;
 }
 
 struct loadparm_context *py_default_loadparm_context(TALLOC_CTX *mem_ctx)
 {
-    struct loadparm_context *ret;
-    ret = loadparm_init(mem_ctx);
-    if (!lp_load_default(ret))
-        return NULL;
-    return ret;
+        return loadparm_init_global(true);
 }
 

vendor/current/source4/param/samba-hostconfig.pc.in

@@ -6 +6 @@
 Name: samba-hostconfig
 Description: Host-wide Samba configuration
-Version: 0.0.1
-Libs: -L${libdir} -lsamba-hostconfig 
+Version: @PACKAGE_VERSION@
+Libs: @LIB_RPATH@ -L${libdir} -lsamba-hostconfig
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1

vendor/current/source4/param/secrets.c

@@ -26 +26 @@
 #include "param/param.h"
 #include "system/filesys.h"
-#include "tdb_wrap.h"
-#include "lib/ldb/include/ldb.h"
-#include "../tdb/include/tdb.h"
+#include "lib/util/tdb_wrap.h"
+#include "lib/ldb-samba/ldb_wrap.h"
+#include <ldb.h>
 #include "../lib/util/util_tdb.h"
-#include "../lib/util/util_ldb.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "dsdb/samdb/samdb.h"
 
 /**
@@ -87 +87 @@
 */
 struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx,
-                                        struct tevent_context *ev_ctx,
                                         struct loadparm_context *lp_ctx)
 {
-        char *path;
-        const char *url;
-        struct ldb_context *ldb;
-
-        url = lp_secrets_url(lp_ctx);
-        if (!url || !url[0]) {
-                return NULL;
-        }
-
-        path = private_path(mem_ctx, lp_ctx, url);
-        if (!path) {
-                return NULL;
-        }
-
-        /* Secrets.ldb *must* always be local.  If we call for a
-         * system_session() we will recurse */
-        ldb = ldb_init(mem_ctx, ev_ctx);
-        if (!ldb) {
-                talloc_free(path);
-                return NULL;
-        }
-
-        ldb_set_modules_dir(ldb, 
-                            talloc_asprintf(ldb, "%s/ldb", lp_modulesdir(lp_ctx)));
-
-        if (ldb_connect(ldb, path, 0, NULL) != 0) {
-                talloc_free(path);
-                return NULL;
-        }
-
-        /* the update_keytab module relies on this being setup */
-        if (ldb_set_opaque(ldb, "loadparm", lp_ctx) != LDB_SUCCESS) {
-                talloc_free(path);
-                talloc_free(ldb);
-                return NULL;
-        }
-
-        talloc_free(path);
-        
-        return ldb;
+        return ldb_wrap_connect(mem_ctx, NULL, lp_ctx, lpcfg_secrets_url(lp_ctx),
+                               NULL, NULL, 0);
 }
 
@@ -137 +98 @@
  */
 struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
-                                       struct tevent_context *ev_ctx,
                                        struct loadparm_context *lp_ctx,
-                                       const char *domain)
+                                       const char *domain,
+                                       enum netr_SchannelType *sec_channel_type,
+                                       char **errstring)
 {
         struct ldb_context *ldb;
-        struct ldb_message **msgs;
+        struct ldb_message *msg;
         int ldb_ret;
-        const char *attrs[] = { "objectSid", NULL };
+        const char *attrs[] = { "objectSid", "secureChannelType", NULL };
         struct dom_sid *result = NULL;
         const struct ldb_val *v;
         enum ndr_err_code ndr_err;
 
-        ldb = secrets_db_connect(mem_ctx, ev_ctx, lp_ctx);
+        *errstring = NULL;
+
+        ldb = secrets_db_connect(mem_ctx, lp_ctx);
         if (ldb == NULL) {
                 DEBUG(5, ("secrets_db_connect failed\n"));
@@ -155 +119 @@
         }
 
-        ldb_ret = gendb_search(ldb, ldb,
-                               ldb_dn_new(mem_ctx, ldb, SECRETS_PRIMARY_DOMAIN_DN), 
-                               &msgs, attrs,
-                               SECRETS_PRIMARY_DOMAIN_FILTER, domain);
+        ldb_ret = dsdb_search_one(ldb, ldb, &msg,
+                              ldb_dn_new(mem_ctx, ldb, SECRETS_PRIMARY_DOMAIN_DN),
+                              LDB_SCOPE_ONELEVEL,
+                              attrs, 0, SECRETS_PRIMARY_DOMAIN_FILTER, domain);
 
-        if (ldb_ret == -1) {
-                DEBUG(5, ("Error searching for domain SID for %s: %s", 
-                          domain, ldb_errstring(ldb))); 
-                talloc_free(ldb);
+        if (ldb_ret != LDB_SUCCESS) {
+                *errstring = talloc_asprintf(mem_ctx, "Failed to find record for %s in %s: %s: %s", 
+                                             domain, (char *) ldb_get_opaque(ldb, "ldb_url"),
+                                             ldb_strerror(ldb_ret), ldb_errstring(ldb));
+                return NULL;
+        }
+        v = ldb_msg_find_ldb_val(msg, "objectSid");
+        if (v == NULL) {
+                *errstring = talloc_asprintf(mem_ctx, "Failed to find a SID on record for %s in %s", 
+                                             domain, (char *) ldb_get_opaque(ldb, "ldb_url"));
                 return NULL;
         }
 
-        if (ldb_ret == 0) {
-                DEBUG(5, ("Did not find domain record for %s\n", domain));
-                talloc_free(ldb);
-                return NULL;
+        if (sec_channel_type) {
+                int t;
+                t = ldb_msg_find_attr_as_int(msg, "secureChannelType", -1);
+                if (t == -1) {
+                        *errstring = talloc_asprintf(mem_ctx, "Failed to find secureChannelType for %s in %s",
+                                                     domain, (char *) ldb_get_opaque(ldb, "ldb_url"));
+                        return NULL;
+                }
+                *sec_channel_type = t;
         }
 
-        if (ldb_ret > 1) {
-                DEBUG(5, ("Found more than one (%d) domain records for %s\n",
-                          ldb_ret, domain));
-                talloc_free(ldb);
-                return NULL;
-        }
-
-        v = ldb_msg_find_ldb_val(msgs[0], "objectSid");
-        if (v == NULL) {
-                DEBUG(0, ("Domain object for %s does not contain a SID!\n",
-                          domain));
-                return NULL;
-        }
         result = talloc(mem_ctx, struct dom_sid);
         if (result == NULL) {
@@ -192 +154 @@
         }
 
-        ndr_err = ndr_pull_struct_blob(v, result, NULL, result,
+        ndr_err = ndr_pull_struct_blob(v, result, result,
                                        (ndr_pull_flags_fn_t)ndr_pull_dom_sid);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                *errstring = talloc_asprintf(mem_ctx, "Failed to parse SID on record for %s in %s", 
+                                             domain, (char *) ldb_get_opaque(ldb, "ldb_url"));
                 talloc_free(result);
                 talloc_free(ldb);
@@ -202 +166 @@
         return result;
 }
+
+char *keytab_name_from_msg(TALLOC_CTX *mem_ctx, struct ldb_context *ldb, struct ldb_message *msg) 
+{
+        const char *krb5keytab = ldb_msg_find_attr_as_string(msg, "krb5Keytab", NULL);
+        if (krb5keytab) {
+                return talloc_strdup(mem_ctx, krb5keytab);
+        } else {
+                char *file_keytab;
+                char *relative_path;
+                const char *privateKeytab = ldb_msg_find_attr_as_string(msg, "privateKeytab", NULL);
+                if (!privateKeytab) {
+                        return NULL;
+                }
+
+                relative_path = ldb_relative_path(ldb, mem_ctx, privateKeytab);
+                if (!relative_path) {
+                        return NULL;
+                }
+                file_keytab = talloc_asprintf(mem_ctx, "FILE:%s", relative_path);
+                talloc_free(relative_path);
+                return file_keytab;
+        }
+        return NULL;
+}
+

vendor/current/source4/param/secrets.h

@@ -27 +27 @@
 #define SECRETS_KRBTGT_SEARCH "(&((|(realm=%s)(flatname=%s))(samAccountName=krbtgt)))"
 #define SECRETS_PRINCIPAL_SEARCH "(&(|(realm=%s)(flatname=%s))(servicePrincipalName=%s))"
-#define SECRETS_LDAP_FILTER "(objectclass=ldapSecret)"
+#define SECRETS_LDAP_FILTER "(&(objectclass=ldapSecret)(cn=SAMDB Credentials))"
 
 /**
@@ -39 +39 @@
 struct loadparm_context;
 struct tevent_context;
+struct ldb_message;
+struct ldb_context;
+
+#include "librpc/gen_ndr/misc.h"
+
 struct tdb_wrap *secrets_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
-struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx);
-struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, const char *domain);
+struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
+struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
+                                       struct loadparm_context *lp_ctx,
+                                       const char *domain,
+                                       enum netr_SchannelType *sec_channel_type,
+                                       char **errstring);
+char *keytab_name_from_msg(TALLOC_CTX *mem_ctx, struct ldb_context *ldb, struct ldb_message *msg);
 
 

vendor/current/source4/param/share.c

@@ -147 +147 @@
 NTSTATUS share_init(void)
 {
-        extern NTSTATUS share_ldb_init(void);
-        extern NTSTATUS share_classic_init(void);
+#define _MODULE_PROTO(init) extern NTSTATUS init(void);
+        STATIC_share_MODULES_PROTO;
         init_module_fn static_init[] = { STATIC_share_MODULES };
 

vendor/current/source4/param/share.h

@@ -68 +68 @@
 struct loadparm_context;
 
-#include "param/share_proto.h"
+const char *share_string_option(struct share_config *scfg, const char *opt_name, const char *defval);
+int share_int_option(struct share_config *scfg, const char *opt_name, int defval);
+bool share_bool_option(struct share_config *scfg, const char *opt_name, bool defval);
+const char **share_string_list_option(TALLOC_CTX *mem_ctx, struct share_config *scfg, const char *opt_name);
+NTSTATUS share_list_all(TALLOC_CTX *mem_ctx, struct share_context *sctx, int *count, const char ***names);
+NTSTATUS share_get_config(TALLOC_CTX *mem_ctx, struct share_context *sctx, const char *name, struct share_config **scfg);
+NTSTATUS share_create(struct share_context *sctx, const char *name, struct share_info *info, int count);
+NTSTATUS share_set(struct share_context *sctx, const char *name, struct share_info *info, int count);
+NTSTATUS share_remove(struct share_context *sctx, const char *name);
+NTSTATUS share_register(const struct share_ops *ops);
+NTSTATUS share_get_context_by_name(TALLOC_CTX *mem_ctx, const char *backend_name,
+                                   struct tevent_context *event_ctx, 
+                                   struct loadparm_context *lp_ctx,
+                                   struct share_context **ctx);
+NTSTATUS share_init(void);
 
 /* list of shares options */

vendor/current/source4/param/share_classic.c

@@ -48 +48 @@
         struct loadparm_service *s = talloc_get_type(scfg->opaque, 
                                                      struct loadparm_service);
-        struct loadparm_context *lp_ctx = talloc_get_type(scfg->ctx->priv_data, 
+        struct loadparm_context *lp_ctx = talloc_get_type(scfg->ctx->priv_data,
                                                           struct loadparm_context);
         char *parm, *val;
@@ -62 +62 @@
                 val++;
 
-                ret = lp_parm_string(lp_ctx, s, parm, val);
+                ret = lpcfg_parm_string(lp_ctx, s, parm, val);
                 if (!ret) {
                         ret = defval;
@@ -75 +75 @@
 
         if (strcmp(opt_name, SHARE_PATH) == 0) {
-                return lp_pathname(s, lp_default_service(lp_ctx));
+                return lpcfg_pathname(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_COMMENT) == 0) {
-                return lp_comment(s, lp_default_service(lp_ctx));
+                return lpcfg_comment(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_VOLUME) == 0) {
-                return volume_label(s, lp_default_service(lp_ctx));
+                return volume_label(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_TYPE) == 0) {
-                if (lp_print_ok(s, lp_default_service(lp_ctx))) {
+                if (lpcfg_print_ok(s, lpcfg_default_service(lp_ctx))) {
                         return "PRINTER";
                 }
-                if (strcmp("NTFS", lp_fstype(s, lp_default_service(lp_ctx))) == 0) {
+                if (strcmp("NTFS", lpcfg_fstype(s, lpcfg_default_service(lp_ctx))) == 0) {
                         return "DISK";
                 }
-                return lp_fstype(s, lp_default_service(lp_ctx));
+                return lpcfg_fstype(s, lpcfg_default_service(lp_ctx));
         }
 
@@ -110 +110 @@
         struct loadparm_service *s = talloc_get_type(scfg->opaque, 
                                                      struct loadparm_service);
-        struct loadparm_context *lp_ctx = talloc_get_type(scfg->ctx->priv_data, 
+        struct loadparm_context *lp_ctx = talloc_get_type(scfg->ctx->priv_data,
                                                           struct loadparm_context);
         char *parm, *val;
@@ -124 +124 @@
                 val++;
 
-                ret = lp_parm_int(lp_ctx, s, parm, val, defval);
+                ret = lpcfg_parm_int(lp_ctx, s, parm, val, defval);
                 if (!ret) {
                         ret = defval;
@@ -133 +133 @@
 
         if (strcmp(opt_name, SHARE_CSC_POLICY) == 0) {
-                return lp_csc_policy(s, lp_default_service(lp_ctx));
+                return lpcfg_csc_policy(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_MAX_CONNECTIONS) == 0) {
-                return lp_max_connections(s, lp_default_service(lp_ctx));
+                return lpcfg_max_connections(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_CREATE_MASK) == 0) {
-                return lp_create_mask(s, lp_default_service(lp_ctx));
+                return lpcfg_create_mask(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_DIR_MASK) == 0) {
-                return lp_dir_mask(s, lp_default_service(lp_ctx));
+                return lpcfg_dir_mask(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_FORCE_DIR_MODE) == 0) {
-                return lp_force_dir_mode(s, lp_default_service(lp_ctx));
+                return lpcfg_force_dir_mode(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_FORCE_CREATE_MODE) == 0) {
-                return lp_force_create_mode(s, lp_default_service(lp_ctx));
+                return lpcfg_force_create_mode(s, lpcfg_default_service(lp_ctx));
         }
 
@@ -168 +168 @@
         struct loadparm_service *s = talloc_get_type(scfg->opaque, 
                                                      struct loadparm_service);
-        struct loadparm_context *lp_ctx = talloc_get_type(scfg->ctx->priv_data, 
+        struct loadparm_context *lp_ctx = talloc_get_type(scfg->ctx->priv_data,
                                                           struct loadparm_context);
         char *parm, *val;
@@ -182 +182 @@
                 val++;
 
-                ret = lp_parm_bool(lp_ctx, s, parm, val, defval);
+                ret = lpcfg_parm_bool(lp_ctx, s, parm, val, defval);
                 talloc_free(parm);
                 return ret;
@@ -192 +192 @@
 
         if (strcmp(opt_name, SHARE_BROWSEABLE) == 0) {
-                return lp_browseable(s, lp_default_service(lp_ctx));
+                return lpcfg_browseable(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_READONLY) == 0) {
-                return lp_readonly(s, lp_default_service(lp_ctx));
+                return lpcfg_readonly(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_MAP_SYSTEM) == 0) {
-                return lp_map_system(s, lp_default_service(lp_ctx));
+                return lpcfg_map_system(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_MAP_HIDDEN) == 0) {
-                return lp_map_hidden(s, lp_default_service(lp_ctx));
+                return lpcfg_map_hidden(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_MAP_ARCHIVE) == 0) {
-                return lp_map_archive(s, lp_default_service(lp_ctx));
+                return lpcfg_map_archive(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_STRICT_LOCKING) == 0) {
-                return lp_strict_locking(s, lp_default_service(lp_ctx));
+                return lpcfg_strict_locking(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_OPLOCKS) == 0) {
-                return lp_oplocks(s, lp_default_service(lp_ctx));
+                return lpcfg_oplocks(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_STRICT_SYNC) == 0) {
-                return lp_strict_sync(s, lp_default_service(lp_ctx));
+                return lpcfg_strict_sync(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_MSDFS_ROOT) == 0) {
-                return lp_msdfs_root(s, lp_default_service(lp_ctx));
+                return lpcfg_msdfs_root(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_CI_FILESYSTEM) == 0) {
-                return lp_ci_filesystem(s, lp_default_service(lp_ctx));
+                return lpcfg_ci_filesystem(s, lpcfg_default_service(lp_ctx));
         }
 
@@ -241 +241 @@
         struct loadparm_service *s = talloc_get_type(scfg->opaque, 
                                                      struct loadparm_service);
-        struct loadparm_context *lp_ctx = talloc_get_type(scfg->ctx->priv_data, 
+        struct loadparm_context *lp_ctx = talloc_get_type(scfg->ctx->priv_data,
                                                           struct loadparm_context);
         char *parm, *val;
@@ -255 +255 @@
                 val++;
 
-                ret = lp_parm_string_list(mem_ctx, lp_ctx, s, parm, val, ",;");
+                ret = lpcfg_parm_string_list(mem_ctx, lp_ctx, s, parm, val, ",;");
                 talloc_free(parm);
                 return ret;
@@ -261 +261 @@
 
         if (strcmp(opt_name, SHARE_HOSTS_ALLOW) == 0) {
-                return lp_hostsallow(s, lp_default_service(lp_ctx));
+                return lpcfg_hostsallow(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_HOSTS_DENY) == 0) {
-                return lp_hostsdeny(s, lp_default_service(lp_ctx));
+                return lpcfg_hostsdeny(s, lpcfg_default_service(lp_ctx));
         }
 
         if (strcmp(opt_name, SHARE_NTVFS_HANDLER) == 0) {
-                return lp_ntvfs_handler(s, lp_default_service(lp_ctx));
+                return lpcfg_ntvfs_handler(s, lpcfg_default_service(lp_ctx));
         }
 
@@ -287 +287 @@
         const char **n;
        
-        num_services = lp_numservices((struct loadparm_context *)ctx->priv_data);
+        num_services = lpcfg_numservices((struct loadparm_context *)ctx->priv_data);
 
         n = talloc_array(mem_ctx, const char *, num_services);
@@ -296 +296 @@
 
         for (i = 0; i < num_services; i++) {
-                n[i] = talloc_strdup(n, lp_servicename(lp_servicebynum((struct loadparm_context *)ctx->priv_data, i)));
+                n[i] = talloc_strdup(n, lpcfg_servicename(lpcfg_servicebynum((struct loadparm_context *)ctx->priv_data, i)));
                 if (!n[i]) {
                         DEBUG(0,("ERROR: Out of memory!\n"));
@@ -318 +318 @@
         struct loadparm_service *service;
 
-        service = lp_service((struct loadparm_context *)ctx->priv_data, name);
+        service = lpcfg_service((struct loadparm_context *)ctx->priv_data, name);
 
         if (service == NULL) {
@@ -330 +330 @@
         }
 
-        s->name = talloc_strdup(s, lp_servicename(service));
+        s->name = talloc_strdup(s, lpcfg_servicename(service));
         if (!s->name) {
                 DEBUG(0,("ERROR: Out of memory!\n"));

vendor/current/source4/param/share_ldb.c

@@ -21 +21 @@
 
 #include "includes.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "auth/auth.h"
 #include "ldb_wrap.h"
@@ -41 +41 @@
         }
         
-        sdb = ldb_wrap_connect(*ctx, ev_ctx, lp_ctx, 
+        sdb = ldb_wrap_connect(*ctx, ev_ctx, lp_ctx,
                                private_path(*ctx, lp_ctx, "share.ldb"),
-                               system_session(*ctx, lp_ctx),
-                               NULL, 0, NULL);
+                               system_session(lp_ctx),
+                               NULL, 0);
 
         if (!sdb) {

vendor/current/source4/param/tests/loadparm.c

@@ -33 +33 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_set_option(lp_ctx, "workgroup=werkgroep"), "lp_set_option failed");
-        torture_assert_str_equal(tctx, "WERKGROEP", lp_workgroup(lp_ctx), "workgroup");
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "workgroup=werkgroep"), "lpcfg_set_option failed");
+        torture_assert_str_equal(tctx, "WERKGROEP", lpcfg_workgroup(lp_ctx), "workgroup");
         return true;
 }
@@ -41 +41 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_set_cmdline(lp_ctx, "workgroup", "werkgroep"), "lp_set_cmdline failed");
-        torture_assert(tctx, lp_do_global_parameter(lp_ctx, "workgroup", "barbla"), "lp_set_option failed");
-        torture_assert_str_equal(tctx, "WERKGROEP", lp_workgroup(lp_ctx), "workgroup");
+        torture_assert(tctx, lpcfg_set_cmdline(lp_ctx, "workgroup", "werkgroep"), "lpcfg_set_cmdline failed");
+        torture_assert(tctx, lpcfg_do_global_parameter(lp_ctx, "workgroup", "barbla"), "lpcfg_set_option failed");
+        torture_assert_str_equal(tctx, "WERKGROEP", lpcfg_workgroup(lp_ctx), "workgroup");
         return true;
 }
@@ -50 +50 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_do_global_parameter(lp_ctx, "workgroup", "werkgroep42"), 
-                       "lp_set_cmdline failed");
-        torture_assert_str_equal(tctx, lp_workgroup(lp_ctx), "WERKGROEP42", "workgroup");
+        torture_assert(tctx, lpcfg_do_global_parameter(lp_ctx, "workgroup", "werkgroep42"),
+                       "lpcfg_set_cmdline failed");
+        torture_assert_str_equal(tctx, lpcfg_workgroup(lp_ctx), "WERKGROEP42", "workgroup");
         return true;
 }
@@ -60 +60 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_do_global_parameter_var(lp_ctx, "workgroup", "werk%s%d", "groep", 42), 
-                       "lp_set_cmdline failed");
-        torture_assert_str_equal(tctx, lp_workgroup(lp_ctx), "WERKGROEP42", "workgroup");
+        torture_assert(tctx, lpcfg_do_global_parameter_var(lp_ctx, "workgroup", "werk%s%d", "groep", 42),
+                       "lpcfg_set_cmdline failed");
+        torture_assert_str_equal(tctx, lpcfg_workgroup(lp_ctx), "WERKGROEP42", "workgroup");
         return true;
 }
@@ -70 +70 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, !lp_set_option(lp_ctx, "workgroup"), "lp_set_option succeeded");
+        torture_assert(tctx, !lpcfg_set_option(lp_ctx, "workgroup"), "lpcfg_set_option succeeded");
         return true;
 }
@@ -77 +77 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_set_option(lp_ctx, "some:thing=blaat"), "lp_set_option failed");
-        torture_assert_str_equal(tctx, lp_parm_string(lp_ctx, NULL, "some", "thing"), "blaat", 
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "some:thing=blaat"), "lpcfg_set_option failed");
+        torture_assert_str_equal(tctx, lpcfg_parm_string(lp_ctx, NULL, "some", "thing"), "blaat",
                                  "invalid parametric option");
         return true;
@@ -86 +86 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_set_option(lp_ctx, "some:thing=3.4"), "lp_set_option failed");
-        torture_assert(tctx, lp_parm_double(lp_ctx, NULL, "some", "thing", 2.0) == 3.4, 
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "some:thing=3.4"), "lpcfg_set_option failed");
+        torture_assert(tctx, lpcfg_parm_double(lp_ctx, NULL, "some", "thing", 2.0) == 3.4,
                                  "invalid parametric option");
-        torture_assert(tctx, lp_parm_double(lp_ctx, NULL, "some", "bla", 2.0) == 2.0, 
+        torture_assert(tctx, lpcfg_parm_double(lp_ctx, NULL, "some", "bla", 2.0) == 2.0,
                                  "invalid parametric option");
         return true;
@@ -97 +97 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_set_option(lp_ctx, "some:thing=true"), "lp_set_option failed");
-        torture_assert(tctx, lp_parm_bool(lp_ctx, NULL, "some", "thing", false) == true, 
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "some:thing=true"), "lpcfg_set_option failed");
+        torture_assert(tctx, lpcfg_parm_bool(lp_ctx, NULL, "some", "thing", false) == true,
                                  "invalid parametric option");
-        torture_assert(tctx, lp_parm_bool(lp_ctx, NULL, "some", "bla", true) == true, 
+        torture_assert(tctx, lpcfg_parm_bool(lp_ctx, NULL, "some", "bla", true) == true,
                                  "invalid parametric option");
         return true;
@@ -108 +108 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_set_option(lp_ctx, "some:thing=34"), "lp_set_option failed");
-        torture_assert_int_equal(tctx, lp_parm_int(lp_ctx, NULL, "some", "thing", 20), 34, 
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "some:thing=34"), "lpcfg_set_option failed");
+        torture_assert_int_equal(tctx, lpcfg_parm_int(lp_ctx, NULL, "some", "thing", 20), 34,
                                  "invalid parametric option");
-        torture_assert_int_equal(tctx, lp_parm_int(lp_ctx, NULL, "some", "bla", 42), 42, 
+        torture_assert_int_equal(tctx, lpcfg_parm_int(lp_ctx, NULL, "some", "bla", 42), 42,
                                  "invalid parametric option");
         return true;
@@ -119 +119 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        torture_assert(tctx, lp_set_option(lp_ctx, "some:thing=16K"), "lp_set_option failed");
-        torture_assert_int_equal(tctx, lp_parm_bytes(lp_ctx, NULL, "some", "thing", 20), 16 * 1024, 
+        torture_assert(tctx, lpcfg_set_option(lp_ctx, "some:thing=16K"), "lpcfg_set_option failed");
+        torture_assert_int_equal(tctx, lpcfg_parm_bytes(lp_ctx, NULL, "some", "thing", 20), 16 * 1024,
                                  "invalid parametric option");
-        torture_assert_int_equal(tctx, lp_parm_bytes(lp_ctx, NULL, "some", "bla", 42), 42, 
+        torture_assert_int_equal(tctx, lpcfg_parm_bytes(lp_ctx, NULL, "some", "bla", 42), 42,
                                  "invalid parametric option");
         return true;
@@ -130 +130 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        struct loadparm_service *service = lp_add_service(lp_ctx, lp_default_service(lp_ctx), "foo");
-        torture_assert(tctx, lp_do_service_parameter(lp_ctx, service, 
-                                                     "some:thing", "foo"), "lp_set_option failed");
-        torture_assert_str_equal(tctx, lp_parm_string(lp_ctx, service, "some", "thing"), "foo",
+        struct loadparm_service *service = lpcfg_add_service(lp_ctx, lpcfg_default_service(lp_ctx), "foo");
+        torture_assert(tctx, lpcfg_do_service_parameter(lp_ctx, service,
+                                                     "some:thing", "foo"), "lpcfg_set_option failed");
+        torture_assert_str_equal(tctx, lpcfg_parm_string(lp_ctx, service, "some", "thing"), "foo",
                                  "invalid parametric option");
         return true;
@@ -141 +141 @@
 {
         struct loadparm_context *lp_ctx = loadparm_init(tctx);
-        struct loadparm_service *service = lp_add_service(lp_ctx, lp_default_service(lp_ctx), "foo");
-        torture_assert(tctx, service == lp_service(lp_ctx, "foo"), "invalid service");
+        struct loadparm_service *service = lpcfg_add_service(lp_ctx, lpcfg_default_service(lp_ctx), "foo");
+        torture_assert(tctx, service == lpcfg_service(lp_ctx, "foo"), "invalid service");
         return true;
 }
@@ -148 +148 @@
 struct torture_suite *torture_local_loadparm(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *suite = torture_suite_create(mem_ctx, "LOADPARM");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "loadparm");
 
         torture_suite_add_simple_test(suite, "create", test_create);
@@ -160 +160 @@
         torture_suite_add_simple_test(suite, "set_lp_parm_bytes", test_lp_parm_bytes);
         torture_suite_add_simple_test(suite, "service_parameter", test_lp_do_service_parameter);
-        torture_suite_add_simple_test(suite, "lp_service", test_lp_service);
+        torture_suite_add_simple_test(suite, "lpcfg_service", test_lp_service);
         torture_suite_add_simple_test(suite, "do_global_parameter_var", test_do_global_parameter_var);
         torture_suite_add_simple_test(suite, "do_global_parameter", test_do_global_parameter);

vendor/current/source4/param/tests/share.c

@@ -107 +107 @@
         NTSTATUS status;
 
-        status = share_remove(ctx, "nonexistant");
+        status = share_remove(ctx, "nonexistent");
 
         if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED))
@@ -199 +199 @@
 struct torture_suite *torture_local_share(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *suite = torture_suite_create(mem_ctx, "SHARE");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "share");
         struct torture_tcase *tcase;
 

vendor/current/source4/param/util.c

@@ -36 +36 @@
 
 
-bool lp_is_mydomain(struct loadparm_context *lp_ctx, 
+bool lpcfg_is_mydomain(struct loadparm_context *lp_ctx,
                              const char *domain)
 {
-        return strequal(lp_workgroup(lp_ctx), domain);
-}
-
-bool lp_is_my_domain_or_realm(struct loadparm_context *lp_ctx, 
+        return strequal(lpcfg_workgroup(lp_ctx), domain);
+}
+
+bool lpcfg_is_my_domain_or_realm(struct loadparm_context *lp_ctx,
                              const char *domain)
 {
-        return strequal(lp_workgroup(lp_ctx), domain) || 
-                strequal(lp_realm(lp_ctx), domain);
+        return strequal(lpcfg_workgroup(lp_ctx), domain) ||
+                strequal(lpcfg_realm(lp_ctx), domain);
 }
 
@@ -53 +53 @@
   netbios aliases. do a case insensitive match
 */
-bool lp_is_myname(struct loadparm_context *lp_ctx, const char *name)
+bool lpcfg_is_myname(struct loadparm_context *lp_ctx, const char *name)
 {
         const char **aliases;
         int i;
 
-        if (strcasecmp(name, lp_netbios_name(lp_ctx)) == 0) {
+        if (strcasecmp(name, lpcfg_netbios_name(lp_ctx)) == 0) {
                 return true;
         }
 
-        aliases = lp_netbios_aliases(lp_ctx);
+        aliases = lpcfg_netbios_aliases(lp_ctx);
         for (i=0; aliases && aliases[i]; i++) {
                 if (strcasecmp(name, aliases[i]) == 0) {
@@ -87 +87 @@
         }
 
-        dname = talloc_strdup(mem_ctx, lp_lockdir(lp_ctx));
+        dname = talloc_strdup(mem_ctx, lpcfg_lockdir(lp_ctx));
         trim_string(dname,"","/");
         
@@ -113 +113 @@
 {
         char *fname, *config_dir, *p;
-        config_dir = talloc_strdup(mem_ctx, lp_configfile(lp_ctx));
+        config_dir = talloc_strdup(mem_ctx, lpcfg_configfile(lp_ctx));
         if (config_dir == NULL) {
                 config_dir = talloc_strdup(mem_ctx, lp_default_path());
@@ -151 +151 @@
                 return talloc_strdup(mem_ctx, name);
         }
-        fname = talloc_asprintf(mem_ctx, "%s/%s", lp_private_dir(lp_ctx), name);
+        fname = talloc_asprintf(mem_ctx, "%s/%s", lpcfg_private_dir(lp_ctx), name);
         return fname;
 }
@@ -161 +161 @@
 */
 char *smbd_tmp_path(TALLOC_CTX *mem_ctx, 
-                             struct loadparm_context *lp_ctx, 
+                             struct loadparm_context *lp_ctx,
                              const char *name)
 {
@@ -270 +270 @@
                           const char *name)
 {
-        const char *env_moduledir = getenv("LD_SAMBA_MODULE_PATH");
         return talloc_asprintf(mem_ctx, "%s/%s", 
-                               env_moduledir?env_moduledir:lp_modulesdir(lp_ctx), 
+                               lpcfg_modulesdir(lp_ctx),
                                name);
 }
@@ -294 +293 @@
 }
 
-const char *lp_messaging_path(TALLOC_CTX *mem_ctx, 
+const char *lpcfg_messaging_path(TALLOC_CTX *mem_ctx,
                                        struct loadparm_context *lp_ctx)
 {
-        return smbd_tmp_path(mem_ctx, lp_ctx, "messaging");
-}
-
-struct smb_iconv_convenience *smb_iconv_convenience_init_lp(TALLOC_CTX *mem_ctx,
-                                                         struct loadparm_context *lp_ctx)
-{
-        return smb_iconv_convenience_init(mem_ctx, lp_dos_charset(lp_ctx),
-                                          lp_unix_charset(lp_ctx),
-                lp_parm_bool(lp_ctx, NULL, "iconv", "native", true));
-}
-
-
-const char *lp_sam_name(struct loadparm_context *lp_ctx) 
-{
-        switch (lp_server_role(lp_ctx)) {
+        return smbd_tmp_path(mem_ctx, lp_ctx, "msg");
+}
+
+struct smb_iconv_convenience *smb_iconv_convenience_reinit_lp(TALLOC_CTX *mem_ctx,
+                                                              struct loadparm_context *lp_ctx,
+                                                              struct smb_iconv_convenience *old_ic)
+{
+        return smb_iconv_convenience_reinit(mem_ctx, lpcfg_dos_charset(lp_ctx),
+                                            lpcfg_unix_charset(lp_ctx),
+                                            lpcfg_display_charset(lp_ctx),
+                                            lpcfg_parm_bool(lp_ctx, NULL, "iconv", "native", true),
+                                            old_ic);
+}
+
+
+const char *lpcfg_sam_name(struct loadparm_context *lp_ctx)
+{
+        switch (lpcfg_server_role(lp_ctx)) {
         case ROLE_DOMAIN_CONTROLLER:
-                return lp_workgroup(lp_ctx);
+                return lpcfg_workgroup(lp_ctx);
         default:
-                return lp_netbios_name(lp_ctx);
-        }
-}
-
+                return lpcfg_netbios_name(lp_ctx);
+        }
+}
+