From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 10 Nov 2011 10:27:13 +0000 (+1100)
Subject: lib/param simplify server role values specified in smb.conf
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=cd23028ed05feaace335fb96247cfe344a776c71;p=kai%2Fsamba.git

lib/param simplify server role values specified in smb.conf

The pdc/bdc split is only in smb.conf for Samba3 DCs, and so is
too confusing to document in this paramter.  It will be clearer
to sort out "domain master" into a "pdc emulator" paramter
to conver this distinction.

Andrew Bartlett
---

diff --git a/lib/param/param_enums.c b/lib/param/param_enums.c
index 185f6dd44d8..cdc5b5eff6c 100644
--- a/lib/param/param_enums.c
+++ b/lib/param/param_enums.c
@@ -80,11 +80,7 @@ static const struct enum_list enum_server_role[] = {
 	/* 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, "dc"},
-	{ROLE_DOMAIN_PDC, "primary domain controller"},
-	{ROLE_DOMAIN_PDC, "pdc"},
+	{ROLE_DOMAIN_CONTROLLER, "dc"},
 	{-1, NULL}
 };