From ac30c821658316e8daf35386b1ea0fed9a116234 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 10 Jun 2015 19:11:26 -0400 Subject: [PATCH] Revert "(fix) fixed multidomain issue where UID isn't part of the email address" This reverts commit 1f83ba9d507d9d1fca78f2d221aefe68a9e35cdf. --- SoObjects/SOGo/SOGoUserManager.m | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/SoObjects/SOGo/SOGoUserManager.m b/SoObjects/SOGo/SOGoUserManager.m index b671d5ec1..0993b8d5e 100644 --- a/SoObjects/SOGo/SOGoUserManager.m +++ b/SoObjects/SOGo/SOGoUserManager.m @@ -435,39 +435,21 @@ static Class NSNullK; grace: (int *) grace { NSObject *sogoSource; - SOGoSystemDefaults *sd; NSEnumerator *authIDs; NSString *currentID; - BOOL checkOK; - NSRange r; - - sd = [SOGoSystemDefaults sharedSystemDefaults]; + checkOK = NO; authIDs = [[self authenticationSourceIDsInDomain: *domain] objectEnumerator]; while (!checkOK && (currentID = [authIDs nextObject])) { sogoSource = [_sources objectForKey: currentID]; - r = [login rangeOfString: [NSString stringWithFormat: @"@%@", *domain]]; - checkOK = [sogoSource checkLogin: login password: password perr: perr expire: expire grace: grace]; - - // If we are using multidomain and the UIDFieldName is not part of the email address - // we must also try to bind without the domain part since internally, SOGo will use - // UID @ domain as its unique identifier. - if (!checkOK && *domain && [sd enableDomainBasedUID] && r.location != NSNotFound) - { - checkOK = [sogoSource checkLogin: [login substringToIndex: r.location] - password: password - perr: perr - expire: expire - grace: grace]; - } } if (checkOK && *domain == nil)