(fix) more fixes and clarifications on the mutli-domain settings

This commit is contained in:
Ludovic Marcotte
2015-05-25 13:00:08 -04:00
parent 772c3b3115
commit d07df554f3
3 changed files with 12 additions and 19 deletions
+3 -2
View File
@@ -165,8 +165,9 @@
// The domain is probably appended to the username;
// make sure it is defined as a domain in the configuration.
domain = [newLogin substringFromIndex: (r.location + r.length)];
if (![[sd domainIds] containsObject: domain])
domain = nil;
if ([[sd domainIds] containsObject: domain] &&
![sd enableDomainBasedUID])
newLogin = [newLogin substringToIndex: r.location];
if (domain != nil && ![sd enableDomainBasedUID])
// Login domains are enabled (SOGoLoginDomains) but not