Revert "Merge pull request #164 from Zentyal/jgarcia/revert-merge-inverse"

This reverts commit 1404dbdb88, reversing
changes made to 72cbd9a45f.
This commit is contained in:
Julio García
2015-08-03 09:48:06 +02:00
parent 0ce04fd4b6
commit 26bd1b30fa
41 changed files with 774 additions and 291 deletions
+1 -1
View File
@@ -463,7 +463,7 @@
if (!activeUserIsInDomain || ![uid isEqualToString: login])
{
jsonLine = [NSMutableArray arrayWithCapacity: 4];
if ([domain length])
if ([domain length] && [uid rangeOfString: @"@"].location == NSNotFound)
uid = [NSString stringWithFormat: @"%@@%@", uid, domain];
[jsonLine addObject: uid];
[jsonLine addObject: [contact objectForKey: @"cn"]];