summaryrefslogtreecommitdiff
path: root/source4/dns_server
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-09-12 18:07:58 +1000
committerStefan Metzmacher <metze@samba.org>2012-09-12 16:51:29 +0200
commit1627fcda3eff6e636438c90d07ffcfd497ea68e2 (patch)
treec4fbd81aa85eaa6d6ff511b68545b41a95617fee /source4/dns_server
parent5cac79abce9f7d30e28cbf15a94c7e92818a91ca (diff)
downloadsamba-1627fcda3eff6e636438c90d07ffcfd497ea68e2.tar.gz
samba-1627fcda3eff6e636438c90d07ffcfd497ea68e2.tar.bz2
samba-1627fcda3eff6e636438c90d07ffcfd497ea68e2.zip
dns_server: Remove parameter 'dns recursive queries' and base this on 'dns forwarder'
This simplifies a very common configuration. Andrew Bartlett Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4/dns_server')
-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 be1fecc008..c88ea83f3f 100644
--- a/source4/dns_server/dns_server.c
+++ b/source4/dns_server/dns_server.c
@@ -117,7 +117,7 @@ static struct tevent_req *dns_process_send(TALLOC_CTX *mem_ctx,
struct dns_process_state *state;
enum ndr_err_code ndr_err;
WERROR ret;
-
+ const char *forwarder = lpcfg_dns_forwarder(dns->task->lp_ctx);
req = tevent_req_create(mem_ctx, &state, struct dns_process_state);
if (req == NULL) {
return NULL;
@@ -156,7 +156,8 @@ static struct tevent_req *dns_process_send(TALLOC_CTX *mem_ctx,
state->state.flags = state->in_packet.operation;
state->state.flags |= DNS_FLAG_REPLY;
- if (lpcfg_dns_recursive_queries(dns->task->lp_ctx)) {
+
+ if (forwarder && *forwarder) {
state->state.flags |= DNS_FLAG_RECURSION_AVAIL;
}