From 0e52813fc15d44b0f8e486de058b53ba38602e6e Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 13 Aug 2008 21:29:49 +0000 Subject: [PATCH] Monotone-Parent: 3320a2f057d89877bbdad688f91b973ad939e531 Monotone-Revision: ecfd588ececc0cf909752cbf7561c097b6533867 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-08-13T21:29:49 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/SOGo/LDAPUserManager.m | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75e6f0ec3..de4830570 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-13 Wolfgang Sourdeau + + * SoObjects/SOGo/LDAPUserManager.m ([LDAPUserManager + -contactInfosForUserWithUIDorEmail:uid]): only use the + authentication sources. + 2008-08-11 Wolfgang Sourdeau * SoObjects/Appointments/SOGoComponentOccurence.m diff --git a/SoObjects/SOGo/LDAPUserManager.m b/SoObjects/SOGo/LDAPUserManager.m index e19cce700..3679e0f67 100644 --- a/SoObjects/SOGo/LDAPUserManager.m +++ b/SoObjects/SOGo/LDAPUserManager.m @@ -323,7 +323,7 @@ static BOOL forceImapLoginWithEmail = NO; NSDictionary *userEntry; NSEnumerator *ldapSources; LDAPSource *currentSource; - NSString *cn, *c_uid; + NSString *sourceID, *cn, *c_uid; NSArray *c_emails; BOOL access; @@ -336,9 +336,10 @@ static BOOL forceImapLoginWithEmail = NO; [currentUser setObject: [NSNumber numberWithBool: YES] forKey: @"MailAccess"]; - ldapSources = [sources objectEnumerator]; - while ((currentSource = [ldapSources nextObject])) + ldapSources = [[self authenticationSourceIDs] objectEnumerator]; + while ((sourceID = [ldapSources nextObject])) { + currentSource = [sources objectForKey: sourceID]; userEntry = [currentSource lookupContactEntryWithUIDorEmail: uid]; if (userEntry) {