From b8815dc23d36468cce9b615335ed62f119eb8f35 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 10 Jun 2012 22:08:20 +1000 Subject: 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 --- libds/common/roles.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'libds') diff --git a/libds/common/roles.h b/libds/common/roles.h index 9dc9a00d28..4772c8d7d3 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 -------------- -- cgit