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

Jeremy.
(This used to be commit 96325ff44dc404a68d4ebd423cf78210ec3ff902)

diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index 6a96070f42778e8e543e0ab4a56836f5a5e825ca..a35ba7bc06784f996f47ba8acf94d0b4b1e981fb 100644 (file)
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/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;