aboutsummaryrefslogtreecommitdiffstats
path: root/libds
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-06-10 22:08:20 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-15 09:18:33 +0200
commitb8815dc23d36468cce9b615335ed62f119eb8f35 (patch)
treef98b02f81e3fce8fbedadecf7f847e90bf40f4fa /libds
parentb9a75d8438470065633c1ff69c653eaa799d5718 (diff)
downloadsamba-b8815dc23d36468cce9b615335ed62f119eb8f35.tar.gz
samba-b8815dc23d36468cce9b615335ed62f119eb8f35.tar.xz
samba-b8815dc23d36468cce9b615335ed62f119eb8f35.zip
lib/param: Create a seperate server role for "active directory domain controller"
This will allow us to detect from the smb.conf if this is a Samba4 AD DC which will allow smarter handling of (for example) accidentially starting smbd rather than samba. To cope with upgrades from existing Samba4 installs, 'domain controller' is a synonym of 'active directory domain controller' and new parameters 'classic primary domain controller' and 'classic backup domain controller' are added. Andrew Bartlett
Diffstat (limited to 'libds')
-rw-r--r--libds/common/roles.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/libds/common/roles.h b/libds/common/roles.h
index 9dc9a00d28c..4772c8d7d3f 100644
--- a/libds/common/roles.h
+++ b/libds/common/roles.h
@@ -30,18 +30,14 @@ enum server_role {
ROLE_DOMAIN_MEMBER = 1,
ROLE_DOMAIN_BDC = 2,
ROLE_DOMAIN_PDC = 3,
+
+ /* not in samr.idl */
+ ROLE_ACTIVE_DIRECTORY_DC = 4,
/* To determine the role automatically, this is not a valid role */
ROLE_AUTO = 100
};
-/* keep compatibility with the s4 'ROLE_DOMAIN_CONTROLLER' by mapping
- * it to ROLE_DOMAIN_BDC. The PDC/BDC split is really historical from
- * NT4 domains which were not multi-master, but even in AD there is
- * only one machine that has the PDC FSMO role in a domain.
-*/
-#define ROLE_DOMAIN_CONTROLLER ROLE_DOMAIN_BDC
-
/* security levels for 'security =' option
--------------