fix(calendar): return SOGoUser instances when expanding LDAP groups

Fixes #5043
This commit is contained in:
Francis Lachapelle committed 2020-07-01 16:58:16 -04:00
1 parent 62fc80de20
commit b8595d7ae6
5 files changed
+30 -34

No files matched your search

+3 -5
View File
@@ -2085,8 +2085,7 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
if (user)
{
[logins addObject: login];
[members addObject: [NSDictionary dictionaryWithObject: login
forKey: @"c_uid"]];
[members addObject: user];
}
[pool release];
}
@@ -2100,15 +2099,14 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
if (user)
{
[logins addObject: login];
[members addObject: [NSDictionary dictionaryWithObject: login
forKey: @"c_uid"]];
[members addObject: user];
}
[pool release];
}
// We are done fetching members, let's cache the members of the group
// (ie., their UIDs) in memcached to speed up -hasMemberWithUID.
// (ie., their UIDs) in memcached to speed up -groupWithUIDHasMemberWithUID.
[[SOGoCache sharedCache] setValue: [logins componentsJoinedByString: @","]
forKey: [NSString stringWithFormat: @"%@+%@", uid, _domain]];
}