From 5119998bdf04f7d916d112650c22b9cf86026b2c Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 8 Oct 2014 19:15:35 +0200 Subject: [PATCH] winbindd: don't overwrite NULL alt_name with conflicting info from lsa Signed-off-by: Michael Adam --- source3/winbindd/winbindd_cm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 24ff1f7..bb35c8e 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -2298,9 +2298,10 @@ no_dssetup: } if (lsa_info->dns.dns_domain.string) { - if (domain->alt_name != NULL && - !strequal(domain->alt_name, - lsa_info->dns.dns_domain.string)) + if (domain->alt_name == NULL || + (domain->alt_name != NULL && + !strequal(domain->alt_name, + lsa_info->dns.dns_domain.string))) { DEBUG(1, ("set_dc_type_and_flags_connect: DC " "for domain %s (%s) claimed it was " -- 1.9.1