if ( rc == SLAP_CB_BYPASS )
rc = SLAP_CB_CONTINUE;
+ /* if an overlay halted processing, make sure
+ * any previously set cleanup handlers are run
+ */
+ if ( rc != SLAP_CB_CONTINUE )
+ goto cleanup;
+
func = &oi->oi_orig->bi_op_bind;
- if ( func[which] && rc == SLAP_CB_CONTINUE ) {
+ if ( func[which] ) {
op->o_bd->bd_info = oi->oi_orig;
rc = func[which]( op, rs );
}
*/
if ( rc == LDAP_UNWILLING_TO_PERFORM ) {
slap_callback *sc_next;
+cleanup:
for ( ; op->o_callback && op->o_callback->sc_response !=
over_back_response; op->o_callback = sc_next ) {
sc_next = op->o_callback->sc_next;
overlay_entry_release_ov( op, e, 0, on );
}
/* equal? Should never happen */
- if ( match == 0 )
+ if ( match == 0 ) {
+ /* tell accesslog this was a failure */
+ rs->sr_err = LDAP_TYPE_OR_VALUE_EXISTS;
return LDAP_SUCCESS;
+ }
/* mod is older: resolve conflicts...
* 1. Save/copy original modlist. Split Replace to Del/Add.