mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-12 10:54:48 +08:00
Fix a SLAPI bug where slapd could crash if a preop plugin changed the mods
list and a subsequent plugin aborted the operation -- regardless of the preop result the frontend must refetch the array of LDAPMods
This commit is contained in:
parent
0185c75c2f
commit
8c764e8d63
@ -422,6 +422,18 @@ fe_op_modify( Operation *op, SlapReply *rs )
|
||||
|
||||
rs->sr_err = slapi_int_call_plugins( op->o_bd,
|
||||
SLAPI_PLUGIN_PRE_MODIFY_FN, pb );
|
||||
|
||||
/*
|
||||
* It's possible that the preoperation plugin changed the
|
||||
* modification array, so we need to convert it back to
|
||||
* a Modification list.
|
||||
*
|
||||
* Calling slapi_int_modifications2ldapmods() destroyed modlist so
|
||||
* we don't need to free it.
|
||||
*/
|
||||
slapi_pblock_get( pb, SLAPI_MODIFY_MODS, (void **)&modv );
|
||||
modlist = slapi_int_ldapmods2modifications( modv );
|
||||
|
||||
if ( rs->sr_err < 0 ) {
|
||||
/*
|
||||
* A preoperation plugin failure will abort the
|
||||
@ -445,17 +457,6 @@ fe_op_modify( Operation *op, SlapReply *rs )
|
||||
modv = NULL;
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
/*
|
||||
* It's possible that the preoperation plugin changed the
|
||||
* modification array, so we need to convert it back to
|
||||
* a Modification list.
|
||||
*
|
||||
* Calling slapi_int_modifications2ldapmods() destroyed modlist so
|
||||
* we don't need to free it.
|
||||
*/
|
||||
slapi_pblock_get( pb, SLAPI_MODIFY_MODS, (void **)&modv );
|
||||
modlist = slapi_int_ldapmods2modifications( modv );
|
||||
}
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user