Revert merge from inverse

https://github.com/Zentyal/sogo/pull/150

Because the login on web with the use of outlook is broken after
including the DomainLessLogin feature
This commit is contained in:
Jesús García Sáez
2015-07-28 12:37:33 +02:00
parent 72cbd9a45f
commit 3dc8cc78ea
41 changed files with 284 additions and 767 deletions
+1 -1
View File
@@ -463,7 +463,7 @@
if (!activeUserIsInDomain || ![uid isEqualToString: login])
{
jsonLine = [NSMutableArray arrayWithCapacity: 4];
if ([domain length] && [uid rangeOfString: @"@"].location == NSNotFound)
if ([domain length])
uid = [NSString stringWithFormat: @"%@@%@", uid, domain];
[jsonLine addObject: uid];
[jsonLine addObject: [contact objectForKey: @"cn"]];