summaryrefslogtreecommitdiff
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
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>
-rw-r--r--lib/param/loadparm.c1
-rw-r--r--lib/param/param_functions.c1
-rw-r--r--lib/param/param_table.c8
-rw-r--r--source4/dns_server/dns_server.c5
4 files changed, 3 insertions, 12 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 277a92124b..990dd294b9 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2215,7 +2215,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "nsupdate command", "/usr/bin/nsupdate -g");
lpcfg_do_global_parameter(lp_ctx, "allow dns updates", "secure only");
- lpcfg_do_global_parameter(lp_ctx, "dns recursive queries", "False");
lpcfg_do_global_parameter(lp_ctx, "dns forwarder", "");
for (i = 0; parm_table[i].label; i++) {
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index bf6863e76d..ce2f671d73 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -179,7 +179,6 @@ FN_GLOBAL_BOOL(defer_sharing_violations, bDeferSharingViolations)
FN_GLOBAL_BOOL(disable_netbios, bDisableNetbios)
FN_GLOBAL_BOOL(_disable_spoolss, bDisableSpoolss)
FN_GLOBAL_BOOL(_domain_logons, bDomainLogons)
-FN_GLOBAL_BOOL(dns_recursive_queries, dns_recursive_queries)
FN_GLOBAL_BOOL(enable_asu_support, bASUSupport)
FN_GLOBAL_BOOL(enable_core_files, bEnableCoreFiles)
FN_GLOBAL_BOOL(enable_privileges, bEnablePrivileges)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index cb9596c5f7..325f295342 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -4261,14 +4261,6 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
- .label = "dns recursive queries",
- .type = P_BOOL,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(dns_recursive_queries),
- .special = NULL,
- .enum_list = NULL
- },
- {
.label = "dns update command",
.type = P_CMDLIST,
.p_class = P_GLOBAL,
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;
}