(fix) avoid appending the domain unconditionally when SOGoEnableDomainBasedUID is set to YES

This commit is contained in:
Ludovic Marcotte
2015-05-19 13:48:59 -04:00
committed by Jesús García Sáez
parent e2ef0103c4
commit f4963df50f
3 changed files with 8 additions and 4 deletions
+2 -1
View File
@@ -622,7 +622,8 @@ static Class NSNullK;
// internal cache.
[currentUser setObject: [newPassword asSHA1String] forKey: @"password"];
sd = [SOGoSystemDefaults sharedSystemDefaults];
if ([sd enableDomainBasedUID])
if ([sd enableDomainBasedUID] &&
[login rangeOfString: @"@"].location == NSNotFound)
userLogin = [NSString stringWithFormat: @"%@@%@", login, domain];
else
userLogin = login;