ITS#8752 make sure all cleanups are called in overlay_op_walk

[openldap] / servers / slapd / backover.c

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index b7d22922f450fbfd99324c7da2c95db9d3ef7aad..cc13d77c28543ed808481fecc9881fc429903764 100644 (file)
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2015 The OpenLDAP Foundation.
+ * Copyright 2003-2017 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -327,7 +327,9 @@ over_access_allowed(
        }
 
        op->o_bd = be;
-       op->o_bd->bd_info = bi;
+       if ( SLAP_ISOVERLAY( op->o_bd ) ) {
+               op->o_bd->bd_info = bi;
+       }
 
        return rc;
 }
@@ -383,7 +385,9 @@ overlay_entry_get_ov(
        }
 
        op->o_bd = be;
-       op->o_bd->bd_info = bi;
+       if ( SLAP_ISOVERLAY( op->o_bd ) ) {
+               op->o_bd->bd_info = bi;
+       }
 
        return rc;
 }
@@ -455,7 +459,9 @@ overlay_entry_release_ov(
        }
 
        op->o_bd = be;
-       op->o_bd->bd_info = bi;
+       if ( SLAP_ISOVERLAY( op->o_bd ) ) {
+               op->o_bd->bd_info = bi;
+       }
 
        return rc;
 }
@@ -543,7 +549,9 @@ over_acl_group(
        }
 
        op->o_bd = be;
-       op->o_bd->bd_info = bi;
+       if ( SLAP_ISOVERLAY( op->o_bd ) ) {
+               op->o_bd->bd_info = bi;
+       }
 
        return rc;
 }
@@ -614,7 +622,9 @@ over_acl_attribute(
        }
 
        op->o_bd = be;
-       op->o_bd->bd_info = bi;
+       if ( SLAP_ISOVERLAY( op->o_bd ) ) {
+               op->o_bd->bd_info = bi;
+       }
 
        return rc;
 }
@@ -706,8 +716,7 @@ int overlay_op_walk(
        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 ) {
+               for ( ; op->o_callback; op->o_callback = sc_next ) {
                        sc_next = op->o_callback->sc_next;
                        if ( op->o_callback->sc_cleanup ) {
                                op->o_callback->sc_cleanup( op, rs );
@@ -727,7 +736,8 @@ over_op_func(
        slap_overinfo *oi;
        slap_overinst *on;
        BackendDB *be = op->o_bd, db;
-       slap_callback cb = {NULL, over_back_response, NULL, NULL}, **sc;
+       slap_callback **sc;
+       slap_callback *cb;
        int rc = SLAP_CB_CONTINUE;
 
        /* FIXME: used to happen for instance during abandon
@@ -742,15 +752,24 @@ over_op_func(
                db.be_flags |= SLAP_DBFLAG_OVERLAY;
                op->o_bd = &db;
        }
-       cb.sc_next = op->o_callback;
-       cb.sc_private = oi;
-       op->o_callback = &cb;
+       if ( op->o_tag != LDAP_REQ_ABANDON && op->o_tag != LDAP_REQ_UNBIND ) {
+               cb = (slap_callback *)op->o_tmpcalloc( 1, sizeof(slap_callback), op->o_tmpmemctx );
+               cb->sc_cleanup = NULL;
+               cb->sc_response = over_back_response;
+               cb->sc_writewait = NULL;
+               cb->sc_next = op->o_callback;
+               cb->sc_private = oi;
+               op->o_callback = cb;
+       }
 
        rc = overlay_op_walk( op, rs, which, oi, on );
-       for ( sc = &op->o_callback; *sc; sc = &(*sc)->sc_next ) {
-               if ( *sc == &cb ) {
-                       *sc = cb.sc_next;
-                       break;
+       if ( rc != SLAPD_ASYNCOP && op->o_tag != LDAP_REQ_ABANDON && op->o_tag != LDAP_REQ_UNBIND ) {
+               for ( sc = &op->o_callback; *sc; sc = &(*sc)->sc_next ) {
+                       if ( *sc == cb ) {
+                               *sc = cb->sc_next;
+                               op->o_tmpfree( cb, op->o_tmpmemctx );
+                               break;
+                       }
                }
        }
 
@@ -1104,7 +1123,7 @@ overlay_register_control( BackendDB *be, const char *oid )
                                gotit = 1;
                        }
 
-                       /* overlays can be instanciated multiple times, use
+                       /* overlays can be instantiated multiple times, use
                         * be_ctrls[ cid ] as an instance counter, so that the
                         * overlay's controls are only really disabled after the
                         * last instance called overlay_register_control() */
@@ -1115,7 +1134,7 @@ overlay_register_control( BackendDB *be, const char *oid )
        }
        
        if ( !gotit ) {
-               /* overlays can be instanciated multiple times, use
+               /* overlays can be instantiated multiple times, use
                 * be_ctrls[ cid ] as an instance counter, so that the
                 * overlay's controls are only really unregistered after the
                 * last instance called overlay_register_control() */
@@ -1240,6 +1259,7 @@ overlay_remove( BackendDB *be, slap_overinst *on, Operation *op )
        rm_cb->sc_cleanup = overlay_remove_cb;
        rm_cb->sc_response = NULL;
        rm_cb->sc_private = (void*) rm_ctx;
+       rm_cb->sc_writewait = NULL;
 
        /* Append callback to the end of the list */
        if ( !op->o_callback ) {