sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

lib/param: Merge DNS parameters with source3 param

Browse Source 
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
This commit is contained in:
Andrew Bartlett 2012-07-24 09:04:35 +10:00
parent 9ee084fd39
commit 19a886724a
1 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
lib/param/loadparm.c
View File

@ -1174,33 +1174,8 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "rndc command",
.type = P_CMDLIST,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szRNDCCommand),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "dns update command",
.type = P_CMDLIST,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szDNSUpdateCommand),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "nsupdate command",
.type = P_CMDLIST,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szNSUpdateCommand),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{N_("DNS options"), P_SEP, P_SEPARATOR},
{
.label = "allow dns updates",
.type = P_ENUM,
@ -1227,6 +1202,42 @@ static struct parm_struct parm_table[] = {
.special = NULL,
.enum_list = NULL
},
{
.label = "dns update command",
.type = P_CMDLIST,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szDNSUpdateCommand),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "nsupdate command",
.type = P_CMDLIST,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szNSUpdateCommand),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "rndc command",
.type = P_CMDLIST,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szRNDCCommand),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
{
.label = "multicast dns register",
.type = P_BOOL,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(bMulticastDnsRegister),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_GLOBAL,
},
{N_("AD DC options"), P_SEP, P_SEPARATOR},