amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-26 07:30:31 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: 9663f3f262f24910bf38ccb82e6718016ca35645
Monotone-Revision: 4c2f6d4f42eaf2a0ba7489c4099bcdf881808c53

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-04-06T12:54:03
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2009-04-06 12:54:03 +00:00
parent f3eb9161de
commit 62cdc5a13c
4 changed files with 101 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/LDAPSource.m
+87 -18
View File
@@ -167,6 +167,7 @@ static NSLock *lock;
mailFields = [NSArray arrayWithObject: @"mail"];
[mailFields retain];
bindFields = nil;
_scope = @"sub";
_filter = nil;
ldapConnection = nil;
@@ -192,6 +193,7 @@ static NSLock *lock;
[ldapConnection release];
[sourceID release];
[modulesConstraints release];
[_scope release];
[super dealloc];
}
@@ -199,7 +201,7 @@ static NSLock *lock;
{
self = [self init];
ASSIGN (sourceID, [udSource objectForKey: @"id"]);
ASSIGN(sourceID, [udSource objectForKey: @"id"]);
[self setBindDN: [udSource objectForKey: @"bindDN"]
password: [udSource objectForKey: @"bindPassword"]
@@ -212,9 +214,10 @@ static NSLock *lock;
UIDField: [udSource objectForKey: @"UIDFieldName"]
mailFields: [udSource objectForKey: @"MailFieldNames"]
andBindFields: [udSource objectForKey: @"bindFields"]];
ASSIGN (modulesConstraints, [udSource objectForKey: @"ModulesConstraints"]);
ASSIGN (_filter, [udSource objectForKey: @"filter"]);
ASSIGN(modulesConstraints, [udSource objectForKey: @"ModulesConstraints"]);
ASSIGN(_filter, [udSource objectForKey: @"filter"]);
ASSIGN(_scope, ([udSource objectForKey: @"scope"] ? (id)[udSource objectForKey: @"scope"]: (id)@"sub"));
return self;
}
@@ -334,10 +337,31 @@ static NSLock *lock;
if ([self _initLDAPConnection])
{
entries = [ldapConnection deepSearchAtBaseDN: baseDN
qualifier:
[self _qualifierForBindFilter: loginToCheck]
attributes: [NSArray arrayWithObject: @"dn"]];
EOQualifier *qualifier;
NSArray *attributes;
qualifier = [self _qualifierForBindFilter: loginToCheck];
attributes = [NSArray arrayWithObject: @"dn"];
if ([_scope caseInsensitiveCompare: @"BASE"] == NSOrderedSame)
{
entries = [ldapConnection baseSearchAtBaseDN: baseDN
qualifier: qualifier
attributes: attributes];
}
else if ([_scope caseInsensitiveCompare: @"ONE"] == NSOrderedSame)
{
entries = [ldapConnection flatSearchAtBaseDN: baseDN
qualifier: qualifier
attributes: attributes];
}
else /* else we do like it was before */
{
entries = [ldapConnection deepSearchAtBaseDN: baseDN
qualifier: qualifier
attributes: attributes];
}
userEntry = [entries nextObject];
}
else
@@ -507,9 +531,23 @@ static NSLock *lock;
ids = [NSMutableArray array];
if ([self _initLDAPConnection])
entries = [ldapConnection deepSearchAtBaseDN: baseDN
qualifier: nil
attributes: [NSArray arrayWithObject: IDField]];
{
NSArray *attributes;
attributes = [NSArray arrayWithObject: IDField];
if ([_scope caseInsensitiveCompare: @"BASE"] == NSOrderedSame)
entries = [ldapConnection baseSearchAtBaseDN: baseDN
qualifier: nil
attributes: attributes];
else if ([_scope caseInsensitiveCompare: @"ONE"] == NSOrderedSame)
entries = [ldapConnection flatSearchAtBaseDN: baseDN
qualifier: nil
attributes: attributes];
else /* else we do like it was before */
entries = [ldapConnection deepSearchAtBaseDN: baseDN
qualifier: nil
attributes: attributes];
}
else
entries = nil;
@@ -638,9 +676,26 @@ static NSLock *lock;
if ([match length] > 0)
{
if ([self _initLDAPConnection])
entries = [ldapConnection deepSearchAtBaseDN: baseDN
qualifier: [self _qualifierForFilter: match]
attributes: [self _searchAttributes]];
{
EOQualifier *qualifier;
NSArray *attributes;
qualifier = [self _qualifierForFilter: match];
attributes = [self _searchAttributes];
if ([_scope caseInsensitiveCompare: @"BASE"] == NSOrderedSame)
entries = [ldapConnection baseSearchAtBaseDN: baseDN
qualifier: qualifier
attributes: attributes];
else if ([_scope caseInsensitiveCompare: @"ONE"] == NSOrderedSame)
entries = [ldapConnection flatSearchAtBaseDN: baseDN
qualifier: qualifier
attributes: attributes];
else /* else we de like it was before */
entries = [ldapConnection deepSearchAtBaseDN: baseDN
qualifier: qualifier
attributes: attributes];
}
else
entries = nil;
@@ -698,7 +753,6 @@ static NSLock *lock;
NSDictionary *contactEntry;
NGLdapEntry *ldapEntry;
NSEnumerator *entries;
EOQualifier *qualifier;
#if defined(THREADSAFE)
[lock lock];
@@ -710,10 +764,25 @@ static NSLock *lock;
{
if ([self _initLDAPConnection])
{
EOQualifier *qualifier;
NSArray *attributes;
qualifier = [self _qualifierForUIDFilter: uid];
entries = [ldapConnection deepSearchAtBaseDN: baseDN
qualifier: qualifier
attributes: [self _searchAttributes]];
attributes = [self _searchAttributes];
if ([_scope caseInsensitiveCompare: @"BASE"] == NSOrderedSame)
entries = [ldapConnection baseSearchAtBaseDN: baseDN
qualifier: qualifier
attributes: attributes];
else if ([_scope caseInsensitiveCompare: @"ONE"] == NSOrderedSame)
entries = [ldapConnection flatSearchAtBaseDN: baseDN
qualifier: qualifier
attributes: attributes];
else /* else we do like it was before */
entries = [ldapConnection deepSearchAtBaseDN: baseDN
qualifier: qualifier
attributes: attributes];
ldapEntry = [entries nextObject];
}
else