diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-05-28 16:51:47 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-05-30 04:15:11 +0200 |
| commit | b47f9a09cd5c374b213d9bad83c4903130f61a42 (patch) | |
| tree | 2975fe2b6cf6e64b11186439c904dccb5ce59f57 | |
| parent | 38b1a1115491f9bdbcf3dde42798fa94bd39dd97 (diff) | |
| download | samba-b47f9a09cd5c374b213d9bad83c4903130f61a42.tar.gz samba-b47f9a09cd5c374b213d9bad83c4903130f61a42.tar.bz2 samba-b47f9a09cd5c374b213d9bad83c4903130f61a42.zip | |
s3-param: Rename lp_dns_proxy() -> lp_wins_dns_proxy() for clarity
This avoids some confusion now we have a DNS server as well.
Andrew Bartlett
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/nmbd/nmbd.c | 2 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_winsserver.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 31c709dd9b..b7bb95998b 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -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); diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index bb264d2274..98a531026a 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -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 diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c index 0a06ebea66..ff5fae70b1 100644 --- a/source3/nmbd/nmbd_winsserver.c +++ b/source3/nmbd/nmbd_winsserver.c @@ -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) )); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 88252ef047..919bfcb850 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -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) |