amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-17 19:28:50 +00:00
Code Issues Projects Releases Wiki Activity

(fix) make sure we don't double-append domain part (fixes #3614)

Browse Source
This commit is contained in:
Ludovic Marcotte
2016-05-06 13:47:35 -04:00
parent fbd2f1511b
commit a26b2ec9ef
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SoObjects/SOGo/SOGoUserManager.m
View File

@@ -391,12 +391,16 @@ static Class NSNullK;
if ([dd forceExternalLoginWithEmail])
{
sd = [SOGoSystemDefaults sharedSystemDefaults];
if ([sd enableDomainBasedUID])
// On multidomain environment we must use uid@domain
// for getEmailForUID method
login = [NSString stringWithFormat: @"%@@%@", uid, domain];
if ([sd enableDomainBasedUID] &&
[login rangeOfString: @"@"].location == NSNotFound)
{
// On multidomain environment we must use uid@domain
// for getEmailForUID method
login = [NSString stringWithFormat: @"%@@%@", uid, domain];
}
else
login = uid;
login = [self getEmailForUID: login];
}
else