summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2012-03-27 14:42:15 +0200
committerKai Blin <kai@samba.org>2012-03-27 16:03:16 +0200
commit06dd4d8ee1c5440809fa87fd8a1f3cfac8e9036a (patch)
tree69e5a3654d52423e92dc256dad9d2815ab6c1cd7 /source4
parent533b2e6612bd6497c1d53c31912bccba0260a3e9 (diff)
downloadsamba-06dd4d8ee1c5440809fa87fd8a1f3cfac8e9036a.tar.gz
samba-06dd4d8ee1c5440809fa87fd8a1f3cfac8e9036a.tar.bz2
samba-06dd4d8ee1c5440809fa87fd8a1f3cfac8e9036a.zip
s4 dns: Check smb.conf if we should allow recursion
Diffstat (limited to 'source4')
-rw-r--r--source4/dns_server/dns_server.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c
index 9e88bd9ebf..789940ff94 100644
--- a/source4/dns_server/dns_server.c
+++ b/source4/dns_server/dns_server.c
@@ -139,8 +139,9 @@ static NTSTATUS dns_process(struct dns_server *dns,
*out_packet = *in_packet;
state->flags |= in_packet->operation | DNS_FLAG_REPLY;
- /* TODO: Allow setting the forwarding in smb.conf or the like */
- state->flags |= DNS_FLAG_RECURSION_AVAIL;
+ if (lpcfg_dns_recursive_queries(dns->task->lp_ctx)) {
+ state->flags |= DNS_FLAG_RECURSION_AVAIL;
+ }
switch (in_packet->operation & DNS_OPCODE) {
case DNS_OPCODE_QUERY: