Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 6571. Do not add groups to already_seen for users #6628

Open
wants to merge 1 commit into
base: 389-ds-base-2.3
Choose a base branch
from
+41 −2
Open

Issue 6571. Do not add groups to already_seen for users #6628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions ldap/servers/plugins/memberof/memberof.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2288,6 +2288,43 @@ memberof_get_groups_r(MemberOfConfig *config, Slapi_DN *member_sdn, memberof_get
return rc;
}

int
check_if_member_is_person(Slapi_Value* member) {
int found = 0;
if (member == NULL) {
return found;
}

char * member_str = slapi_value_get_string(member);
Slapi_Entry *member_entry = NULL;
Slapi_PBlock *member_pb = NULL;
Slapi_DN *member_sdn = NULL;
member_sdn = slapi_sdn_new_normdn_byref(member_str);

slapi_search_get_entry(&member_pb, member_sdn, NULL, &member_entry, memberof_get_plugin_id());
if (member_entry) {
Slapi_Attr *attr = NULL;
slapi_entry_attr_find(member_entry, "objectclass", &attr);
if (attr) {
Slapi_Value *sval = NULL;
int i;
const struct berval *attrVal;
i = slapi_attr_first_value(attr, &sval);
while (i != -1) {
attrVal = slapi_value_get_berval(sval);
if (strcasecmp(attrVal->bv_val, "person") == 0) {
found = 1;
break;
}
i = slapi_attr_next_value(attr, i, &sval);
}
}
}
slapi_sdn_free(&member_sdn);

return found;
}

/* memberof_get_groups_callback()
*
* Callback to perform work of memberof_get_groups()
Expand Down Expand Up @@ -2367,8 +2404,10 @@ memberof_get_groups_callback(Slapi_Entry *e, void *callback_data)
slapi_valueset_add_value_ext(groupvals, group_dn_val, SLAPI_VALUE_FLAG_PASSIN);

/* push this ndn to detect group recursion */
already_seen_ndn_val = slapi_value_new_string(group_ndn);
slapi_valueset_add_value_ext(already_seen_ndn_vals, already_seen_ndn_val, SLAPI_VALUE_FLAG_PASSIN);
if (check_if_member_is_person(((memberof_get_groups_data *)callback_data)->memberdn_val) == 0) {
already_seen_ndn_val = slapi_value_new_string(group_ndn);
slapi_valueset_add_value_ext(already_seen_ndn_vals, already_seen_ndn_val, SLAPI_VALUE_FLAG_PASSIN);
}
}
if (!config->skip_nested || config->fixup_task) {
/* now recurse to find ancestors groups of e */
Expand Down