[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2929-g96325ff

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  96325ff44dc404a68d4ebd423cf78210ec3ff902 (commit)
      from  4c3bfea9f8d238f9100eaa264b9b2941dff5a6dd (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 96325ff44dc404a68d4ebd423cf78210ec3ff902
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jun 20 12:49:14 2008 -0700

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

-----------------------------------------------------------------------

Summary of changes:
 source/winbindd/winbindd_util.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c
index 6a96070..a35ba7b 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;


-- 
Samba Shared Repository