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

merge of '1e777b448f611699c505f7adf188b474c8be8766'

Browse Source 
and 'c3a7c48c4aca7497c570e19e07cd5c09215932f0'

Monotone-Parent: 1e777b448f611699c505f7adf188b474c8be8766
Monotone-Parent: c3a7c48c4aca7497c570e19e07cd5c09215932f0
Monotone-Revision: 0bb415c672cf6fa29a94c71cfade196c42eeb58a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-15T19:31:27
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-07-15 19:31:27 +00:00
parent 1736de0c4b 689db91bdf
commit 72f379b931
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2011-07-15 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/SOGo/SOGoUser.m (-initWithLogin:roles:trust:): when
the login contains a @ character, compare the right part with only the
defined login domains (SOGoLoginDomains) -- don't consider all domains.
2011-07-15 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/*.m: make use of mapistore error code rather than
Documentation/SOGo Installation Guide.odt
BIN
View File
Binary file not shown.
SoObjects/SOGo/SOGoUser.m
+2 -2
View File
@@ -156,10 +156,10 @@
if (r.location != NSNotFound)
{
// The domain is probably appended to the username;
// make sure it is a defined domain in the configuration.
// make sure it is defined as a login domain in the configuration.
sd = [SOGoSystemDefaults sharedSystemDefaults];
domain = [newLogin substringFromIndex: (r.location + r.length)];
if ([[sd domainIds] containsObject: domain])
if ([[sd loginDomains] containsObject: domain])
newLogin = [newLogin substringToIndex: r.location];
else
domain = nil;