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 --- source4/auth/ntlm/auth.c | 1 + source4/auth/ntlm/auth_sam.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/auth/ntlm') diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c index 58a12fbc53..d0ff50afc6 100644 --- a/source4/auth/ntlm/auth.c +++ b/source4/auth/ntlm/auth.c @@ -630,6 +630,7 @@ const char **auth_methods_from_lp(TALLOC_CTX *mem_ctx, struct loadparm_context * break; case ROLE_DOMAIN_BDC: case ROLE_DOMAIN_PDC: + case ROLE_ACTIVE_DIRECTORY_DC: auth_methods = str_list_make(mem_ctx, "anonymous sam_ignoredomain winbind", NULL); break; } diff --git a/source4/auth/ntlm/auth_sam.c b/source4/auth/ntlm/auth_sam.c index 87a7d27559..4a4307c895 100644 --- a/source4/auth/ntlm/auth_sam.c +++ b/source4/auth/ntlm/auth_sam.c @@ -341,7 +341,7 @@ static NTSTATUS authsam_want_check(struct auth_method_context *ctx, } return NT_STATUS_OK; - case ROLE_DOMAIN_CONTROLLER: + case ROLE_ACTIVE_DIRECTORY_DC: if (!is_local_name && !is_my_domain) { DEBUG(6,("authsam_check_password: %s is not one of my local names or domain name (DC)\n", user_info->mapped.domain_name)); -- cgit