From 6994c029b8d1fe53840aedd3916c775f66465ebe Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 10 Jun 2015 19:11:04 -0400 Subject: [PATCH] Revert "Improved rationale" This reverts commit 977406de765f78d34f390da9319d2371f3a22632. --- SoObjects/SOGo/SOGoUserManager.m | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/SoObjects/SOGo/SOGoUserManager.m b/SoObjects/SOGo/SOGoUserManager.m index d50ac05f2..b671d5ec1 100644 --- a/SoObjects/SOGo/SOGoUserManager.m +++ b/SoObjects/SOGo/SOGoUserManager.m @@ -459,16 +459,7 @@ static Class NSNullK; // 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 - // UIDFieldName @ domain as its unique identifier if the UIDFieldName is used to - // authenticate. This can happen for example of one has in LDAP: - // - // dn: uid=foo,dc=example,dc=com - // uid: foo - // mail: broccoli@example.com - // - // and authenticates with "foo", using bindFields = (uid, mail) and SOGoEnableDomainBasedUID = YES; - // The -checkLogin:... above would have failed because SOGo would first try to bind using: foo@example.com - // + // UID @ domain as its unique identifier. if (!checkOK && *domain && [sd enableDomainBasedUID] && r.location != NSNotFound) { checkOK = [sogoSource checkLogin: [login substringToIndex: r.location]