ITS#3607 add automatic BDB recovery

[openldap] / servers / slapd / backover.c

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index 0ab6beb4ca7691bd754494eaefb04c0ce55ba74d..f4b82dc0be0a2a85631af89810ea3a15aa6b460c 100644 (file)
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -223,6 +223,7 @@ enum op_which {
        op_extended,
        op_aux_operational,
        op_aux_chk_referrals,
+       op_aux_chk_controls,
        op_last
 };
 
@@ -234,7 +235,7 @@ static int op_rc[] = {
        LDAP_UNWILLING_TO_PERFORM,      /* bind */
        LDAP_UNWILLING_TO_PERFORM,      /* unbind */
        LDAP_UNWILLING_TO_PERFORM,      /* search */
-       LDAP_UNWILLING_TO_PERFORM,      /* compare */
+       SLAP_CB_CONTINUE,               /* compare; pass to frontend */
        LDAP_UNWILLING_TO_PERFORM,      /* modify */
        LDAP_UNWILLING_TO_PERFORM,      /* modrdn */
        LDAP_UNWILLING_TO_PERFORM,      /* add */
@@ -243,7 +244,8 @@ static int op_rc[] = {
        LDAP_UNWILLING_TO_PERFORM,      /* cancel */
        LDAP_UNWILLING_TO_PERFORM,      /* extended */
        LDAP_SUCCESS,                   /* aux_operational */
-       LDAP_SUCCESS                    /* aux_chk_referrals */
+       LDAP_SUCCESS,                   /* aux_chk_referrals */
+       SLAP_CB_CONTINUE                /* aux_chk_controls; pass to frontend */
 };
 
 static int
@@ -294,6 +296,20 @@ over_op_func(
        if ( rc == SLAP_CB_CONTINUE ) {
                rc = op_rc[ which ];
        }
+
+       /* The underlying backend didn't handle the request, make sure
+        * overlay cleanup is processed.
+        */
+       if ( rc == LDAP_UNWILLING_TO_PERFORM ) {
+               slap_callback *sc_next;
+               for ( ; op->o_callback && op->o_callback != cb.sc_next; 
+                       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 );
+                       }
+               }
+       }
        op->o_bd = be;
        op->o_callback = cb.sc_next;
        return rc;
@@ -377,6 +393,56 @@ over_aux_chk_referrals( Operation *op, SlapReply *rs )
        return over_op_func( op, rs, op_aux_chk_referrals );
 }
 
+static int
+over_aux_chk_controls( Operation *op, SlapReply *rs )
+{
+       return over_op_func( op, rs, op_aux_chk_controls );
+}
+
+static int
+over_connection_destroy(
+       BackendDB       *bd,
+       Connection      *conn
+)
+{
+       slap_overinfo *oi;
+       slap_overinst *on;
+       BackendDB db;
+       int rc = SLAP_CB_CONTINUE;
+
+       /* FIXME: used to happen for instance during abandon
+        * when global overlays are used... */
+       assert( bd != NULL );
+
+       oi = bd->bd_info->bi_private;
+       on = oi->oi_list;
+
+       if ( !SLAP_ISOVERLAY( bd )) {
+               db = *bd;
+               db.be_flags |= SLAP_DBFLAG_OVERLAY;
+               bd = &db;
+       }
+
+       for (; on; on=on->on_next ) {
+               if ( on->on_bi.bi_connection_destroy ) {
+                       bd->bd_info = (BackendInfo *)on;
+                       rc = on->on_bi.bi_connection_destroy( bd, conn );
+                       if ( rc != SLAP_CB_CONTINUE ) break;
+               }
+       }
+
+       if ( oi->oi_orig->bi_connection_destroy && rc == SLAP_CB_CONTINUE ) {
+               bd->bd_info = oi->oi_orig;
+               rc = oi->oi_orig->bi_connection_destroy( bd, conn );
+       }
+       /* should not fall thru this far without anything happening... */
+       if ( rc == SLAP_CB_CONTINUE ) {
+               rc = LDAP_UNWILLING_TO_PERFORM;
+       }
+
+       return rc;
+}
+
 int
 overlay_register(
        slap_overinst *on
@@ -479,23 +545,23 @@ overlay_register_control( BackendDB *be, const char *oid )
        }
 
        if ( SLAP_DBFLAGS( be ) & SLAP_DBFLAG_GLOBAL_OVERLAY ) {
-               int     i;
+               BackendDB *bd;
                
                /* add to all backends... */
-               for ( i = 0; i < nBackendDB; i++ ) {
-                       BackendDB       *bd = &backendDB[i];
-                       
+               LDAP_STAILQ_FOREACH( bd, &backendDB, be_next ) {
                        if ( be == bd ) {
                                gotit = 1;
                        }
 
                        bd->be_ctrls[ cid ] = 1;
+                       bd->be_ctrls[ SLAP_MAX_CIDS ] = 1;
                }
 
        }
        
        if ( rc == 0 && !gotit ) {
                be->be_ctrls[ cid ] = 1;
+               be->be_ctrls[ SLAP_MAX_CIDS ] = 1;
        }
 
        return rc;
@@ -564,6 +630,9 @@ overlay_config( BackendDB *be, const char *ov )
                 */
                bi->bi_operational = over_aux_operational;
                bi->bi_chk_referrals = over_aux_chk_referrals;
+               bi->bi_chk_controls = over_aux_chk_controls;
+               
+               bi->bi_connection_destroy = over_connection_destroy;
 
                be->bd_info = bi;
 
@@ -588,9 +657,11 @@ overlay_config( BackendDB *be, const char *ov )
 
        /* Any initialization needed? */
        if ( on->on_bi.bi_db_init ) {
+               int rc;
                be->bd_info = (BackendInfo *)on2;
-               on2->on_bi.bi_db_init( be );
+               rc = on2->on_bi.bi_db_init( be );
                be->bd_info = (BackendInfo *)oi;
+               if ( rc ) return rc;
        }
 
        return 0;