amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-06 14:08:00 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 3dd8bddc0e.
This commit is contained in:
Julio García
2015-06-26 09:35:47 +02:00
parent 3f1a43cc13
commit dc2cc14d25
3 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoUser.m
+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