diff options
author | Stefan Metzmacher <metze@samba.org> | 2014-12-23 09:43:19 +0000 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2015-01-05 19:23:39 +0100 |
commit | 8a2a5986b687a393d31cfa0e662d2d70212879a2 (patch) | |
tree | af8fb01ddc4bf3e909c35f5ff17c20f5ca92acd0 /source3/winbindd | |
parent | 3c9926055139beee0fcdf532df08fab02cdb298c (diff) | |
download | samba-8a2a5986b687a393d31cfa0e662d2d70212879a2.tar.gz |
s3:winbindd: improve logic to use CLDAP for a given domain.
As an AC Domain Controller we should try CLDAP for active directory domains.
E.g. FreeIPA domains doesn't provide NBT at all...
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Mon Jan 5 19:23:40 CET 2015 on sn-devel-104
Diffstat (limited to 'source3/winbindd')
-rw-r--r-- | source3/winbindd/winbindd_cm.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 0a633696d9a..59c0b86a0df 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1381,7 +1381,9 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx, NTSTATUS status; const char *dc_name; fstring nbtname; - +#ifdef HAVE_ADS + bool is_ad_domain = false; +#endif ip_list.ss = *pss; ip_list.port = 0; @@ -1390,6 +1392,12 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx, None of these failures should be considered critical for now */ if ((lp_security() == SEC_ADS) && (domain->alt_name != NULL)) { + is_ad_domain = true; + } else if (lp_server_role() == ROLE_ACTIVE_DIRECTORY_DC) { + is_ad_domain = domain->active_directory; + } + + if (is_ad_domain) { ADS_STRUCT *ads; ADS_STATUS ads_status; char addr[INET6_ADDRSTRLEN]; |