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 --- dfs_server/dfs_server_ad.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dfs_server/dfs_server_ad.c') diff --git a/dfs_server/dfs_server_ad.c b/dfs_server/dfs_server_ad.c index b7004c5506..6b71f70984 100644 --- a/dfs_server/dfs_server_ad.c +++ b/dfs_server/dfs_server_ad.c @@ -447,7 +447,7 @@ static NTSTATUS dodomain_referral(struct loadparm_context *lp_ctx, /* In the future this needs to be fetched from the ldb */ uint32_t found_domain = 2; - if (lpcfg_server_role(lp_ctx) != ROLE_DOMAIN_CONTROLLER) { + if (lpcfg_server_role(lp_ctx) != ROLE_ACTIVE_DIRECTORY_DC) { DEBUG(10 ,("Received a domain referral request on a non DC\n")); return NT_STATUS_INVALID_PARAMETER; } @@ -529,7 +529,7 @@ static NTSTATUS dodc_referral(struct loadparm_context *lp_ctx, struct dfs_referral_type *referrals; const char *referral_str; - if (lpcfg_server_role(lp_ctx) != ROLE_DOMAIN_CONTROLLER) { + if (lpcfg_server_role(lp_ctx) != ROLE_ACTIVE_DIRECTORY_DC) { return NT_STATUS_INVALID_PARAMETER; } @@ -640,7 +640,7 @@ static NTSTATUS dosysvol_referral(struct loadparm_context *lp_ctx, NTSTATUS status; struct dfs_referral_type *referrals; - if (lpcfg_server_role(lp_ctx) != ROLE_DOMAIN_CONTROLLER) { + if (lpcfg_server_role(lp_ctx) != ROLE_ACTIVE_DIRECTORY_DC) { return NT_STATUS_INVALID_PARAMETER; } -- cgit