param: make server role list common and include auto (for the new default)

Pair-Programmed-With: Amitay Isaacs <amitay@samba.org>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index c00495a6dd263e7df517b723c8fcaaa58ebde2e4..cb378f471e7c5281ecb57847c4644cc5fa5bc223 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -163,12 +163,20 @@ static const struct enum_list enum_smb_signing_vals[] = {
        {-1, NULL}
 };
 
+/* Server role options */
 static const struct enum_list enum_server_role[] = {
+       {ROLE_AUTO, "auto"},
        {ROLE_STANDALONE, "standalone"},
        {ROLE_DOMAIN_MEMBER, "member server"},
        {ROLE_DOMAIN_MEMBER, "member"},
+       /* note that currently
+          ROLE_DOMAIN_CONTROLLER == ROLE_DOMAIN_BDC */
        {ROLE_DOMAIN_CONTROLLER, "domain controller"},
-       {ROLE_DOMAIN_CONTROLLER, "dc"},
+       {ROLE_DOMAIN_BDC, "backup domain controller"},
+       {ROLE_DOMAIN_BDC, "bdc"},
+       {ROLE_DOMAIN_BDC, "dc"},
+       {ROLE_DOMAIN_PDC, "primary domain controller"},
+       {ROLE_DOMAIN_PDC, "pdc"},
        {-1, NULL}
 };
 

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 7e9c09f5ed075196339efbcf15da871e81a63626..11da2a968751d62c05c7a157a0e32254069a2529 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -513,13 +513,18 @@ static const struct enum_list enum_kerberos_method[] = {
 };
 
 /* Server role options */
-static const struct enum_list enum_server_role_s3[] = {
+static const struct enum_list enum_server_role[] = {
+       {ROLE_AUTO, "auto"},
        {ROLE_STANDALONE, "standalone"},
        {ROLE_DOMAIN_MEMBER, "member server"},
        {ROLE_DOMAIN_MEMBER, "member"},
+       /* note that currently
+          ROLE_DOMAIN_CONTROLLER == ROLE_DOMAIN_BDC */
+       {ROLE_DOMAIN_CONTROLLER, "domain controller"},
+       {ROLE_DOMAIN_BDC, "backup domain controller"},
        {ROLE_DOMAIN_BDC, "bdc"},
-       {ROLE_DOMAIN_BDC, "domain controller"},
        {ROLE_DOMAIN_BDC, "dc"},
+       {ROLE_DOMAIN_PDC, "primary domain controller"},
        {ROLE_DOMAIN_PDC, "pdc"},
        {-1, NULL}
 };
@@ -680,7 +685,7 @@ static struct parm_struct parm_table[] = {
                .p_class        = P_GLOBAL,
                .offset         = GLOBAL_VAR(ServerRole),
                .special        = NULL,
-               .enum_list      = enum_server_role_s3,
+               .enum_list      = enum_server_role,
                .flags          = FLAG_BASIC | FLAG_ADVANCED,
        },