From e4e5aabd6ff40edd2b7ad6d8e6204b8f60175a42 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 25 Apr 2008 15:15:28 +0000 Subject: [PATCH] Monotone-Parent: e1dfc6f99fa7ee268a57e41fbd7edf9f87b4801a Monotone-Revision: 79461b8ac05970c57a512022f8200f6a8524119e Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-04-25T15:15:28 Monotone-Branch: ca.inverse.sogo --- SoObjects/SOGo/LDAPUserManager.m | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/SoObjects/SOGo/LDAPUserManager.m b/SoObjects/SOGo/LDAPUserManager.m index e586b65b6..b630c895e 100644 --- a/SoObjects/SOGo/LDAPUserManager.m +++ b/SoObjects/SOGo/LDAPUserManager.m @@ -333,8 +333,7 @@ static BOOL defaultMailDomainIsConfigured = NO; forKey: @"MailAccess"]; ldapSources = [sources objectEnumerator]; - currentSource = [ldapSources nextObject]; - while (currentSource) + while ((currentSource = [ldapSources nextObject])) { userEntry = [currentSource lookupContactEntryWithUIDorEmail: uid]; if (userEntry) @@ -355,7 +354,6 @@ static BOOL defaultMailDomainIsConfigured = NO; [currentUser setObject: [NSNumber numberWithBool: NO] forKey: @"MailAccess"]; } - currentSource = [ldapSources nextObject]; } if (!cn) @@ -505,13 +503,9 @@ static BOOL defaultMailDomainIsConfigured = NO; contacts = [NSMutableArray array]; ldapSources = [sources objectEnumerator]; - currentSource = [ldapSources nextObject]; - while (currentSource) - { - [contacts addObjectsFromArray: - [currentSource fetchContactsMatching: filter]]; - currentSource = [ldapSources nextObject]; - } + while ((currentSource = [ldapSources nextObject])) + [contacts addObjectsFromArray: + [currentSource fetchContactsMatching: filter]]; return [self _compactAndCompleteContacts: [contacts objectEnumerator]]; }