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 61f8acbe35ac4290cf711bc0178661285c1e2e0a..8101030eea15bd1f04a94c5045dda9abd7ab57b8 100644 (file)
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -37,7 +37,7 @@ over_db_func(
        BI_db_open **func;
        int rc = 0;
 
-       func = &oi->oi_bi.bi_db_open;
+       func = &oi->oi_bd.bd_info->bi_db_open;
        if ( func[which] ) {
                rc = func[which]( &oi->oi_bd );
                if ( rc ) return rc;
@@ -69,8 +69,8 @@ over_db_config(
        BackendDB bd;
        int rc = 0;
 
-       if ( oi->oi_bi.bi_db_config ) {
-               rc = oi->oi_bi.bi_db_config( &oi->oi_bd, fname, lineno,
+       if ( oi->oi_bd.bd_info->bi_db_config ) {
+               rc = oi->oi_bd.bd_info->bi_db_config( &oi->oi_bd, fname, lineno,
                        argc, argv );
                if ( rc ) return rc;
        }
@@ -127,23 +127,25 @@ over_back_response ( Operation *op, SlapReply *rs )
 {
        slap_overinfo *oi = (slap_overinfo *) op->o_bd->bd_info;
        slap_overinst *on = oi->oi_list;
-       int rc = 0;
+       int rc = SLAP_CB_CONTINUE;
        BackendDB *be = op->o_bd, db = *op->o_bd;
        slap_callback *sc = op->o_callback->sc_private;
+       slap_callback *s0 = op->o_callback;
 
        op->o_bd = &db;
+       op->o_callback = sc;
        for (; on; on=on->on_next ) {
                if ( on->on_response ) {
                        db.bd_info = (BackendInfo *)on;
                        rc = on->on_response( op, rs );
-                       if ( rc ) break;
+                       if ( rc != SLAP_CB_CONTINUE ) break;
                }
        }
-       op->o_callback = sc;
-       if ( rc == 0 && sc ) {
+       if ( sc && (rc == SLAP_CB_CONTINUE) ) {
                rc = sc->sc_response( op, rs );
        }
        op->o_bd = be;
+       op->o_callback = s0;
        return rc;
 }
 
@@ -163,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;
@@ -174,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;
                }
        }
 
-       func = &oi->oi_bi.bi_op_bind;
-       if ( func[which] ) {
+       op->o_bd = be;
+       func = &oi->oi_bd.bd_info->bi_op_bind;
+       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;
 }
 
@@ -282,6 +288,9 @@ overlay_config( BackendDB *be, const char *ov )
                return 1;
        }
 
+       /* If this is the first overlay on this backend, set up the
+        * overlay info structure
+        */
        if ( be->bd_info->bi_type != overtype ) {
                oi = ch_malloc( sizeof(slap_overinfo) );
                oi->oi_bd = *be;
@@ -311,15 +320,27 @@ overlay_config( BackendDB *be, const char *ov )
                be->bd_info = bi;
        }
 
+       /* Walk to the end of the list of overlays, add the new
+        * one onto the end
+        */
        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 {
                prev->on_next = on2;
        }
        *on2 = *on;
+       on2->on_next = NULL;
+       on2->on_info = oi;
+
+       /* Any initialization needed? */
+       if ( on->on_bi.bi_db_init ) {
+               be->bd_info = (BackendInfo *)on2;
+               on2->on_bi.bi_db_init( be );
+               be->bd_info = (BackendInfo *)oi;
+       }
 
        return 0;
 }