See ChangeLog.

Monotone-Parent: b0613f483a296b882038d9d023bcb71c82d4916e
Monotone-Revision: ed98effe549d74bf8029681e84b1654da70530c3

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-07-27T14:53:12
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoUser.m

@@ -156,7 +156,7 @@
   else
     {
       sd = [SOGoSystemDefaults sharedSystemDefaults];
-      if ([sd enableDomainBasedUID])
+      if ([sd enableDomainBasedUID] || [[sd loginDomains] count] > 0)
         {
           r = [newLogin rangeOfString: @"@" options: NSBackwardsSearch];
           if (r.location != NSNotFound)
@@ -168,6 +168,12 @@
                 newLogin = [newLogin substringToIndex: r.location];
               else
                 domain = nil;
+
+              if (domain != nil && ![sd enableDomainBasedUID])
+                // Login domains are enabled (SOGoLoginDomains) but not
+                // domain-based UID (SOGoEnableDomainBasedUID).
+                // Drop the domain from the login name.
+                domain = nil;
             }
         }