Revert "Revert "(fix) more multi-domain fixes and cleanups""

This reverts commit 90e11d76f6.
This commit is contained in:
Julio García
2015-06-26 09:35:37 +02:00
parent 67d0d95869
commit 3f1a43cc13
2 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -922,7 +922,7 @@ static Class NSNullK;
{
// Remove the "@" prefix used to identified groups in the ACL tables.
aUID = [uid hasPrefix: @"@"] ? [uid substringFromIndex: 1] : uid;
if (domain)
if (domain && [aUID rangeOfString: @"@"].location == NSNotFound)
cacheUid = [NSString stringWithFormat: @"%@@%@", aUID, domain];
else
cacheUid = aUID;