diff options
| -rw-r--r-- | source4/param/loadparm.c | 218 | ||||
| -rwxr-xr-x | source4/script/mkproto.pl | 12 |
2 files changed, 115 insertions, 115 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 16692daec4..b8445e2a8a 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -802,119 +802,119 @@ static const char *lp_string(const char *s) #define FN_LOCAL_INTEGER(fn_name,val) \ int fn_name(int i) {return(LP_SNUM_OK(i)? ServicePtrs[(i)]->val : sDefault.val);} -FN_GLOBAL_INTEGER(lp_server_role, &Globals.server_role) -FN_GLOBAL_LIST(lp_smb_ports, &Globals.smb_ports) -FN_GLOBAL_INTEGER(lp_nbt_port, &Globals.nbt_port) -FN_GLOBAL_INTEGER(lp_dgram_port, &Globals.dgram_port) -FN_GLOBAL_INTEGER(lp_cldap_port, &Globals.cldap_port) -FN_GLOBAL_INTEGER(lp_krb5_port, &Globals.krb5_port) -FN_GLOBAL_INTEGER(lp_kpasswd_port, &Globals.kpasswd_port) -FN_GLOBAL_INTEGER(lp_web_port, &Globals.web_port) -FN_GLOBAL_STRING(lp_dos_charset, &Globals.dos_charset) -FN_GLOBAL_STRING(lp_swat_directory, &Globals.swat_directory) -FN_GLOBAL_BOOL(lp_tls_enabled, &Globals.tls_enabled) -FN_GLOBAL_STRING(lp_tls_keyfile, &Globals.tls_keyfile) -FN_GLOBAL_STRING(lp_tls_certfile, &Globals.tls_certfile) -FN_GLOBAL_STRING(lp_tls_cafile, &Globals.tls_cafile) -FN_GLOBAL_STRING(lp_tls_crlfile, &Globals.tls_crlfile) -FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset) -FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset) -FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile) -FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile) -FN_GLOBAL_STRING(lp_sam_url, &Globals.szSAM_URL) -FN_GLOBAL_STRING(lp_spoolss_url, &Globals.szSPOOLSS_URL) -FN_GLOBAL_STRING(lp_wins_config_url, &Globals.szWINS_CONFIG_URL) -FN_GLOBAL_STRING(lp_wins_url, &Globals.szWINS_URL) -FN_GLOBAL_CONST_STRING(lp_winbind_separator, &Globals.szWinbindSeparator) -FN_GLOBAL_CONST_STRING(lp_winbindd_socket_directory, &Globals.szWinbinddSocketDirectory) -FN_GLOBAL_BOOL(lp_winbind_sealed_pipes, &Globals.bWinbindSealedPipes) -FN_GLOBAL_STRING(lp_private_dir, &Globals.szPrivateDir) -FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString) -FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir) -FN_GLOBAL_STRING(lp_setupdir, &Globals.szSetupDir) -FN_GLOBAL_STRING(lp_ncalrpc_dir, &Globals.ncalrpc_dir) -FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir) -FN_GLOBAL_LIST(lp_dcerpc_endpoint_servers, &Globals.dcerpc_ep_servers) -FN_GLOBAL_LIST(lp_server_services, &Globals.server_services) -FN_GLOBAL_STRING(lp_ntptr_providor, &Globals.ntptr_providor) -FN_GLOBAL_STRING(lp_auto_services, &Globals.szAutoServices) -FN_GLOBAL_STRING(lp_passwd_chat, &Globals.szPasswdChat) -FN_GLOBAL_LIST(lp_passwordserver, &Globals.szPasswordServers) -FN_GLOBAL_LIST(lp_name_resolve_order, &Globals.szNameResolveOrder) -FN_GLOBAL_STRING(lp_realm, &Globals.szRealm) -FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options) -FN_GLOBAL_STRING(lp_workgroup, &Globals.szWorkgroup) -FN_GLOBAL_STRING(lp_netbios_name, &Globals.szNetbiosName) -FN_GLOBAL_STRING(lp_netbios_scope, &Globals.szNetbiosScope) -FN_GLOBAL_LIST(lp_wins_server_list, &Globals.szWINSservers) -FN_GLOBAL_LIST(lp_interfaces, &Globals.szInterfaces) -FN_GLOBAL_STRING(lp_socket_address, &Globals.szSocketAddress) -FN_GLOBAL_LIST(lp_netbios_aliases, &Globals.szNetbiosAliases) -FN_GLOBAL_STRING(lp_panic_action, &Globals.szPanicAction) - -FN_GLOBAL_BOOL(lp_disable_netbios, &Globals.bDisableNetbios) -FN_GLOBAL_BOOL(lp_wins_support, &Globals.bWINSsupport) -FN_GLOBAL_BOOL(lp_wins_dns_proxy, &Globals.bWINSdnsProxy) -FN_GLOBAL_STRING(lp_wins_hook, &Globals.szWINSHook) -FN_GLOBAL_BOOL(lp_local_master, &Globals.bLocalMaster) -FN_GLOBAL_BOOL(lp_readraw, &Globals.bReadRaw) -FN_GLOBAL_BOOL(lp_large_readwrite, &Globals.bLargeReadwrite) -FN_GLOBAL_BOOL(lp_writeraw, &Globals.bWriteRaw) -FN_GLOBAL_BOOL(lp_null_passwords, &Globals.bNullPasswords) -FN_GLOBAL_BOOL(lp_obey_pam_restrictions, &Globals.bObeyPamRestrictions) -FN_GLOBAL_BOOL(lp_encrypted_passwords, &Globals.bEncryptPasswords) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_server_role, &Globals.server_role) +_PUBLIC_ FN_GLOBAL_LIST(lp_smb_ports, &Globals.smb_ports) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_nbt_port, &Globals.nbt_port) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_dgram_port, &Globals.dgram_port) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_cldap_port, &Globals.cldap_port) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_krb5_port, &Globals.krb5_port) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_kpasswd_port, &Globals.kpasswd_port) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_web_port, &Globals.web_port) +_PUBLIC_ FN_GLOBAL_STRING(lp_dos_charset, &Globals.dos_charset) +_PUBLIC_ FN_GLOBAL_STRING(lp_swat_directory, &Globals.swat_directory) +_PUBLIC_ FN_GLOBAL_BOOL(lp_tls_enabled, &Globals.tls_enabled) +_PUBLIC_ FN_GLOBAL_STRING(lp_tls_keyfile, &Globals.tls_keyfile) +_PUBLIC_ FN_GLOBAL_STRING(lp_tls_certfile, &Globals.tls_certfile) +_PUBLIC_ FN_GLOBAL_STRING(lp_tls_cafile, &Globals.tls_cafile) +_PUBLIC_ FN_GLOBAL_STRING(lp_tls_crlfile, &Globals.tls_crlfile) +_PUBLIC_ FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset) +_PUBLIC_ FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset) +_PUBLIC_ FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile) +_PUBLIC_ FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile) +_PUBLIC_ FN_GLOBAL_STRING(lp_sam_url, &Globals.szSAM_URL) +_PUBLIC_ FN_GLOBAL_STRING(lp_spoolss_url, &Globals.szSPOOLSS_URL) +_PUBLIC_ FN_GLOBAL_STRING(lp_wins_config_url, &Globals.szWINS_CONFIG_URL) +_PUBLIC_ FN_GLOBAL_STRING(lp_wins_url, &Globals.szWINS_URL) +_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_winbind_separator, &Globals.szWinbindSeparator) +_PUBLIC_ FN_GLOBAL_CONST_STRING(lp_winbindd_socket_directory, &Globals.szWinbinddSocketDirectory) +_PUBLIC_ FN_GLOBAL_BOOL(lp_winbind_sealed_pipes, &Globals.bWinbindSealedPipes) +_PUBLIC_ FN_GLOBAL_STRING(lp_private_dir, &Globals.szPrivateDir) +_PUBLIC_ FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString) +_PUBLIC_ FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir) +_PUBLIC_ FN_GLOBAL_STRING(lp_setupdir, &Globals.szSetupDir) +_PUBLIC_ FN_GLOBAL_STRING(lp_ncalrpc_dir, &Globals.ncalrpc_dir) +_PUBLIC_ FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir) +_PUBLIC_ FN_GLOBAL_LIST(lp_dcerpc_endpoint_servers, &Globals.dcerpc_ep_servers) +_PUBLIC_ FN_GLOBAL_LIST(lp_server_services, &Globals.server_services) +_PUBLIC_ FN_GLOBAL_STRING(lp_ntptr_providor, &Globals.ntptr_providor) +_PUBLIC_ FN_GLOBAL_STRING(lp_auto_services, &Globals.szAutoServices) +_PUBLIC_ FN_GLOBAL_STRING(lp_passwd_chat, &Globals.szPasswdChat) +_PUBLIC_ FN_GLOBAL_LIST(lp_passwordserver, &Globals.szPasswordServers) +_PUBLIC_ FN_GLOBAL_LIST(lp_name_resolve_order, &Globals.szNameResolveOrder) +_PUBLIC_ FN_GLOBAL_STRING(lp_realm, &Globals.szRealm) +_PUBLIC_ FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options) +_PUBLIC_ FN_GLOBAL_STRING(lp_workgroup, &Globals.szWorkgroup) +_PUBLIC_ FN_GLOBAL_STRING(lp_netbios_name, &Globals.szNetbiosName) +_PUBLIC_ FN_GLOBAL_STRING(lp_netbios_scope, &Globals.szNetbiosScope) +_PUBLIC_ FN_GLOBAL_LIST(lp_wins_server_list, &Globals.szWINSservers) +_PUBLIC_ FN_GLOBAL_LIST(lp_interfaces, &Globals.szInterfaces) +_PUBLIC_ FN_GLOBAL_STRING(lp_socket_address, &Globals.szSocketAddress) +_PUBLIC_ FN_GLOBAL_LIST(lp_netbios_aliases, &Globals.szNetbiosAliases) +_PUBLIC_ FN_GLOBAL_STRING(lp_panic_action, &Globals.szPanicAction) + +_PUBLIC_ FN_GLOBAL_BOOL(lp_disable_netbios, &Globals.bDisableNetbios) +_PUBLIC_ FN_GLOBAL_BOOL(lp_wins_support, &Globals.bWINSsupport) +_PUBLIC_ FN_GLOBAL_BOOL(lp_wins_dns_proxy, &Globals.bWINSdnsProxy) +_PUBLIC_ FN_GLOBAL_STRING(lp_wins_hook, &Globals.szWINSHook) +_PUBLIC_ FN_GLOBAL_BOOL(lp_local_master, &Globals.bLocalMaster) +_PUBLIC_ FN_GLOBAL_BOOL(lp_readraw, &Globals.bReadRaw) +_PUBLIC_ FN_GLOBAL_BOOL(lp_large_readwrite, &Globals.bLargeReadwrite) +_PUBLIC_ FN_GLOBAL_BOOL(lp_writeraw, &Globals.bWriteRaw) +_PUBLIC_ FN_GLOBAL_BOOL(lp_null_passwords, &Globals.bNullPasswords) +_PUBLIC_ FN_GLOBAL_BOOL(lp_obey_pam_restrictions, &Globals.bObeyPamRestrictions) +_PUBLIC_ FN_GLOBAL_BOOL(lp_encrypted_passwords, &Globals.bEncryptPasswords) static FN_GLOBAL_BOOL(lp_time_server, &Globals.bTimeServer) -FN_GLOBAL_BOOL(lp_bind_interfaces_only, &Globals.bBindInterfacesOnly) -FN_GLOBAL_BOOL(lp_unicode, &Globals.bUnicode) -FN_GLOBAL_BOOL(lp_nt_status_support, &Globals.bNTStatusSupport) -FN_GLOBAL_BOOL(lp_lanman_auth, &Globals.bLanmanAuth) -FN_GLOBAL_BOOL(lp_ntlm_auth, &Globals.bNTLMAuth) -FN_GLOBAL_BOOL(lp_client_plaintext_auth, &Globals.bClientPlaintextAuth) -FN_GLOBAL_BOOL(lp_client_lanman_auth, &Globals.bClientLanManAuth) -FN_GLOBAL_BOOL(lp_client_ntlmv2_auth, &Globals.bClientNTLMv2Auth) -FN_GLOBAL_BOOL(lp_client_use_spnego_principal, &Globals.client_use_spnego_principal) -FN_GLOBAL_BOOL(lp_host_msdfs, &Globals.bHostMSDfs) -FN_GLOBAL_BOOL(lp_unix_extensions, &Globals.bUnixExtensions) -FN_GLOBAL_BOOL(lp_use_spnego, &Globals.bUseSpnego) -FN_GLOBAL_BOOL(lp_rpc_big_endian, &Globals.bRpcBigEndian) -FN_GLOBAL_INTEGER(lp_max_wins_ttl, &Globals.max_wins_ttl) -FN_GLOBAL_INTEGER(lp_min_wins_ttl, &Globals.min_wins_ttl) -FN_GLOBAL_INTEGER(lp_maxmux, &Globals.max_mux) -FN_GLOBAL_INTEGER(lp_max_xmit, &Globals.max_xmit) -FN_GLOBAL_INTEGER(lp_passwordlevel, &Globals.pwordlevel) -FN_GLOBAL_INTEGER(lp_maxprotocol, &Globals.maxprotocol) -FN_GLOBAL_INTEGER(lp_minprotocol, &Globals.minprotocol) -FN_GLOBAL_INTEGER(lp_security, &Globals.security) -FN_GLOBAL_LIST(lp_auth_methods, &Globals.AuthMethods) -FN_GLOBAL_BOOL(lp_paranoid_server_security, &Globals.paranoid_server_security) +_PUBLIC_ FN_GLOBAL_BOOL(lp_bind_interfaces_only, &Globals.bBindInterfacesOnly) +_PUBLIC_ FN_GLOBAL_BOOL(lp_unicode, &Globals.bUnicode) +_PUBLIC_ FN_GLOBAL_BOOL(lp_nt_status_support, &Globals.bNTStatusSupport) +_PUBLIC_ FN_GLOBAL_BOOL(lp_lanman_auth, &Globals.bLanmanAuth) +_PUBLIC_ FN_GLOBAL_BOOL(lp_ntlm_auth, &Globals.bNTLMAuth) +_PUBLIC_ FN_GLOBAL_BOOL(lp_client_plaintext_auth, &Globals.bClientPlaintextAuth) +_PUBLIC_ FN_GLOBAL_BOOL(lp_client_lanman_auth, &Globals.bClientLanManAuth) +_PUBLIC_ FN_GLOBAL_BOOL(lp_client_ntlmv2_auth, &Globals.bClientNTLMv2Auth) +_PUBLIC_ FN_GLOBAL_BOOL(lp_client_use_spnego_principal, &Globals.client_use_spnego_principal) +_PUBLIC_ FN_GLOBAL_BOOL(lp_host_msdfs, &Globals.bHostMSDfs) +_PUBLIC_ FN_GLOBAL_BOOL(lp_unix_extensions, &Globals.bUnixExtensions) +_PUBLIC_ FN_GLOBAL_BOOL(lp_use_spnego, &Globals.bUseSpnego) +_PUBLIC_ FN_GLOBAL_BOOL(lp_rpc_big_endian, &Globals.bRpcBigEndian) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_max_wins_ttl, &Globals.max_wins_ttl) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_min_wins_ttl, &Globals.min_wins_ttl) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_maxmux, &Globals.max_mux) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_max_xmit, &Globals.max_xmit) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_passwordlevel, &Globals.pwordlevel) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_maxprotocol, &Globals.maxprotocol) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_minprotocol, &Globals.minprotocol) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_security, &Globals.security) +_PUBLIC_ FN_GLOBAL_LIST(lp_auth_methods, &Globals.AuthMethods) +_PUBLIC_ FN_GLOBAL_BOOL(lp_paranoid_server_security, &Globals.paranoid_server_security) static FN_GLOBAL_INTEGER(lp_announce_as, &Globals.announce_as) -FN_GLOBAL_LIST(lp_js_include, &Globals.jsInclude) - - -FN_LOCAL_STRING(lp_servicename, szService) -FN_LOCAL_CONST_STRING(lp_const_servicename, szService) -FN_LOCAL_STRING(lp_pathname, szPath) +_PUBLIC_ FN_GLOBAL_LIST(lp_js_include, &Globals.jsInclude) +_PUBLIC_ +_PUBLIC_ +_PUBLIC_ FN_LOCAL_STRING(lp_servicename, szService) +_PUBLIC_ FN_LOCAL_CONST_STRING(lp_const_servicename, szService) +_PUBLIC_ FN_LOCAL_STRING(lp_pathname, szPath) static FN_LOCAL_STRING(_lp_printername, szPrintername) -FN_LOCAL_LIST(lp_hostsallow, szHostsallow) -FN_LOCAL_LIST(lp_hostsdeny, szHostsdeny) -FN_LOCAL_STRING(lp_comment, comment) -FN_LOCAL_STRING(lp_fstype, fstype) +_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) -FN_LOCAL_LIST(lp_ntvfs_handler, ntvfs_handler) -FN_LOCAL_BOOL(lp_msdfs_root, bMSDfsRoot) -FN_LOCAL_BOOL(lp_browseable, bBrowseable) -FN_LOCAL_BOOL(lp_readonly, bRead_only) -FN_LOCAL_BOOL(lp_print_ok, bPrint_ok) -FN_LOCAL_BOOL(lp_map_hidden, bMap_hidden) -FN_LOCAL_BOOL(lp_map_archive, bMap_archive) -FN_LOCAL_BOOL(lp_strict_locking, bStrictLocking) -FN_LOCAL_BOOL(lp_strict_sync, bStrictSync) -FN_LOCAL_BOOL(lp_ci_filesystem, bCIFileSystem) -FN_LOCAL_BOOL(lp_map_system, bMap_system) -FN_LOCAL_INTEGER(lp_max_connections, iMaxConnections) -FN_LOCAL_INTEGER(lp_csc_policy, iCSCPolicy) -FN_GLOBAL_INTEGER(lp_server_signing, &Globals.server_signing) -FN_GLOBAL_INTEGER(lp_client_signing, &Globals.client_signing) +_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_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_GLOBAL_INTEGER(lp_server_signing, &Globals.server_signing) +_PUBLIC_ FN_GLOBAL_INTEGER(lp_client_signing, &Globals.client_signing) /* local prototypes */ diff --git a/source4/script/mkproto.pl b/source4/script/mkproto.pl index 1fca294d97..e79bcfd9b6 100755 --- a/source4/script/mkproto.pl +++ b/source4/script/mkproto.pl @@ -89,7 +89,7 @@ sub handle_loadparm($$) { my ($file,$line) = @_; - if ($line =~ /^FN_(GLOBAL|LOCAL)_(CONST_STRING|STRING|BOOL|CHAR|INTEGER|LIST)\((\w+),.*\)/o) { + if ($line =~ /^_PUBLIC_ FN_(GLOBAL|LOCAL)_(CONST_STRING|STRING|BOOL|CHAR|INTEGER|LIST)\((\w+),.*\)/o) { my $scope = $1; my $type = $2; my $name = $3; @@ -133,6 +133,11 @@ sub process_file($$$) next if ($line =~ /^\/|[;]/); + if ($line =~ /^_PUBLIC_ FN_/) { + handle_loadparm($public_file, $line); + next; + } + if ($line =~ /^_PUBLIC_[\t ]/) { $target = $public_file; $is_public = 1; @@ -147,11 +152,6 @@ sub process_file($$$) next if ($line =~ /^int\s*main/); - if ($line =~ /^FN_/) { - handle_loadparm($public_file, $line); - next; - } - if ( $line =~ /\(.*\)\s*$/o ) { chomp $line; print $target "$line;\n"; |