lib/param: Put common FN_ macros into param_functions.c
[kai/samba.git] / source3 / param / loadparm.c
index 9e34c5ad97872e9470cda51cc87555608eb586a3..3c1a4effe4d554a8c11325c848364a91198ab78d 100644 (file)
 #include <cups/http.h>
 #endif
 
+#ifdef CLUSTER_SUPPORT
+#include "ctdb_private.h"
+#endif
+
 bool bLoaded = false;
 
 extern userdom_struct current_user_info;
@@ -230,7 +234,7 @@ static struct loadparm_service sDefault =
        .bPosixLocking = true,
        .bShareModes = true,
        .bOpLocks = true,
-       .bKernelOplocks = true,
+       .bKernelOplocks = false,
        .bLevel2OpLocks = true,
        .bOnlyUser = false,
        .bMangledNames = true,
@@ -528,7 +532,7 @@ static struct parm_struct parm_table[] = {
        },
        {
                .label          = "realm",
-               .type           = P_USTRING,
+               .type           = P_STRING,
                .p_class        = P_GLOBAL,
                .offset         = GLOBAL_VAR(szRealm),
                .special        = handle_realm,
@@ -718,11 +722,20 @@ static struct parm_struct parm_table[] = {
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
        },
+       {
+               .label          = "private directory",
+               .type           = P_STRING,
+               .p_class        = P_GLOBAL,
+               .offset         = GLOBAL_VAR(szPrivateDir),
+               .special        = NULL,
+               .enum_list      = NULL,
+               .flags          = FLAG_HIDE,
+       },
        {
                .label          = "passdb backend",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szPassdbBackend),
+               .offset         = GLOBAL_VAR(passdb_backend),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_WIZARD,
@@ -2003,7 +2016,7 @@ static struct parm_struct parm_table[] = {
                .label          = "socket options",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szSocketOptions),
+               .offset         = GLOBAL_VAR(socket_options),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -3036,7 +3049,7 @@ static struct parm_struct parm_table[] = {
                .label          = "dns proxy",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(bDNSproxy),
+               .offset         = GLOBAL_VAR(bWINSdnsProxy),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
@@ -4734,7 +4747,7 @@ static void init_globals(bool reinit_globals)
        string_set(&Globals.szPanicAction, "/bin/sleep 999999999");
 #endif
 
-       string_set(&Globals.szSocketOptions, DEFAULT_SOCKET_OPTIONS);
+       string_set(&Globals.socket_options, DEFAULT_SOCKET_OPTIONS);
 
        string_set(&Globals.szLogonDrive, "");
        /* %N is the NIS auto.home server if -DAUTOHOME is used, else same as %L */
@@ -4839,7 +4852,7 @@ static void init_globals(bool reinit_globals)
           a large number of sites (tridge) */
        Globals.bHostnameLookups = false;
 
-       string_set(&Globals.szPassdbBackend, "tdbsam");
+       string_set(&Globals.passdb_backend, "tdbsam");
        string_set(&Globals.szLdapSuffix, "");
        string_set(&Globals.szLdapMachineSuffix, "");
        string_set(&Globals.szLdapUserSuffix, "");
@@ -4891,7 +4904,7 @@ static void init_globals(bool reinit_globals)
        TALLOC_FREE(Globals.szInitLogonDelayedHosts);
        Globals.InitLogonDelay = 100; /* 100 ms default delay */
 
-       Globals.bDNSproxy = true;
+       Globals.bWINSdnsProxy = true;
 
        Globals.bAllowTrustedDomains = true;
        string_set(&Globals.szIdmapBackend, "tdb");
@@ -5051,21 +5064,14 @@ static char *lp_string(const char *s)
 #define FN_LOCAL_CHAR(fn_name,val) \
  char lp_ ## fn_name(const struct share_params *p) {return(LP_SNUM_OK(p->service)? ServicePtrs[(p->service)]->val : sDefault.val);}
 
-FN_GLOBAL_CONST_STRING(smb_ports, smb_ports)
-FN_GLOBAL_CONST_STRING(dos_charset, dos_charset)
-FN_GLOBAL_CONST_STRING(unix_charset, unix_charset)
-FN_GLOBAL_STRING(logfile, logfile)
-FN_GLOBAL_STRING(configfile, szConfigFile)
-FN_GLOBAL_CONST_STRING(smb_passwd_file, szSMBPasswdFile)
-FN_GLOBAL_CONST_STRING(private_dir, szPrivateDir)
-FN_GLOBAL_STRING(serverstring, szServerString)
-FN_GLOBAL_INTEGER(printcap_cache_time, PrintcapCacheTime)
-FN_GLOBAL_STRING(addport_cmd, szAddPortCommand)
-FN_GLOBAL_STRING(enumports_cmd, szEnumPortsCommand)
-FN_GLOBAL_STRING(addprinter_cmd, szAddPrinterCommand)
-FN_GLOBAL_STRING(deleteprinter_cmd, szDeletePrinterCommand)
-FN_GLOBAL_STRING(os2_driver_map, szOs2DriverMap)
-FN_GLOBAL_CONST_STRING(lockdir, szLockDir)
+
+static FN_GLOBAL_BOOL(domain_logons, bDomainLogons)
+static FN_GLOBAL_BOOL(_readraw, bReadRaw)
+static FN_GLOBAL_BOOL(time_server, bTimeServer)
+static FN_GLOBAL_BOOL(_writeraw, bWriteRaw)
+static FN_GLOBAL_CONST_STRING(_ctdbd_socket, ctdbdSocket)
+static FN_GLOBAL_INTEGER(_server_role, ServerRole)
+
 /* If lp_statedir() and lp_cachedir() are explicitely set during the
  * build process or in smb.conf, we use that value.  Otherwise they
  * default to the value of lp_lockdir(). */
@@ -5087,82 +5093,6 @@ const char *lp_cachedir(void) {
                return(*(char **)(&Globals.szLockDir) ?
                       *(char **)(&Globals.szLockDir) : "");
 }
-FN_GLOBAL_CONST_STRING(piddir, szPidDir)
-FN_GLOBAL_STRING(mangling_method, szManglingMethod)
-FN_GLOBAL_INTEGER(mangle_prefix, mangle_prefix)
-FN_GLOBAL_CONST_STRING(utmpdir, szUtmpDir)
-FN_GLOBAL_CONST_STRING(wtmpdir, szWtmpDir)
-FN_GLOBAL_BOOL(utmp, bUtmp)
-FN_GLOBAL_STRING(rootdir, szRootdir)
-FN_GLOBAL_STRING(perfcount_module, szSMBPerfcountModule)
-FN_GLOBAL_STRING(defaultservice, szDefaultService)
-FN_GLOBAL_STRING(msg_command, szMsgCommand)
-FN_GLOBAL_STRING(get_quota_command, szGetQuota)
-FN_GLOBAL_STRING(set_quota_command, szSetQuota)
-FN_GLOBAL_STRING(auto_services, szAutoServices)
-FN_GLOBAL_STRING(passwd_program, szPasswdProgram)
-FN_GLOBAL_STRING(passwd_chat, szPasswdChat)
-FN_GLOBAL_CONST_STRING(passwordserver, szPasswordServer)
-FN_GLOBAL_CONST_STRING(name_resolve_order, szNameResolveOrder)
-FN_GLOBAL_CONST_STRING(workgroup, szWorkgroup)
-FN_GLOBAL_CONST_STRING(netbios_name, szNetbiosName)
-FN_GLOBAL_CONST_STRING(netbios_scope, szNetbiosScope)
-FN_GLOBAL_CONST_STRING(realm, szRealmUpper)
-FN_GLOBAL_CONST_STRING(dnsdomain, szDnsDomain)
-FN_GLOBAL_CONST_STRING(afs_username_map, szAfsUsernameMap)
-FN_GLOBAL_INTEGER(afs_token_lifetime, iAfsTokenLifetime)
-FN_GLOBAL_STRING(log_nt_token_command, szLogNtTokenCommand)
-FN_GLOBAL_STRING(username_map, szUsernameMap)
-FN_GLOBAL_CONST_STRING(logon_script, szLogonScript)
-FN_GLOBAL_CONST_STRING(logon_path, szLogonPath)
-FN_GLOBAL_CONST_STRING(logon_drive, szLogonDrive)
-FN_GLOBAL_CONST_STRING(logon_home, szLogonHome)
-FN_GLOBAL_STRING(remote_announce, szRemoteAnnounce)
-FN_GLOBAL_STRING(remote_browse_sync, szRemoteBrowseSync)
-FN_GLOBAL_BOOL(nmbd_bind_explicit_broadcast, bNmbdBindExplicitBroadcast)
-FN_GLOBAL_LIST(wins_server_list, szWINSservers)
-FN_GLOBAL_LIST(interfaces, szInterfaces)
-FN_GLOBAL_STRING(nis_home_map_name, szNISHomeMapName)
-FN_GLOBAL_LIST(netbios_aliases, szNetbiosAliases)
-FN_GLOBAL_CONST_STRING(passdb_backend, szPassdbBackend)
-FN_GLOBAL_LIST(preload_modules, szPreloadModules)
-FN_GLOBAL_STRING(panic_action, szPanicAction)
-FN_GLOBAL_STRING(adduser_script, szAddUserScript)
-FN_GLOBAL_STRING(renameuser_script, szRenameUserScript)
-FN_GLOBAL_STRING(deluser_script, szDelUserScript)
-
-FN_GLOBAL_CONST_STRING(guestaccount, szGuestaccount)
-FN_GLOBAL_STRING(addgroup_script, szAddGroupScript)
-FN_GLOBAL_STRING(delgroup_script, szDelGroupScript)
-FN_GLOBAL_STRING(addusertogroup_script, szAddUserToGroupScript)
-FN_GLOBAL_STRING(deluserfromgroup_script, szDelUserFromGroupScript)
-FN_GLOBAL_STRING(setprimarygroup_script, szSetPrimaryGroupScript)
-
-FN_GLOBAL_STRING(addmachine_script, szAddMachineScript)
-
-FN_GLOBAL_STRING(shutdown_script, szShutdownScript)
-FN_GLOBAL_STRING(abort_shutdown_script, szAbortShutdownScript)
-FN_GLOBAL_STRING(username_map_script, szUsernameMapScript)
-FN_GLOBAL_INTEGER(username_map_cache_time, iUsernameMapCacheTime)
-
-FN_GLOBAL_STRING(check_password_script, szCheckPasswordScript)
-
-FN_GLOBAL_STRING(wins_hook, szWINSHook)
-FN_GLOBAL_CONST_STRING(template_homedir, szTemplateHomedir)
-FN_GLOBAL_CONST_STRING(template_shell, szTemplateShell)
-FN_GLOBAL_CONST_STRING(winbind_separator, szWinbindSeparator)
-FN_GLOBAL_INTEGER(acl_compatibility, iAclCompat)
-FN_GLOBAL_BOOL(winbind_enum_users, bWinbindEnumUsers)
-FN_GLOBAL_BOOL(winbind_enum_groups, bWinbindEnumGroups)
-FN_GLOBAL_BOOL(winbind_use_default_domain, bWinbindUseDefaultDomain)
-FN_GLOBAL_BOOL(winbind_trusted_domains_only, bWinbindTrustedDomainsOnly)
-FN_GLOBAL_BOOL(winbind_nested_groups, bWinbindNestedGroups)
-FN_GLOBAL_INTEGER(winbind_expand_groups, winbind_expand_groups)
-FN_GLOBAL_BOOL(winbind_refresh_tickets, bWinbindRefreshTickets)
-FN_GLOBAL_BOOL(winbind_offline_logon, bWinbindOfflineLogon)
-FN_GLOBAL_BOOL(winbind_normalize_names, bWinbindNormalizeNames)
-FN_GLOBAL_BOOL(winbind_rpc_only, bWinbindRpcOnly)
-FN_GLOBAL_BOOL(create_krb5_conf, bCreateKrb5Conf)
 static FN_GLOBAL_INTEGER(winbind_max_domain_connections_int,
                  winbindMaxDomainConnections)
 
@@ -5177,135 +5107,6 @@ int lp_winbind_max_domain_connections(void)
        return MAX(1, lp_winbind_max_domain_connections_int());
 }
 
-FN_GLOBAL_CONST_STRING(idmap_backend, szIdmapBackend)
-FN_GLOBAL_INTEGER(idmap_cache_time, iIdmapCacheTime)
-FN_GLOBAL_INTEGER(idmap_negative_cache_time, iIdmapNegativeCacheTime)
-FN_GLOBAL_INTEGER(keepalive, iKeepalive)
-FN_GLOBAL_BOOL(passdb_expand_explicit, bPassdbExpandExplicit)
-
-FN_GLOBAL_STRING(ldap_suffix, szLdapSuffix)
-FN_GLOBAL_STRING(ldap_admin_dn, szLdapAdminDn)
-FN_GLOBAL_INTEGER(ldap_ssl, ldap_ssl)
-FN_GLOBAL_BOOL(ldap_ssl_ads, ldap_ssl_ads)
-FN_GLOBAL_INTEGER(ldap_deref, ldap_deref)
-FN_GLOBAL_INTEGER(ldap_follow_referral, ldap_follow_referral)
-FN_GLOBAL_INTEGER(ldap_passwd_sync, ldap_passwd_sync)
-FN_GLOBAL_BOOL(ldap_delete_dn, ldap_delete_dn)
-FN_GLOBAL_INTEGER(ldap_replication_sleep, ldap_replication_sleep)
-FN_GLOBAL_INTEGER(ldap_timeout, ldap_timeout)
-FN_GLOBAL_INTEGER(ldap_connection_timeout, ldap_connection_timeout)
-FN_GLOBAL_INTEGER(ldap_page_size, ldap_page_size)
-FN_GLOBAL_INTEGER(ldap_debug_level, ldap_debug_level)
-FN_GLOBAL_INTEGER(ldap_debug_threshold, ldap_debug_threshold)
-FN_GLOBAL_STRING(add_share_cmd, szAddShareCommand)
-FN_GLOBAL_STRING(change_share_cmd, szChangeShareCommand)
-FN_GLOBAL_STRING(delete_share_cmd, szDeleteShareCommand)
-FN_GLOBAL_STRING(usershare_path, szUsersharePath)
-FN_GLOBAL_LIST(usershare_prefix_allow_list, szUsersharePrefixAllowList)
-FN_GLOBAL_LIST(usershare_prefix_deny_list, szUsersharePrefixDenyList)
-
-FN_GLOBAL_LIST(eventlog_list, szEventLogs)
-
-FN_GLOBAL_BOOL(registry_shares, bRegistryShares)
-FN_GLOBAL_BOOL(usershare_allow_guests, bUsershareAllowGuests)
-FN_GLOBAL_BOOL(usershare_owner_only, bUsershareOwnerOnly)
-FN_GLOBAL_BOOL(disable_netbios, bDisableNetbios)
-FN_GLOBAL_BOOL(reset_on_zero_vc, bResetOnZeroVC)
-FN_GLOBAL_BOOL(log_writeable_files_on_exit, bLogWriteableFilesOnExit)
-FN_GLOBAL_BOOL(ms_add_printer_wizard, bMsAddPrinterWizard)
-FN_GLOBAL_BOOL(dns_proxy, bDNSproxy)
-FN_GLOBAL_BOOL(we_are_a_wins_server, bWINSsupport)
-FN_GLOBAL_BOOL(wins_proxy, bWINSproxy)
-FN_GLOBAL_BOOL(local_master, bLocalMaster)
-static FN_GLOBAL_BOOL(domain_logons, bDomainLogons)
-FN_GLOBAL_LIST(init_logon_delayed_hosts, szInitLogonDelayedHosts)
-FN_GLOBAL_INTEGER(init_logon_delay, InitLogonDelay)
-FN_GLOBAL_BOOL(load_printers, bLoadPrinters)
-static FN_GLOBAL_BOOL(_readraw, bReadRaw)
-FN_GLOBAL_BOOL(large_readwrite, bLargeReadwrite)
-static 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_INTEGER(client_schannel, clientSchannel)
-FN_GLOBAL_INTEGER(server_schannel, serverSchannel)
-FN_GLOBAL_BOOL(syslog_only, bSyslogOnly)
-FN_GLOBAL_BOOL(timestamp_logs, bTimestampLogs)
-FN_GLOBAL_BOOL(debug_prefix_timestamp, bDebugPrefixTimestamp)
-FN_GLOBAL_BOOL(debug_hires_timestamp, bDebugHiresTimestamp)
-FN_GLOBAL_BOOL(debug_pid, bDebugPid)
-FN_GLOBAL_BOOL(debug_uid, bDebugUid)
-FN_GLOBAL_BOOL(debug_class, bDebugClass)
-FN_GLOBAL_BOOL(enable_core_files, bEnableCoreFiles)
-FN_GLOBAL_BOOL(browse_list, bBrowseList)
-FN_GLOBAL_BOOL(nis_home_map, bNISHomeMap)
-static FN_GLOBAL_BOOL(time_server, bTimeServer)
-FN_GLOBAL_BOOL(bind_interfaces_only, bBindInterfacesOnly)
-FN_GLOBAL_BOOL(pam_password_change, bPamPasswordChange)
-FN_GLOBAL_BOOL(unix_password_sync, bUnixPasswdSync)
-FN_GLOBAL_BOOL(passwd_chat_debug, bPasswdChatDebug)
-FN_GLOBAL_INTEGER(passwd_chat_timeout, iPasswdChatTimeout)
-FN_GLOBAL_BOOL(nt_pipe_support, bNTPipeSupport)
-FN_GLOBAL_BOOL(nt_status_support, bNTStatusSupport)
-FN_GLOBAL_BOOL(stat_cache, bStatCache)
-FN_GLOBAL_INTEGER(max_stat_cache_size, iMaxStatCacheSize)
-FN_GLOBAL_BOOL(allow_trusted_domains, bAllowTrustedDomains)
-FN_GLOBAL_BOOL(map_untrusted_to_domain, bMapUntrustedToDomain)
-FN_GLOBAL_INTEGER(restrict_anonymous, restrict_anonymous)
-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(host_msdfs, bHostMSDfs)
-FN_GLOBAL_BOOL(enhanced_browsing, enhanced_browsing)
-FN_GLOBAL_BOOL(use_mmap, bUseMmap)
-FN_GLOBAL_BOOL(unix_extensions, bUnixExtensions)
-FN_GLOBAL_BOOL(use_spnego, bUseSpnego)
-FN_GLOBAL_BOOL(client_use_spnego, bClientUseSpnego)
-FN_GLOBAL_BOOL(client_use_spnego_principal, client_use_spnego_principal)
-FN_GLOBAL_BOOL(hostname_lookups, bHostnameLookups)
-FN_GLOBAL_CONST_STRING(dedicated_keytab_file, szDedicatedKeytabFile)
-FN_GLOBAL_INTEGER(kerberos_method, iKerberosMethod)
-FN_GLOBAL_BOOL(defer_sharing_violations, bDeferSharingViolations)
-FN_GLOBAL_BOOL(enable_privileges, bEnablePrivileges)
-FN_GLOBAL_BOOL(enable_asu_support, bASUSupport)
-FN_GLOBAL_INTEGER(os_level, os_level)
-FN_GLOBAL_INTEGER(max_ttl, max_ttl)
-FN_GLOBAL_INTEGER(max_wins_ttl, max_wins_ttl)
-FN_GLOBAL_INTEGER(min_wins_ttl, min_wins_ttl)
-FN_GLOBAL_INTEGER(max_log_size, max_log_size)
-FN_GLOBAL_INTEGER(max_open_files, max_open_files)
-FN_GLOBAL_INTEGER(open_files_db_hash_size, open_files_db_hash_size)
-FN_GLOBAL_INTEGER(maxxmit, max_xmit)
-FN_GLOBAL_INTEGER(maxmux, max_mux)
-FN_GLOBAL_INTEGER(passwordlevel, pwordlevel)
-FN_GLOBAL_INTEGER(usernamelevel, unamelevel)
-FN_GLOBAL_INTEGER(deadtime, deadtime)
-FN_GLOBAL_BOOL(getwd_cache, getwd_cache)
-FN_GLOBAL_INTEGER(srv_maxprotocol, srv_maxprotocol)
-FN_GLOBAL_INTEGER(srv_minprotocol, srv_minprotocol)
-FN_GLOBAL_INTEGER(security, security)
-FN_GLOBAL_LIST(auth_methods, AuthMethods)
-FN_GLOBAL_BOOL(paranoid_server_security, paranoid_server_security)
-FN_GLOBAL_INTEGER(maxdisksize, maxdisksize)
-FN_GLOBAL_INTEGER(lpqcachetime, lpqcachetime)
-FN_GLOBAL_INTEGER(max_smbd_processes, iMaxSmbdProcesses)
-FN_GLOBAL_BOOL(_disable_spoolss, bDisableSpoolss)
-FN_GLOBAL_INTEGER(syslog, syslog)
-FN_GLOBAL_INTEGER(lm_announce, lm_announce)
-FN_GLOBAL_INTEGER(lm_interval, lm_interval)
-FN_GLOBAL_INTEGER(machine_password_timeout, machine_password_timeout)
-FN_GLOBAL_INTEGER(map_to_guest, map_to_guest)
-FN_GLOBAL_INTEGER(oplock_break_wait_time, oplock_break_wait_time)
-FN_GLOBAL_INTEGER(lock_spin_time, iLockSpinTime)
-FN_GLOBAL_INTEGER(usershare_max_shares, iUsershareMaxShares)
-FN_GLOBAL_CONST_STRING(socket_options, szSocketOptions)
-FN_GLOBAL_INTEGER(config_backend, ConfigBackend)
-static FN_GLOBAL_INTEGER(_server_role, ServerRole)
-FN_GLOBAL_INTEGER(smb2_max_read, ismb2_max_read)
-FN_GLOBAL_INTEGER(smb2_max_write, ismb2_max_write)
-FN_GLOBAL_INTEGER(smb2_max_trans, ismb2_max_trans)
 int lp_smb2_max_credits(void)
 {
        if (Globals.ismb2_max_credits == 0) {
@@ -5313,8 +5114,6 @@ int lp_smb2_max_credits(void)
        }
        return Globals.ismb2_max_credits;
 }
-FN_GLOBAL_LIST(svcctl_list, szServicesList)
-FN_GLOBAL_STRING(cups_server, szCupsServer)
 int lp_cups_encrypt(void)
 {
        int result = 0;
@@ -5333,27 +5132,14 @@ int lp_cups_encrypt(void)
 #endif
        return result;
 }
-FN_GLOBAL_STRING(iprint_server, szIPrintServer)
-FN_GLOBAL_INTEGER(cups_connection_timeout, cups_connection_timeout)
-FN_GLOBAL_CONST_STRING(ctdbd_socket, ctdbdSocket)
-FN_GLOBAL_LIST(cluster_addresses, szClusterAddresses)
-FN_GLOBAL_BOOL(clustering, clustering)
-FN_GLOBAL_INTEGER(ctdb_timeout, ctdb_timeout)
-FN_GLOBAL_INTEGER(ctdb_locktime_warn_threshold, ctdb_locktime_warn_threshold)
-FN_GLOBAL_BOOL(async_smb_echo_handler, bAsyncSMBEchoHandler)
-FN_GLOBAL_BOOL(multicast_dns_register, bMulticastDnsRegister)
-FN_GLOBAL_BOOL(allow_insecure_widelinks, bAllowInsecureWidelinks)
-FN_GLOBAL_INTEGER(winbind_cache_time, winbind_cache_time)
-FN_GLOBAL_INTEGER(winbind_reconnect_delay, winbind_reconnect_delay)
-FN_GLOBAL_INTEGER(winbind_max_clients, winbind_max_clients)
-FN_GLOBAL_LIST(winbind_nss_info, szWinbindNssInfo)
-FN_GLOBAL_INTEGER(algorithmic_rid_base, AlgorithmicRidBase)
-FN_GLOBAL_INTEGER(name_cache_timeout, name_cache_timeout)
-FN_GLOBAL_INTEGER(client_signing, client_signing)
-FN_GLOBAL_INTEGER(server_signing, server_signing)
-FN_GLOBAL_INTEGER(client_ldap_sasl_wrapping, client_ldap_sasl_wrapping)
-
-FN_GLOBAL_CONST_STRING(ncalrpc_dir, ncalrpc_dir)
+
+/* These functions remain in source3/param for now */
+
+FN_GLOBAL_CONST_STRING(name_resolve_order, szNameResolveOrder)
+FN_GLOBAL_CONST_STRING(smb_ports, smb_ports)
+FN_GLOBAL_INTEGER(security, security)
+FN_GLOBAL_INTEGER(usershare_max_shares, iUsershareMaxShares)
+FN_GLOBAL_STRING(configfile, szConfigFile)
 
 #include "lib/param/param_functions.c"
 
@@ -6949,8 +6735,8 @@ static bool handle_realm(struct loadparm_context *unused, int snum, const char *
        char *dnsdomain = strlower_talloc(talloc_tos(), pszParmValue);
 
        ret &= string_set(&Globals.szRealm, pszParmValue);
-       ret &= string_set(&Globals.szRealmUpper, realm);
-       ret &= string_set(&Globals.szDnsDomain, dnsdomain);
+       ret &= string_set(&Globals.szRealm_upper, realm);
+       ret &= string_set(&Globals.szRealm_lower, dnsdomain);
        TALLOC_FREE(realm);
        TALLOC_FREE(dnsdomain);
 
@@ -9036,10 +8822,6 @@ static bool lp_load_ex(const char *pszFname,
 
        set_allowed_client_auth();
 
-       if (lp_security() == SEC_SERVER) {
-               DEBUG(1, ("WARNING: The security=server option is deprecated\n"));
-       }
-
        if (lp_security() == SEC_ADS && strchr(lp_passwordserver(), ':')) {
                DEBUG(1, ("WARNING: The optional ':port' in password server = %s is deprecated\n",
                          lp_passwordserver()));
@@ -9648,3 +9430,15 @@ int lp_server_role(void)
                                   lp_domain_logons(),
                                   lp_domain_master_true_or_auto());
 }
+
+const char *lp_ctdbd_socket(void)
+{
+       const char *result = lp__ctdbd_socket();
+
+#ifdef CLUSTER_SUPPORT
+       if ((result == NULL) || (*result == '\0')) {
+               return CTDB_PATH;
+       }
+#endif
+       return result;
+}