From eb6629d89f1401a84f49b56ca8d2c129dda8a3eb Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 21 Mar 2011 18:24:06 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: fdd87c8990a184548d84798a93d2b2df80f30651 Monotone-Revision: fc98ebd698555332841f6988e47ba738f8e5e2da Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-03-21T18:24:06 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ SoObjects/SOGo/LDAPSource.m | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 779b32066..431ad4574 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ retrieve the users from LDAP sources that limit the number of results. + * SoObjects/SOGo/LDAPSource.m (:_qualifierForFilter): avoid + duplicated filters on the CN attribute. + 2011-03-20 Wolfgang Sourdeau * OpenChange/MAPIStoreCalendarMessage.m diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m index 12daf3c56..d844f946a 100644 --- a/SoObjects/SOGo/LDAPSource.m +++ b/SoObjects/SOGo/LDAPSource.m @@ -596,7 +596,7 @@ static NSArray *commonSearchFields; - (EOQualifier *) _qualifierForFilter: (NSString *) filter { NSMutableArray *fields; - NSString *searchFormat, *fieldFormat, *escapedFilter; + NSString *fieldFormat, *searchFormat, *escapedFilter; EOQualifier *qualifier; NSMutableString *qs; @@ -611,10 +611,10 @@ static NSArray *commonSearchFields; fieldFormat = [NSString stringWithFormat: @"(%%@='%@*')", escapedFilter]; fields = [NSMutableArray arrayWithArray: searchFields]; [fields addObjectsFromArray: mailFields]; + [fields addObject: CNField]; searchFormat = [[[fields uniqueObjects] stringsWithFormat: fieldFormat] componentsJoinedByString: @" OR "]; - [qs appendFormat: @"(%@='%@*') OR %@", - CNField, escapedFilter, searchFormat]; + [qs appendString: searchFormat]; } if (_filter && [_filter length])