From: Jeremy Allison <jra@samba.org>
Date: Fri, 20 Jun 2008 19:49:14 +0000 (-0700)
Subject: Fix bug #5533. Winbindd fails to cope correctly with a workgroup name containing... 
X-Git-Tag: samba-3.3.0pre1~830
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96325ff44dc404a68d4ebd423cf78210ec3ff902;p=thirdparty%2Fsamba.git

Fix bug #5533. Winbindd fails to cope correctly with a workgroup name containing a '.'.
Jeremy.
---

diff --git a/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c
index 6a96070f427..a35ba7bc067 100644
--- a/source/winbindd/winbindd_util.c
+++ b/source/winbindd/winbindd_util.c
@@ -165,15 +165,9 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const
         
 	ZERO_STRUCTP(domain);
 
-	/* prioritise the short name */
-	if (strchr_m(domain_name, '.') && alternative_name && *alternative_name) {
-		fstrcpy(domain->name, alternative_name);
-		fstrcpy(domain->alt_name, domain_name);
-	} else {
-		fstrcpy(domain->name, domain_name);
-		if (alternative_name) {
-			fstrcpy(domain->alt_name, alternative_name);
-		}
+	fstrcpy(domain->name, domain_name);
+	if (alternative_name) {
+		fstrcpy(domain->alt_name, alternative_name);
 	}
 
 	domain->methods = methods;