summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-07-24 09:04:35 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-07-24 11:01:18 +0200
commit19a886724a75416c5565673d28d397ae91d710a1 (patch)
treebb0cb312e7bfd222a5ad483a0104610a0a587353
parent9ee084fd390414e68687a98b82fbb28e32ed569e (diff)
downloadsamba-19a886724a75416c5565673d28d397ae91d710a1.tar.gz
samba-19a886724a75416c5565673d28d397ae91d710a1.tar.bz2
samba-19a886724a75416c5565673d28d397ae91d710a1.zip
lib/param: Merge DNS parameters with source3 param
This will make the merge of the whole table smoother. Based on an earlier patch Pair-Programmed-With: Andrew Tridgell <tridge@samba.org> Andrew Bartlett
-rw-r--r--lib/param/loadparm.c47
1 files changed, 29 insertions, 18 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index d0aa0ae42c..a3e5bd2f67 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -1174,16 +1174,35 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
+
+ {N_("DNS options"), P_SEP, P_SEPARATOR},
{
- .label = "rndc command",
- .type = P_CMDLIST,
+ .label = "allow dns updates",
+ .type = P_ENUM,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szRNDCCommand),
+ .offset = GLOBAL_VAR(allow_dns_updates),
+ .special = NULL,
+ .enum_list = enum_dns_update_settings,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "dns forwarder",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(dns_forwarder),
.special = NULL,
.enum_list = NULL,
.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,
@@ -1202,30 +1221,22 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
- .label = "allow dns updates",
- .type = P_ENUM,
- .p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(allow_dns_updates),
- .special = NULL,
- .enum_list = enum_dns_update_settings,
- .flags = FLAG_ADVANCED,
- },
- {
- .label = "dns forwarder",
- .type = P_STRING,
+ .label = "rndc command",
+ .type = P_CMDLIST,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(dns_forwarder),
+ .offset = GLOBAL_VAR(szRNDCCommand),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
- .label = "dns recursive queries",
+ .label = "multicast dns register",
.type = P_BOOL,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(dns_recursive_queries),
+ .offset = GLOBAL_VAR(bMulticastDnsRegister),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{N_("AD DC options"), P_SEP, P_SEPARATOR},