sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3-param: Rename lp_dns_proxy() -> lp_wins_dns_proxy() for clarity

Browse Source 
This avoids some confusion now we have a DNS server as well.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-05-28 16:51:47 +10:00
parent 38b1a11154
commit b47f9a09cd
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/proto.h
View File

@ -1177,7 +1177,7 @@ bool lp_disable_netbios(void);
bool lp_reset_on_zero_vc(void);
bool lp_log_writeable_files_on_exit(void);
bool lp_ms_add_printer_wizard(void);
bool lp_dns_proxy(void);
bool lp_wins_dns_proxy(void);
bool lp_we_are_a_wins_server(void);
bool lp_wins_proxy(void);
bool lp_local_master(void);

2
source3/nmbd/nmbd.c
View File

@ -928,7 +928,7 @@ static bool open_sockets(bool isdaemon, int port)
#ifndef SYNC_DNS
/* Setup the async dns. We do it here so it doesn't have all the other
stuff initialised and thus chewing memory and sockets */
if(lp_we_are_a_wins_server() && lp_dns_proxy()) {
if(lp_we_are_a_wins_server() && lp_wins_dns_proxy()) {
start_async_dns(msg);
}
#endif

2
source3/nmbd/nmbd_winsserver.c
View File

@ -2092,7 +2092,7 @@ void wins_process_name_query_request(struct subnet_record *subrec,
* Name not found in WINS - try a dns query if it's a 0x20 name.
*/
if(lp_dns_proxy() && ((question->name_type == 0x20) || question->name_type == 0)) {
if(lp_wins_dns_proxy() && ((question->name_type == 0x20) || question->name_type == 0)) {
DEBUG(3,("wins_process_name_query: name query for name %s not found - doing dns lookup.\n",
nmb_namestr(question) ));

2
source3/param/loadparm.c
View File

@ -5084,7 +5084,6 @@ 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(dns_proxy, bWINSdnsProxy)
FN_GLOBAL_BOOL(enable_asu_support, bASUSupport)
FN_GLOBAL_BOOL(enable_core_files, bEnableCoreFiles)
FN_GLOBAL_BOOL(enable_privileges, bEnablePrivileges)
@ -5139,6 +5138,7 @@ 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(wins_dns_proxy, bWINSdnsProxy)
FN_GLOBAL_CONST_STRING(dnsdomain, szDnsDomain)
FN_GLOBAL_CONST_STRING(dos_charset, dos_charset)
FN_GLOBAL_CONST_STRING(guestaccount, szGuestaccount)