diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-07-24 08:59:05 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-07-24 11:01:18 +0200 |
| commit | 9ee084fd390414e68687a98b82fbb28e32ed569e (patch) | |
| tree | be54679e7ce63a8352fd4f4bb6186422b77bff15 | |
| parent | 222850bf80dca69c1ee920d95b6b0a1f48fc589b (diff) | |
| download | samba-9ee084fd390414e68687a98b82fbb28e32ed569e.tar.gz samba-9ee084fd390414e68687a98b82fbb28e32ed569e.tar.bz2 samba-9ee084fd390414e68687a98b82fbb28e32ed569e.zip | |
lib/param: Rearrange AD DC options to make a merge with the source3 table easier
Andrew Bartlett
| -rw-r--r-- | lib/param/loadparm.c | 103 |
1 files changed, 53 insertions, 50 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 5203327a04..d0aa0ae42c 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -273,14 +273,6 @@ static struct parm_struct parm_table[] = { .flags = FLAG_ADVANCED | FLAG_WIZARD, }, { - .label = "ntvfs handler", - .type = P_LIST, - .p_class = P_LOCAL, - .offset = LOCAL_VAR(ntvfs_handler), - .special = NULL, - .enum_list = NULL - }, - { .label = "passdb backend", .type = P_STRING, .p_class = P_GLOBAL, @@ -288,22 +280,6 @@ static struct parm_struct parm_table[] = { .special = NULL, .enum_list = NULL }, - { - .label = "dcerpc endpoint servers", - .type = P_LIST, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(dcerpc_ep_servers), - .special = NULL, - .enum_list = NULL - }, - { - .label = "server services", - .type = P_LIST, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(server_services), - .special = NULL, - .enum_list = NULL - }, { .label = "security", @@ -996,14 +972,6 @@ static struct parm_struct parm_table[] = { }, { - .label = "share backend", - .type = P_STRING, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szShareBackend), - .special = NULL, - .enum_list = NULL - }, - { .label = "preload", .type = P_STRING, .p_class = P_GLOBAL, @@ -1225,24 +1193,6 @@ static struct parm_struct parm_table[] = { .flags = FLAG_ADVANCED, }, { - .label = "spn update command", - .type = P_CMDLIST, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szSPNUpdateCommand), - .special = NULL, - .enum_list = NULL, - .flags = FLAG_ADVANCED, - }, - { - .label = "samba kcc command", - .type = P_CMDLIST, - .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szSambaKCCCommand), - .special = NULL, - .enum_list = NULL, - .flags = FLAG_ADVANCED, - }, - { .label = "nsupdate command", .type = P_CMDLIST, .p_class = P_GLOBAL, @@ -1278,6 +1228,59 @@ static struct parm_struct parm_table[] = { .enum_list = NULL }, + {N_("AD DC options"), P_SEP, P_SEPARATOR}, + + { + .label = "samba kcc command", + .type = P_CMDLIST, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szSambaKCCCommand), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "server services", + .type = P_LIST, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(server_services), + .special = NULL, + .enum_list = NULL + }, + { + .label = "dcerpc endpoint servers", + .type = P_LIST, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(dcerpc_ep_servers), + .special = NULL, + .enum_list = NULL + }, + { + .label = "spn update command", + .type = P_CMDLIST, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szSPNUpdateCommand), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "share backend", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szShareBackend), + .special = NULL, + .enum_list = NULL + }, + { + .label = "ntvfs handler", + .type = P_LIST, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(ntvfs_handler), + .special = NULL, + .enum_list = NULL + }, + {N_("TLS options"), P_SEP, P_SEPARATOR}, { |