Berkeley DB 4.2 support (DB 4.2 required by default)

[openldap] / servers / slapd / backover.c

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index 29edb8470c3615e61741752376c611ad166d173a..8101030eea15bd1f04a94c5045dda9abd7ab57b8 100644 (file)
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -165,7 +165,7 @@ over_op_func(
        BI_op_bind **func;
        BackendDB *be = op->o_bd, db = *op->o_bd;
        slap_callback cb = {over_back_response, NULL};
-       int rc = 0;
+       int rc = SLAP_CB_CONTINUE;
 
        op->o_bd = &db;
        cb.sc_private = op->o_callback;
@@ -176,16 +176,20 @@ over_op_func(
                if ( func[which] ) {
                        db.bd_info = (BackendInfo *)on;
                        rc = func[which]( op, rs );
-                       if ( rc ) break;
+                       if ( rc != SLAP_CB_CONTINUE ) break;
                }
        }
 
+       op->o_bd = be;
        func = &oi->oi_bd.bd_info->bi_op_bind;
-       if ( func[which] ) {
+       if ( func[which] && rc == SLAP_CB_CONTINUE ) {
                rc = func[which]( op, rs );
        }
-
-       op->o_bd = be;
+       /* should not fall thru this far without anything happening... */
+       if ( rc == SLAP_CB_CONTINUE ) {
+               rc = LDAP_UNWILLING_TO_PERFORM;
+       }
+       op->o_callback = cb.sc_private;
        return rc;
 }
 
@@ -321,7 +325,7 @@ overlay_config( BackendDB *be, const char *ov )
         */
        oi = (slap_overinfo *) be->bd_info;
        for ( prev=NULL, on2 = oi->oi_list; on2; prev=on2, on2=on2->on_next );
-       on2 = ch_malloc( sizeof(slap_overinst) );
+       on2 = ch_calloc( 1, sizeof(slap_overinst) );
        if ( !prev ) {
                oi->oi_list = on2;
        } else {
@@ -329,6 +333,7 @@ overlay_config( BackendDB *be, const char *ov )
        }
        *on2 = *on;
        on2->on_next = NULL;
+       on2->on_info = oi;
 
        /* Any initialization needed? */
        if ( on->on_bi.bi_db_init ) {