From fd34f58a5add5ce691e9e166459a86e98967a63c Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 30 Mar 2010 14:32:27 +0000 Subject: [PATCH] Monotone-Parent: 7b66e7e54c1c3722b44698bd915f6a240a127020 Monotone-Revision: 9ad272d437927aab03282755ff884237e2be9e0f Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-03-30T14:32:27 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/SOGo/LDAPSource.m | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59192cfe1..62681e20d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-03-30 Wolfgang Sourdeau + + * SoObjects/SOGo/LDAPSource.m + (-changePasswordForLogin:oldPassword:newPassword:perr:): fixed a + typo that could potentially cause crashes. + 2010-03-29 Ludovic Marcotte SoObjects/Appointments/SOGoWebAppointmentFolder.m diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m index 89a9689ee..a4409bbbd 100644 --- a/SoObjects/SOGo/LDAPSource.m +++ b/SoObjects/SOGo/LDAPSource.m @@ -511,7 +511,7 @@ static NSArray *commonSearchFields; mod = [NGLdapModification replaceModification: attr]; changes = [NSArray arrayWithObject: mod]; - perr = PolicyNoError; + *perr = PolicyNoError; if ([bindConnection bindWithMethod: @"simple" binddn: userDN @@ -850,7 +850,7 @@ static NSArray *commonSearchFields; ldapConnection = [self _ldapConnection]; qualifier = [self _qualifierForFilter: match]; attributes = [self _searchAttributes]; - + if ([_scope caseInsensitiveCompare: @"BASE"] == NSOrderedSame) entries = [ldapConnection baseSearchAtBaseDN: baseDN qualifier: qualifier