amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-05 16:35:10 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
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
SoObjects/SOGo/SOGoUserManager.m
+1 -13
View File
@@ -514,21 +514,9 @@ static Class NSNullK;
if (r.location != NSNotFound)
{
NSArray *allDomains;
int i;
*_domain = [username substringFromIndex: r.location+1];
allDomains = [[dd dictionaryForKey: @"domains"] allValues];
for (i = 0; i < [allDomains count]; i++)
{
if ([*_domain isEqualToString: [[allDomains objectAtIndex: i] objectForKey: @"SOGoMailDomain"]])
break;
}
// We haven't found one
if (i == [allDomains count])
if (![[[SOGoSystemDefaults sharedSystemDefaults] domainIds] containsObject: *_domain])
*_domain = nil;
}
}