From b225248486dfbee5bb9b6536ed4f822b2af8f894 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 28 May 2012 15:17:44 +1000 Subject: param: Sort global param functions macros to ease the s3/s4 merge This makes it easier to them merge these two function lists without changing the meaning of the output. Andrew Bartlett --- lib/param/loadparm.c | 159 +++++++++++++++++++++++++-------------------------- 1 file changed, 78 insertions(+), 81 deletions(-) (limited to 'lib/param/loadparm.c') diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index a938738403..ba0f738f0e 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1531,100 +1531,97 @@ static struct loadparm_context *global_loadparm_context; #include "lib/param/param_functions.c" -FN_GLOBAL_LIST(smb_ports, smb_ports) -FN_GLOBAL_INTEGER(nbt_port, nbt_port) -FN_GLOBAL_INTEGER(dgram_port, dgram_port) -FN_GLOBAL_INTEGER(cldap_port, cldap_port) -FN_GLOBAL_INTEGER(krb5_port, krb5_port) -FN_GLOBAL_INTEGER(kpasswd_port, kpasswd_port) -FN_GLOBAL_INTEGER(web_port, web_port) -FN_GLOBAL_BOOL(tls_enabled, tls_enabled) -FN_GLOBAL_STRING(logfile, logfile) -FN_GLOBAL_STRING(share_backend, szShareBackend) -FN_GLOBAL_CONST_STRING(winbind_separator, szWinbindSeparator) -FN_GLOBAL_CONST_STRING(winbindd_socket_directory, szWinbinddSocketDirectory) -FN_GLOBAL_CONST_STRING(winbindd_privileged_socket_directory, szWinbinddPrivilegedSocketDirectory) -FN_GLOBAL_CONST_STRING(template_shell, szTemplateShell) -FN_GLOBAL_CONST_STRING(template_homedir, szTemplateHomedir) -FN_GLOBAL_BOOL(winbind_sealed_pipes, bWinbindSealedPipes) -FN_GLOBAL_BOOL(idmap_trusted_only, bIdmapTrustedOnly) -FN_GLOBAL_STRING(private_dir, szPrivateDir) -FN_GLOBAL_STRING(serverstring, szServerString) -FN_GLOBAL_STRING(lockdir, szLockDir) -FN_GLOBAL_STRING(statedir, szStateDir) -FN_GLOBAL_STRING(cachedir, szCacheDir) -FN_GLOBAL_STRING(ncalrpc_dir, ncalrpc_dir) -FN_GLOBAL_STRING(dos_charset, dos_charset) -FN_GLOBAL_STRING(unix_charset, unix_charset) -FN_GLOBAL_STRING(piddir, szPidDir) -FN_GLOBAL_LIST(rndc_command, szRNDCCommand) -FN_GLOBAL_LIST(dns_update_command, szDNSUpdateCommand) -FN_GLOBAL_LIST(spn_update_command, szSPNUpdateCommand) -FN_GLOBAL_LIST(samba_kcc_command, szSambaKCCCommand) -FN_GLOBAL_LIST(nsupdate_command, szNSUpdateCommand) -FN_GLOBAL_LIST(dcerpc_endpoint_servers, dcerpc_ep_servers) -FN_GLOBAL_LIST(server_services, server_services) -FN_GLOBAL_STRING(ntptr_providor, ntptr_providor) -FN_GLOBAL_STRING(passdb_backend, passdb_backend) -FN_GLOBAL_STRING(auto_services, szAutoServices) -FN_GLOBAL_STRING(passwd_chat, szPasswdChat) -FN_GLOBAL_CONST_STRING(passwordserver, szPasswordServer) -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(bind_interfaces_only, bBindInterfacesOnly) +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_principal, client_use_spnego_principal) FN_GLOBAL_BOOL(disable_netbios, bDisableNetbios) -FN_GLOBAL_BOOL(we_are_a_wins_server, bWINSsupport) -FN_GLOBAL_BOOL(wins_dns_proxy, bWINSdnsProxy) -FN_GLOBAL_STRING(wins_hook, szWINSHook) -FN_GLOBAL_BOOL(local_master, bLocalMaster) -FN_GLOBAL_BOOL(readraw, bReadRaw) +FN_GLOBAL_BOOL(dns_recursive_queries, dns_recursive_queries) +FN_GLOBAL_BOOL(encrypted_passwords, bEncryptPasswords) +FN_GLOBAL_BOOL(host_msdfs, bHostMSDfs) +FN_GLOBAL_BOOL(idmap_trusted_only, bIdmapTrustedOnly) +FN_GLOBAL_BOOL(lanman_auth, bLanmanAuth) FN_GLOBAL_BOOL(large_readwrite, bLargeReadwrite) -FN_GLOBAL_BOOL(writeraw, bWriteRaw) +FN_GLOBAL_BOOL(local_master, bLocalMaster) +FN_GLOBAL_BOOL(ntlm_auth, bNTLMAuth) +FN_GLOBAL_BOOL(nt_status_support, bNTStatusSupport) FN_GLOBAL_BOOL(null_passwords, bNullPasswords) FN_GLOBAL_BOOL(obey_pam_restrictions, bObeyPamRestrictions) -FN_GLOBAL_BOOL(encrypted_passwords, bEncryptPasswords) +FN_GLOBAL_BOOL(paranoid_server_security, paranoid_server_security) +FN_GLOBAL_BOOL(readraw, bReadRaw) +FN_GLOBAL_BOOL(rpc_big_endian, bRpcBigEndian) FN_GLOBAL_BOOL(time_server, bTimeServer) -FN_GLOBAL_BOOL(bind_interfaces_only, bBindInterfacesOnly) +FN_GLOBAL_BOOL(tls_enabled, tls_enabled) 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(use_mmap, bUseMmap) -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_BOOL(use_spnego, bUseSpnego) +FN_GLOBAL_BOOL(we_are_a_wins_server, bWINSsupport) +FN_GLOBAL_BOOL(winbind_sealed_pipes, bWinbindSealedPipes) +FN_GLOBAL_BOOL(wins_dns_proxy, bWINSdnsProxy) +FN_GLOBAL_BOOL(writeraw, bWriteRaw) +FN_GLOBAL_CONST_STRING(dns_forwarder, dns_forwarder) +FN_GLOBAL_CONST_STRING(ntp_signd_socket_directory, szNTPSignDSocketDirectory) +FN_GLOBAL_CONST_STRING(passwordserver, szPasswordServer) +FN_GLOBAL_CONST_STRING(template_homedir, szTemplateHomedir) +FN_GLOBAL_CONST_STRING(template_shell, szTemplateShell) +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_INTEGER(allow_dns_updates, allow_dns_updates) +FN_GLOBAL_INTEGER(cldap_port, cldap_port) +FN_GLOBAL_INTEGER(client_signing, client_signing) +FN_GLOBAL_INTEGER(cli_maxprotocol, cli_maxprotocol) +FN_GLOBAL_INTEGER(cli_minprotocol, cli_minprotocol) +FN_GLOBAL_INTEGER(dgram_port, dgram_port) +FN_GLOBAL_INTEGER(kpasswd_port, kpasswd_port) +FN_GLOBAL_INTEGER(krb5_port, krb5_port) 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(nbt_port, nbt_port) FN_GLOBAL_INTEGER(passwordlevel, pwordlevel) +FN_GLOBAL_INTEGER(server_signing, server_signing) 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_BOOL(paranoid_server_security, paranoid_server_security) - -FN_GLOBAL_INTEGER(allow_dns_updates, allow_dns_updates) -FN_GLOBAL_CONST_STRING(dns_forwarder, dns_forwarder) -FN_GLOBAL_BOOL(dns_recursive_queries, dns_recursive_queries) - -FN_GLOBAL_INTEGER(server_signing, server_signing) -FN_GLOBAL_INTEGER(client_signing, client_signing) - -FN_GLOBAL_CONST_STRING(ntp_signd_socket_directory, szNTPSignDSocketDirectory) +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(nsupdate_command, szNSUpdateCommand) +FN_GLOBAL_LIST(rndc_command, szRNDCCommand) +FN_GLOBAL_LIST(samba_kcc_command, szSambaKCCCommand) +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(auto_services, szAutoServices) +FN_GLOBAL_STRING(cachedir, szCacheDir) +FN_GLOBAL_STRING(dnsdomain, szRealm_lower) +FN_GLOBAL_STRING(dos_charset, dos_charset) +FN_GLOBAL_STRING(lockdir, szLockDir) +FN_GLOBAL_STRING(logfile, logfile) +FN_GLOBAL_STRING(ncalrpc_dir, ncalrpc_dir) +FN_GLOBAL_STRING(netbios_name, szNetbiosName) +FN_GLOBAL_STRING(netbios_scope, szNetbiosScope) +FN_GLOBAL_STRING(ntptr_providor, ntptr_providor) +FN_GLOBAL_STRING(passdb_backend, passdb_backend) +FN_GLOBAL_STRING(passwd_chat, szPasswdChat) +FN_GLOBAL_STRING(piddir, szPidDir) +FN_GLOBAL_STRING(private_dir, szPrivateDir) +FN_GLOBAL_STRING(realm, szRealm_upper) +FN_GLOBAL_STRING(serverstring, szServerString) +FN_GLOBAL_STRING(share_backend, szShareBackend) +FN_GLOBAL_STRING(socket_address, szSocketAddress) +FN_GLOBAL_STRING(socket_options, socket_options) +FN_GLOBAL_STRING(statedir, szStateDir) +FN_GLOBAL_STRING(unix_charset, unix_charset) +FN_GLOBAL_STRING(wins_hook, szWINSHook) +FN_GLOBAL_STRING(workgroup, szWorkgroup) /* local prototypes */ static int map_parameter(const char *pszParmName); -- cgit