ldap/servers/plugins/memberof/memberof.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 41f984ca92fe3d3d9f5297ff0c89f546749a322b
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue Jul 15 10:46:09 2014 -0400
Ticket 47853 - client hangs in add if memberof fails
Bug Description: If memberof plugin is enabled and the client adds an
entry with a membership attr it hangs if the memberof_postop_add
rejects the operation.
Fix Description: The problem is due to an unexpected error code being set
in the pblock (-1). Setting the proper LDAP error code
resolves the hang.
https://fedorahosted.org/389/ticket/47853
Reviewed by: lkrispenz(Thanks!)
diff --git a/ldap/servers/plugins/memberof/memberof.c
b/ldap/servers/plugins/memberof/memberof.c
index 8257e9d..526e95f 100644
--- a/ldap/servers/plugins/memberof/memberof.c
+++ b/ldap/servers/plugins/memberof/memberof.c
@@ -1604,9 +1604,8 @@ memberof_modop_one_replace_r(Slapi_PBlock *pb, MemberOfConfig
*config,
slapi_entry_attr_find( e, config->groupattrs[i], &members );
if(members)
{
- if(memberof_mod_attr_list_r(pb, config, mod_op, group_sdn,
- op_this_sdn, members, ll) != 0){
- rc = -1;
+ if((rc = memberof_mod_attr_list_r(pb, config, mod_op, group_sdn,
+ op_this_sdn, members, ll)) != 0){
goto bail;
}
}