Monotone-Parent: 3320a2f057d89877bbdad688f91b973ad939e531

Monotone-Revision: ecfd588ececc0cf909752cbf7561c097b6533867

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-08-13T21:29:49
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-08-13 21:29:49 +00:00
parent 844abebcd6
commit 0e52813fc1
2 changed files with 10 additions and 3 deletions
+6
View File
@@ -1,3 +1,9 @@
2008-08-13 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/LDAPUserManager.m ([LDAPUserManager
-contactInfosForUserWithUIDorEmail:uid]): only use the
authentication sources.
2008-08-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoComponentOccurence.m
+4 -3
View File
@@ -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)
{