From 1627fcda3eff6e636438c90d07ffcfd497ea68e2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 12 Sep 2012 18:07:58 +1000 Subject: 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 --- source4/dns_server/dns_server.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source4/dns_server/dns_server.c') 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; } -- cgit