From 7b5c7877182030e113bc6734f3ce9d3b09e7fec5 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 5 May 2020 12:18:37 -0400 Subject: [PATCH] fix(core): LDAP group expansion must use all user sources --- SoObjects/SOGo/LDAPSource.m | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m index 3d004cac1..06c46baf7 100644 --- a/SoObjects/SOGo/LDAPSource.m +++ b/SoObjects/SOGo/LDAPSource.m @@ -2081,7 +2081,8 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection, if (user) { [logins addObject: login]; - [members addObject: user]; + [members addObject: [NSDictionary dictionaryWithObject: login + forKey: @"c_uid"]]; } [pool release]; } @@ -2092,11 +2093,11 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection, pool = [NSAutoreleasePool new]; login = [uids objectAtIndex: i]; user = [SOGoUser userWithLogin: login roles: nil]; - if (user) { - [logins addObject: [user loginInDomain]]; - [members addObject: user]; + [logins addObject: login]; + [members addObject: [NSDictionary dictionaryWithObject: login + forKey: @"c_uid"]]; } [pool release]; }