diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-11-10 12:50:09 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-11-17 00:34:08 +0100 |
| commit | df9a1ea6cb18d4e701471ddd0144dbc970c4eb88 (patch) | |
| tree | 9f9239823bc65f4aac4205c5b79d9ad8b3aed771 | |
| parent | 299ed456705944c0b6f848d4fce1fbf6853df965 (diff) | |
| download | samba-df9a1ea6cb18d4e701471ddd0144dbc970c4eb88.tar.gz samba-df9a1ea6cb18d4e701471ddd0144dbc970c4eb88.tar.bz2 samba-df9a1ea6cb18d4e701471ddd0144dbc970c4eb88.zip | |
param: make server role list common and include auto (for the new default)
Pair-Programmed-With: Amitay Isaacs <amitay@samba.org>
| -rw-r--r-- | lib/param/loadparm.c | 10 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 11 |
2 files changed, 17 insertions, 4 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index c00495a6dd..cb378f471e 100644 --- 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 7e9c09f5ed..11da2a9687 100644 --- 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, }, |