Monotone-Parent: 7b02529f1f33a2ec0b03604bfd265e9477580e8f
Monotone-Revision: 5a279242bcd0a7239b0fee3400fe08b944a04d51 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-06-04T14:33:39 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
7bffc6c1a9
commit
6a9b6e5fd5
|
@ -38,6 +38,8 @@
|
||||||
|
|
||||||
#import "LDAPSource.h"
|
#import "LDAPSource.h"
|
||||||
|
|
||||||
|
#define SafeLDAPCriteria(x) [[x stringByReplacingString: @"\\" withString: @"\\\\"] \
|
||||||
|
stringByReplacingString: @"'" withString: @"\\'"]
|
||||||
static NSArray *commonSearchFields;
|
static NSArray *commonSearchFields;
|
||||||
static NSString *LDAPContactInfoAttribute = nil;
|
static NSString *LDAPContactInfoAttribute = nil;
|
||||||
static int timeLimit;
|
static int timeLimit;
|
||||||
|
@ -327,7 +329,7 @@ static NSLock *lock;
|
||||||
|
|
||||||
qs = [NSMutableString string];
|
qs = [NSMutableString string];
|
||||||
|
|
||||||
escapedUid = [uid stringByReplacingString: @"'" withString: @"\\'"];
|
escapedUid = SafeLDAPCriteria (uid);
|
||||||
|
|
||||||
fields = [[bindFields componentsSeparatedByString: @","] objectEnumerator];
|
fields = [[bindFields componentsSeparatedByString: @","] objectEnumerator];
|
||||||
while ((currentField = [fields nextObject]))
|
while ((currentField = [fields nextObject]))
|
||||||
|
@ -442,7 +444,7 @@ static NSLock *lock;
|
||||||
EOQualifier *qualifier;
|
EOQualifier *qualifier;
|
||||||
NSMutableString *qs;
|
NSMutableString *qs;
|
||||||
|
|
||||||
escapedFilter = [filter stringByReplacingString: @"'" withString: @"\\'"];
|
escapedFilter = SafeLDAPCriteria (filter);
|
||||||
if ([escapedFilter length] > 0)
|
if ([escapedFilter length] > 0)
|
||||||
{
|
{
|
||||||
fieldFormat = [NSString stringWithFormat: @"(%%@='%@*')", escapedFilter];
|
fieldFormat = [NSString stringWithFormat: @"(%%@='%@*')", escapedFilter];
|
||||||
|
@ -474,7 +476,7 @@ static NSLock *lock;
|
||||||
NSString *mailFormat, *fieldFormat, *escapedUid;
|
NSString *mailFormat, *fieldFormat, *escapedUid;
|
||||||
NSMutableString *qs;
|
NSMutableString *qs;
|
||||||
|
|
||||||
escapedUid = [uid stringByReplacingString: @"'" withString: @"\\'"];
|
escapedUid = SafeLDAPCriteria (uid);
|
||||||
|
|
||||||
fieldFormat = [NSString stringWithFormat: @"(%%@='%@')", escapedUid];
|
fieldFormat = [NSString stringWithFormat: @"(%%@='%@')", escapedUid];
|
||||||
mailFormat = [[mailFields stringsWithFormat: fieldFormat]
|
mailFormat = [[mailFields stringsWithFormat: fieldFormat]
|
||||||
|
@ -764,9 +766,8 @@ static NSLock *lock;
|
||||||
NSArray *attributes;
|
NSArray *attributes;
|
||||||
NSString *s;
|
NSString *s;
|
||||||
|
|
||||||
s = [NSString stringWithFormat: @"(%@='%@')", IDField,
|
s = [NSString stringWithFormat: @"(%@='%@')",
|
||||||
[theID stringByReplacingString: @"'"
|
IDField, SafeLDAPCriteria (theID)];
|
||||||
withString: @"\\'"]];
|
|
||||||
qualifier = [EOQualifier qualifierWithQualifierFormat: s];
|
qualifier = [EOQualifier qualifierWithQualifierFormat: s];
|
||||||
attributes = [self _searchAttributes];
|
attributes = [self _searchAttributes];
|
||||||
|
|
||||||
|
@ -905,9 +906,8 @@ static NSLock *lock;
|
||||||
NSString *s;
|
NSString *s;
|
||||||
|
|
||||||
// FIXME
|
// FIXME
|
||||||
s = [NSString stringWithFormat: @"(%@='%@')", theAttribute,
|
s = [NSString stringWithFormat: @"(%@='%@')",
|
||||||
[theValue stringByReplacingString: @","
|
theAttribute, SafeLDAPCriteria (theValue)];
|
||||||
withString: @"\\,"]];
|
|
||||||
qualifier = [EOQualifier qualifierWithQualifierFormat: s];
|
qualifier = [EOQualifier qualifierWithQualifierFormat: s];
|
||||||
|
|
||||||
// We look for additional attributes - the ones related to group membership
|
// We look for additional attributes - the ones related to group membership
|
||||||
|
|
Loading…
Reference in a new issue