amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-29 18:12:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/inverse-inc/sogo

Browse Source
This commit is contained in:
Ludovic Marcotte
2020-05-04 12:57:40 -04:00
parent 7929fd394f 8f7b2bfbed
commit cbf3d89f3e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SoObjects/SOGo/LDAPSource.m
View File

@@ -34,6 +34,7 @@
#import "NSString+Crypto.h"
#import "SOGoCache.h"
#import "SOGoSystemDefaults.h"
#import "SOGoUser.h"
#import "SOGoUserManager.h"
#import "LDAPSource.h"
@@ -2027,7 +2028,7 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
NSString *dn, *login;
SOGoUserManager *um;
NSDictionary *d;
NSDictionary *user;
SOGoUser *user;
NSArray *o;
NSAutoreleasePool *pool;
int i, c;
@@ -2075,10 +2076,11 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
{
pool = [NSAutoreleasePool new];
dn = [dns objectAtIndex: i];
user = [self lookupContactEntryByDN: dn];
login = [um getLoginForDN: [dn lowercaseString]];
user = [SOGoUser userWithLogin: login roles: nil];
if (user)
{
[logins addObject: [user objectForKey: @"c_uid"]];
[logins addObject: login];
[members addObject: user];
}
[pool release];
@@ -2089,11 +2091,11 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
{
pool = [NSAutoreleasePool new];
login = [uids objectAtIndex: i];
user = [self lookupContactEntry: login inDomain: nil];
user = [SOGoUser userWithLogin: login roles: nil];
if (user)
{
[logins addObject: [user objectForKey: @"c_uid"]];
[logins addObject: [user loginInDomain]];
[members addObject: user];
}
[pool release];