summaryrefslogtreecommitdiff
path: root/source3/nmbd
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-07-01 07:15:13 +0000
committerAndrew Tridgell <tridge@samba.org>2002-07-01 07:15:13 +0000
commitcf634de37b0a2203341bd5be7156e2cc86b0be03 (patch)
tree27f05334bf4d64220274802f1a2b42648773c639 /source3/nmbd
parent3563257247c9444f1b1489fb9f4faba3dc50959e (diff)
downloadsamba-cf634de37b0a2203341bd5be7156e2cc86b0be03.tar.gz
samba-cf634de37b0a2203341bd5be7156e2cc86b0be03.tar.bz2
samba-cf634de37b0a2203341bd5be7156e2cc86b0be03.zip
don't start the async dns process unless we actually need it!
(ie. check for lp_dns_proxy()) (This used to be commit 84d3b09b8542518a4684d07e975bcc9eaa1f6b69)
Diffstat (limited to 'source3/nmbd')
-rw-r--r--source3/nmbd/nmbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 06d6bc3bb3..d30efb550c 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -844,7 +844,7 @@ static void usage(char *pname)
#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()) {
+ if(lp_we_are_a_wins_server() && lp_dns_proxy()) {
start_async_dns();
}
#endif