From 73eaacff637c95aa72abef30d3378ac5484cf1af Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 15 Jul 2011 10:06:47 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: dc704fb10726eca5edd9213a64dd7edc139de7b4 Monotone-Revision: e2ddde80cf09d9a5bf1b305a56dc3de54da2cddd Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-07-15T10:06:47 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/SOGo/SOGoUser.m | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 042b1aea7..85cba42f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-07-15 Francis Lachapelle + + * 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 * OpenChange/MAPIStoreMailMessage.m (-getPrHtml:inMemCtx:): fixed diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m index a58afc1e3..42de92e95 100644 --- a/SoObjects/SOGo/SOGoUser.m +++ b/SoObjects/SOGo/SOGoUser.m @@ -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;