amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-13 01:08:50 +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

12
Documentation/SOGoInstallationGuide.asciidoc
View File

@@ -2136,7 +2136,8 @@ Multi-domains Configuration
~~~~~~~~~~~~~~~~~~~~~~~~~~~
If you want your installation to isolate two groups of users, you must
define a distinct authentication source for each _domain_. Following is
define a distinct authentication source for each _domain_. Your domain keys
must have the same value as your email domain you want to add. Following is
the same configuration that now includes two domains (acme.com and
coyote.com):
@@ -2144,7 +2145,7 @@ coyote.com):
{
...
domains = {
acme = {
acme.com = {
SOGoMailDomain = acme.com;
SOGoDraftsFolderName = Drafts;
SOGoUserSources = (
@@ -2165,7 +2166,7 @@ coyote.com):
}
);
};
coyote = {
coyote.com = {
SOGoMailDomain = coyote.com;
SOGoIMAPServer = imap.coyote.com;
SOGoUserSources = (
@@ -2196,7 +2197,7 @@ domains.
[cols="3,47,50a"]
|=======================================================================
|S |SOGoEnableDomainBasedUID
|Parameter used to activate user identification by domain. Users will be
|Parameter used to enable user identification by domain. Users will be
able (without being required) to login using the form `username@domain`,
meaning that values of _UIDFieldName_ no longer have to be unique among
all domains but only within the same domain. Internally, users will
@@ -2718,6 +2719,9 @@ h|2.3.0
This will grow the "participant states" field of calendar quick tables to a larger
size and add the the "c_description" column to calendar quick tables.
Moreover, if you are using a multi-domain configuration, make sure the keys for
your domains match the email domains you have defined.
h|2.2.8
|The configuration configuration parameters were renamed:

5
SoObjects/SOGo/SOGoUser.m
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

14
SoObjects/SOGo/SOGoUserManager.m
View File

@@ -524,21 +524,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;
}
}