lib/param: Import s3 parameters into lib/param to allow the parameter lists merge

This will allow us to create just one list of the FN_ macros, included
into both parameter systems.

This will in turn allow the actual parameter definitions
to be merged in a similar way.

Andrew Bartlett

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 149015d97827478131be74655dd24849b1ee6293..2d2a45a545cfe11c3a4a20c15fbd5fb06759e786 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -1531,40 +1531,100 @@ static struct loadparm_context *global_loadparm_context;
 
 #include "lib/param/param_functions.c"
 
+FN_GLOBAL_BOOL(allow_insecure_widelinks, bAllowInsecureWidelinks)
+FN_GLOBAL_BOOL(allow_trusted_domains, bAllowTrustedDomains)
+FN_GLOBAL_BOOL(async_smb_echo_handler, bAsyncSMBEchoHandler)
 FN_GLOBAL_BOOL(bind_interfaces_only, bBindInterfacesOnly)
+FN_GLOBAL_BOOL(browse_list, bBrowseList)
 FN_GLOBAL_BOOL(client_lanman_auth, bClientLanManAuth)
 FN_GLOBAL_BOOL(client_ntlmv2_auth, bClientNTLMv2Auth)
 FN_GLOBAL_BOOL(client_plaintext_auth, bClientPlaintextAuth)
+FN_GLOBAL_BOOL(client_use_spnego, bClientUseSpnego)
 FN_GLOBAL_BOOL(client_use_spnego_principal, client_use_spnego_principal)
+FN_GLOBAL_BOOL(clustering, clustering)
+FN_GLOBAL_BOOL(create_krb5_conf, bCreateKrb5Conf)
+FN_GLOBAL_BOOL(debug_class, bDebugClass)
+FN_GLOBAL_BOOL(debug_hires_timestamp, bDebugHiresTimestamp)
+FN_GLOBAL_BOOL(debug_pid, bDebugPid)
+FN_GLOBAL_BOOL(debug_prefix_timestamp, bDebugPrefixTimestamp)
+FN_GLOBAL_BOOL(debug_uid, bDebugUid)
+FN_GLOBAL_BOOL(defer_sharing_violations, bDeferSharingViolations)
 FN_GLOBAL_BOOL(disable_netbios, bDisableNetbios)
+FN_GLOBAL_BOOL(_disable_spoolss, bDisableSpoolss)
+FN_GLOBAL_BOOL(enable_asu_support, bASUSupport)
+FN_GLOBAL_BOOL(enable_core_files, bEnableCoreFiles)
+FN_GLOBAL_BOOL(enable_privileges, bEnablePrivileges)
 FN_GLOBAL_BOOL(dns_recursive_queries, dns_recursive_queries)
 FN_GLOBAL_BOOL(encrypted_passwords, bEncryptPasswords)
+FN_GLOBAL_BOOL(enhanced_browsing, enhanced_browsing)
+FN_GLOBAL_BOOL(getwd_cache, getwd_cache)
 FN_GLOBAL_BOOL(host_msdfs, bHostMSDfs)
+FN_GLOBAL_BOOL(hostname_lookups, bHostnameLookups)
 FN_GLOBAL_BOOL(idmap_trusted_only, bIdmapTrustedOnly)
 FN_GLOBAL_BOOL(lanman_auth, bLanmanAuth)
 FN_GLOBAL_BOOL(large_readwrite, bLargeReadwrite)
+FN_GLOBAL_BOOL(ldap_delete_dn, ldap_delete_dn)
+FN_GLOBAL_BOOL(ldap_ssl_ads, ldap_ssl_ads)
+FN_GLOBAL_BOOL(load_printers, bLoadPrinters)
 FN_GLOBAL_BOOL(local_master, bLocalMaster)
+FN_GLOBAL_BOOL(log_writeable_files_on_exit, bLogWriteableFilesOnExit)
+FN_GLOBAL_BOOL(map_untrusted_to_domain, bMapUntrustedToDomain)
+FN_GLOBAL_BOOL(ms_add_printer_wizard, bMsAddPrinterWizard)
+FN_GLOBAL_BOOL(multicast_dns_register, bMulticastDnsRegister)
+FN_GLOBAL_BOOL(nis_home_map, bNISHomeMap)
+FN_GLOBAL_BOOL(nmbd_bind_explicit_broadcast, bNmbdBindExplicitBroadcast)
 FN_GLOBAL_BOOL(ntlm_auth, bNTLMAuth)
+FN_GLOBAL_BOOL(nt_pipe_support, bNTPipeSupport)
 FN_GLOBAL_BOOL(nt_status_support, bNTStatusSupport)
 FN_GLOBAL_BOOL(null_passwords, bNullPasswords)
 FN_GLOBAL_BOOL(obey_pam_restrictions, bObeyPamRestrictions)
+FN_GLOBAL_BOOL(pam_password_change, bPamPasswordChange)
 FN_GLOBAL_BOOL(paranoid_server_security, paranoid_server_security)
+FN_GLOBAL_BOOL(passdb_expand_explicit, bPassdbExpandExplicit)
+FN_GLOBAL_BOOL(passwd_chat_debug, bPasswdChatDebug)
+FN_GLOBAL_BOOL(registry_shares, bRegistryShares)
+FN_GLOBAL_BOOL(reset_on_zero_vc, bResetOnZeroVC)
+FN_GLOBAL_BOOL(stat_cache, bStatCache)
+FN_GLOBAL_BOOL(syslog_only, bSyslogOnly)
+FN_GLOBAL_BOOL(timestamp_logs, bTimestampLogs)
 FN_GLOBAL_BOOL(readraw, bReadRaw)
 FN_GLOBAL_BOOL(rpc_big_endian, bRpcBigEndian)
 FN_GLOBAL_BOOL(time_server, bTimeServer)
 FN_GLOBAL_BOOL(tls_enabled, tls_enabled)
 FN_GLOBAL_BOOL(unicode, bUnicode)
 FN_GLOBAL_BOOL(unix_extensions, bUnixExtensions)
+FN_GLOBAL_BOOL(unix_password_sync, bUnixPasswdSync)
 FN_GLOBAL_BOOL(use_mmap, bUseMmap)
+FN_GLOBAL_BOOL(usershare_allow_guests, bUsershareAllowGuests)
+FN_GLOBAL_BOOL(usershare_owner_only, bUsershareOwnerOnly)
 FN_GLOBAL_BOOL(use_spnego, bUseSpnego)
+FN_GLOBAL_BOOL(utmp, bUtmp)
 FN_GLOBAL_BOOL(we_are_a_wins_server, bWINSsupport)
+FN_GLOBAL_BOOL(winbind_enum_groups, bWinbindEnumGroups)
+FN_GLOBAL_BOOL(winbind_enum_users, bWinbindEnumUsers)
+FN_GLOBAL_BOOL(winbind_nested_groups, bWinbindNestedGroups)
+FN_GLOBAL_BOOL(winbind_normalize_names, bWinbindNormalizeNames)
+FN_GLOBAL_BOOL(winbind_offline_logon, bWinbindOfflineLogon)
+FN_GLOBAL_BOOL(winbind_refresh_tickets, bWinbindRefreshTickets)
+FN_GLOBAL_BOOL(winbind_rpc_only, bWinbindRpcOnly)
+FN_GLOBAL_BOOL(winbind_trusted_domains_only, bWinbindTrustedDomainsOnly)
+FN_GLOBAL_BOOL(winbind_use_default_domain, bWinbindUseDefaultDomain)
+FN_GLOBAL_BOOL(wins_proxy, bWINSproxy)
+FN_GLOBAL_CONST_STRING(afs_username_map, szAfsUsernameMap)
+FN_GLOBAL_CONST_STRING(dedicated_keytab_file, szDedicatedKeytabFile)
 FN_GLOBAL_BOOL(winbind_sealed_pipes, bWinbindSealedPipes)
 FN_GLOBAL_BOOL(wins_dns_proxy, bWINSdnsProxy)
 FN_GLOBAL_BOOL(writeraw, bWriteRaw)
 FN_GLOBAL_CONST_STRING(dnsdomain, szRealm_lower)
 FN_GLOBAL_CONST_STRING(dns_forwarder, dns_forwarder)
 FN_GLOBAL_CONST_STRING(dos_charset, dos_charset)
+FN_GLOBAL_CONST_STRING(guestaccount, szGuestaccount)
+FN_GLOBAL_CONST_STRING(idmap_backend, szIdmapBackend)
 FN_GLOBAL_CONST_STRING(lockdir, szLockDir)
+FN_GLOBAL_CONST_STRING(logon_drive, szLogonDrive)
+FN_GLOBAL_CONST_STRING(logon_home, szLogonHome)
+FN_GLOBAL_CONST_STRING(logon_path, szLogonPath)
+FN_GLOBAL_CONST_STRING(logon_script, szLogonScript)
 FN_GLOBAL_CONST_STRING(ncalrpc_dir, ncalrpc_dir)
 FN_GLOBAL_CONST_STRING(netbios_name, szNetbiosName)
 FN_GLOBAL_CONST_STRING(netbios_scope, szNetbiosScope)
@@ -1574,17 +1634,54 @@ FN_GLOBAL_CONST_STRING(passwordserver, szPasswordServer)
 FN_GLOBAL_CONST_STRING(piddir, szPidDir)
 FN_GLOBAL_CONST_STRING(private_dir, szPrivateDir)
 FN_GLOBAL_CONST_STRING(realm, szRealm_upper)
+FN_GLOBAL_CONST_STRING(smb_passwd_file, szSMBPasswdFile)
 FN_GLOBAL_CONST_STRING(socket_options, socket_options)
 FN_GLOBAL_CONST_STRING(template_homedir, szTemplateHomedir)
 FN_GLOBAL_CONST_STRING(template_shell, szTemplateShell)
 FN_GLOBAL_CONST_STRING(unix_charset, unix_charset)
+FN_GLOBAL_CONST_STRING(utmpdir, szUtmpDir)
 FN_GLOBAL_CONST_STRING(winbindd_privileged_socket_directory, szWinbinddPrivilegedSocketDirectory)
 FN_GLOBAL_CONST_STRING(winbindd_socket_directory, szWinbinddSocketDirectory)
 FN_GLOBAL_CONST_STRING(winbind_separator, szWinbindSeparator)
 FN_GLOBAL_CONST_STRING(workgroup, szWorkgroup)
+FN_GLOBAL_CONST_STRING(wtmpdir, szWtmpDir)
+FN_GLOBAL_INTEGER(acl_compatibility, iAclCompat)
+FN_GLOBAL_INTEGER(afs_token_lifetime, iAfsTokenLifetime)
+FN_GLOBAL_INTEGER(algorithmic_rid_base, AlgorithmicRidBase)
+FN_GLOBAL_INTEGER(client_ldap_sasl_wrapping, client_ldap_sasl_wrapping)
+FN_GLOBAL_INTEGER(client_schannel, clientSchannel)
 FN_GLOBAL_INTEGER(allow_dns_updates, allow_dns_updates)
 FN_GLOBAL_INTEGER(cldap_port, cldap_port)
 FN_GLOBAL_INTEGER(client_signing, client_signing)
+FN_GLOBAL_INTEGER(config_backend, ConfigBackend)
+FN_GLOBAL_INTEGER(ctdb_locktime_warn_threshold, ctdb_locktime_warn_threshold)
+FN_GLOBAL_INTEGER(ctdb_timeout, ctdb_timeout)
+FN_GLOBAL_INTEGER(cups_connection_timeout, cups_connection_timeout)
+FN_GLOBAL_INTEGER(deadtime, deadtime)
+FN_GLOBAL_INTEGER(idmap_cache_time, iIdmapCacheTime)
+FN_GLOBAL_INTEGER(idmap_negative_cache_time, iIdmapNegativeCacheTime)
+FN_GLOBAL_INTEGER(init_logon_delay, InitLogonDelay)
+FN_GLOBAL_INTEGER(keepalive, iKeepalive)
+FN_GLOBAL_INTEGER(kerberos_method, iKerberosMethod)
+FN_GLOBAL_INTEGER(ldap_connection_timeout, ldap_connection_timeout)
+FN_GLOBAL_INTEGER(ldap_debug_level, ldap_debug_level)
+FN_GLOBAL_INTEGER(ldap_debug_threshold, ldap_debug_threshold)
+FN_GLOBAL_INTEGER(ldap_deref, ldap_deref)
+FN_GLOBAL_INTEGER(ldap_follow_referral, ldap_follow_referral)
+FN_GLOBAL_INTEGER(ldap_page_size, ldap_page_size)
+FN_GLOBAL_INTEGER(ldap_passwd_sync, ldap_passwd_sync)
+FN_GLOBAL_INTEGER(ldap_replication_sleep, ldap_replication_sleep)
+FN_GLOBAL_INTEGER(ldap_ssl, ldap_ssl)
+FN_GLOBAL_INTEGER(ldap_timeout, ldap_timeout)
+FN_GLOBAL_INTEGER(lm_announce, lm_announce)
+FN_GLOBAL_INTEGER(lm_interval, lm_interval)
+FN_GLOBAL_INTEGER(lock_spin_time, iLockSpinTime)
+FN_GLOBAL_INTEGER(lpqcachetime, lpqcachetime)
+FN_GLOBAL_INTEGER(machine_password_timeout, machine_password_timeout)
+FN_GLOBAL_INTEGER(mangle_prefix, mangle_prefix)
+FN_GLOBAL_INTEGER(map_to_guest, map_to_guest)
+FN_GLOBAL_INTEGER(maxdisksize, maxdisksize)
+FN_GLOBAL_INTEGER(max_log_size, max_log_size)
 FN_GLOBAL_INTEGER(cli_maxprotocol, cli_maxprotocol)
 FN_GLOBAL_INTEGER(cli_minprotocol, cli_minprotocol)
 FN_GLOBAL_INTEGER(dgram_port, dgram_port)
@@ -1594,17 +1691,44 @@ FN_GLOBAL_INTEGER(maxmux, max_mux)
 FN_GLOBAL_INTEGER(max_wins_ttl, max_wins_ttl)
 FN_GLOBAL_INTEGER(max_xmit, max_xmit)
 FN_GLOBAL_INTEGER(min_wins_ttl, min_wins_ttl)
+FN_GLOBAL_INTEGER(name_cache_timeout, name_cache_timeout)
+FN_GLOBAL_INTEGER(open_files_db_hash_size, open_files_db_hash_size)
+FN_GLOBAL_INTEGER(oplock_break_wait_time, oplock_break_wait_time)
+FN_GLOBAL_INTEGER(os_level, os_level)
+FN_GLOBAL_INTEGER(passwd_chat_timeout, iPasswdChatTimeout)
 FN_GLOBAL_INTEGER(nbt_port, nbt_port)
 FN_GLOBAL_INTEGER(passwordlevel, pwordlevel)
+FN_GLOBAL_INTEGER(printcap_cache_time, PrintcapCacheTime)
+FN_GLOBAL_INTEGER(restrict_anonymous, restrict_anonymous)
+FN_GLOBAL_INTEGER(server_schannel, serverSchannel)
 FN_GLOBAL_INTEGER(server_signing, server_signing)
+FN_GLOBAL_INTEGER(smb2_max_read, ismb2_max_read)
+FN_GLOBAL_INTEGER(smb2_max_trans, ismb2_max_trans)
+FN_GLOBAL_INTEGER(smb2_max_write, ismb2_max_write)
 FN_GLOBAL_INTEGER(srv_maxprotocol, srv_maxprotocol)
 FN_GLOBAL_INTEGER(srv_minprotocol, srv_minprotocol)
+FN_GLOBAL_INTEGER(syslog, syslog)
+FN_GLOBAL_INTEGER(usernamelevel, unamelevel)
+FN_GLOBAL_INTEGER(username_map_cache_time, iUsernameMapCacheTime)
+FN_GLOBAL_INTEGER(winbind_cache_time, winbind_cache_time)
+FN_GLOBAL_INTEGER(winbind_expand_groups, winbind_expand_groups)
+FN_GLOBAL_INTEGER(winbind_max_clients, winbind_max_clients)
+FN_GLOBAL_INTEGER(winbind_reconnect_delay, winbind_reconnect_delay)
+FN_GLOBAL_LIST(auth_methods, AuthMethods)
+FN_GLOBAL_LIST(cluster_addresses, szClusterAddresses)
+FN_GLOBAL_LIST(eventlog_list, szEventLogs)
+FN_GLOBAL_LIST(init_logon_delayed_hosts, szInitLogonDelayedHosts)
 FN_GLOBAL_INTEGER(web_port, web_port)
 FN_GLOBAL_LIST(dcerpc_endpoint_servers, dcerpc_ep_servers)
 FN_GLOBAL_LIST(dns_update_command, szDNSUpdateCommand)
 FN_GLOBAL_LIST(interfaces, szInterfaces)
 FN_GLOBAL_LIST(name_resolve_order, szNameResolveOrder)
 FN_GLOBAL_LIST(netbios_aliases, szNetbiosAliases)
+FN_GLOBAL_LIST(preload_modules, szPreloadModules)
+FN_GLOBAL_LIST(svcctl_list, szServicesList)
+FN_GLOBAL_LIST(usershare_prefix_allow_list, szUsersharePrefixAllowList)
+FN_GLOBAL_LIST(usershare_prefix_deny_list, szUsersharePrefixDenyList)
+FN_GLOBAL_LIST(winbind_nss_info, szWinbindNssInfo)
 FN_GLOBAL_LIST(nsupdate_command, szNSUpdateCommand)
 FN_GLOBAL_LIST(rndc_command, szRNDCCommand)
 FN_GLOBAL_LIST(samba_kcc_command, szSambaKCCCommand)
@@ -1612,12 +1736,52 @@ FN_GLOBAL_LIST(server_services, server_services)
 FN_GLOBAL_LIST(smb_ports, smb_ports)
 FN_GLOBAL_LIST(spn_update_command, szSPNUpdateCommand)
 FN_GLOBAL_LIST(wins_server_list, szWINSservers)
+FN_GLOBAL_STRING(abort_shutdown_script, szAbortShutdownScript)
+FN_GLOBAL_STRING(addgroup_script, szAddGroupScript)
+FN_GLOBAL_STRING(addmachine_script, szAddMachineScript)
+FN_GLOBAL_STRING(addport_cmd, szAddPortCommand)
+FN_GLOBAL_STRING(addprinter_cmd, szAddPrinterCommand)
+FN_GLOBAL_STRING(add_share_cmd, szAddShareCommand)
+FN_GLOBAL_STRING(adduser_script, szAddUserScript)
+FN_GLOBAL_STRING(addusertogroup_script, szAddUserToGroupScript)
 FN_GLOBAL_STRING(auto_services, szAutoServices)
+FN_GLOBAL_STRING(change_share_cmd, szChangeShareCommand)
+FN_GLOBAL_STRING(check_password_script, szCheckPasswordScript)
+FN_GLOBAL_STRING(cups_server, szCupsServer)
+FN_GLOBAL_STRING(defaultservice, szDefaultService)
+FN_GLOBAL_STRING(deleteprinter_cmd, szDeletePrinterCommand)
+FN_GLOBAL_STRING(delete_share_cmd, szDeleteShareCommand)
+FN_GLOBAL_STRING(delgroup_script, szDelGroupScript)
+FN_GLOBAL_STRING(deluserfromgroup_script, szDelUserFromGroupScript)
+FN_GLOBAL_STRING(deluser_script, szDelUserScript)
+FN_GLOBAL_STRING(enumports_cmd, szEnumPortsCommand)
+FN_GLOBAL_STRING(get_quota_command, szGetQuota)
+FN_GLOBAL_STRING(iprint_server, szIPrintServer)
+FN_GLOBAL_STRING(ldap_admin_dn, szLdapAdminDn)
+FN_GLOBAL_STRING(ldap_suffix, szLdapSuffix)
 FN_GLOBAL_STRING(cachedir, szCacheDir)
 FN_GLOBAL_STRING(logfile, logfile)
+FN_GLOBAL_STRING(log_nt_token_command, szLogNtTokenCommand)
+FN_GLOBAL_STRING(mangling_method, szManglingMethod)
+FN_GLOBAL_STRING(msg_command, szMsgCommand)
+FN_GLOBAL_STRING(nis_home_map_name, szNISHomeMapName)
+FN_GLOBAL_STRING(os2_driver_map, szOs2DriverMap)
+FN_GLOBAL_STRING(panic_action, szPanicAction)
 FN_GLOBAL_STRING(ntptr_providor, ntptr_providor)
 FN_GLOBAL_STRING(passwd_chat, szPasswdChat)
+FN_GLOBAL_STRING(passwd_program, szPasswdProgram)
+FN_GLOBAL_STRING(perfcount_module, szSMBPerfcountModule)
+FN_GLOBAL_STRING(remote_announce, szRemoteAnnounce)
+FN_GLOBAL_STRING(remote_browse_sync, szRemoteBrowseSync)
+FN_GLOBAL_STRING(renameuser_script, szRenameUserScript)
+FN_GLOBAL_STRING(rootdir, szRootdir)
 FN_GLOBAL_STRING(serverstring, szServerString)
+FN_GLOBAL_STRING(setprimarygroup_script, szSetPrimaryGroupScript)
+FN_GLOBAL_STRING(set_quota_command, szSetQuota)
+FN_GLOBAL_STRING(shutdown_script, szShutdownScript)
+FN_GLOBAL_STRING(username_map_script, szUsernameMapScript)
+FN_GLOBAL_STRING(username_map, szUsernameMap)
+FN_GLOBAL_STRING(usershare_path, szUsersharePath)
 FN_GLOBAL_STRING(share_backend, szShareBackend)
 FN_GLOBAL_STRING(socket_address, szSocketAddress)
 FN_GLOBAL_STRING(statedir, szStateDir)