diff options
author | Andrew Bartlett <abartlet@samba.org> | 2012-06-10 22:08:20 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-15 09:18:33 +0200 |
commit | b8815dc23d36468cce9b615335ed62f119eb8f35 (patch) | |
tree | f98b02f81e3fce8fbedadecf7f847e90bf40f4fa /lib/param/loadparm_server_role.c | |
parent | b9a75d8438470065633c1ff69c653eaa799d5718 (diff) | |
download | samba-b8815dc23d36468cce9b615335ed62f119eb8f35.tar.gz samba-b8815dc23d36468cce9b615335ed62f119eb8f35.tar.bz2 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 'lib/param/loadparm_server_role.c')
-rw-r--r-- | lib/param/loadparm_server_role.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/param/loadparm_server_role.c b/lib/param/loadparm_server_role.c index 5a1f4984fe..46515dadbd 100644 --- a/lib/param/loadparm_server_role.c +++ b/lib/param/loadparm_server_role.c @@ -41,6 +41,7 @@ static const struct srv_role_tab { { ROLE_DOMAIN_MEMBER, "ROLE_DOMAIN_MEMBER" }, { ROLE_DOMAIN_BDC, "ROLE_DOMAIN_BDC" }, { ROLE_DOMAIN_PDC, "ROLE_DOMAIN_PDC" }, + { ROLE_ACTIVE_DIRECTORY_DC, "ROLE_ACTIVE_DIRECTORY_DC" }, { 0, NULL } }; @@ -83,7 +84,7 @@ int lp_find_server_role(int server_role, int security, int domain_logons, int do break; case SEC_ADS: if (domain_logons) { - role = ROLE_DOMAIN_CONTROLLER; + role = ROLE_DOMAIN_BDC; break; } role = ROLE_DOMAIN_MEMBER; @@ -158,6 +159,7 @@ bool lp_is_security_and_server_role_valid(int server_role, int security) case ROLE_DOMAIN_PDC: case ROLE_DOMAIN_BDC: + case ROLE_ACTIVE_DIRECTORY_DC: if (security == SEC_USER || security == SEC_ADS || security == SEC_DOMAIN) { valid = true; } |