fix previous commit (ITS#5819)

[openldap] / servers / slapd / backover.c

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index 6855246ececbfb469804187978d43b2d6096d035..25656375da1502ee80a87632b59604a1568c7a36 100644 (file)
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -138,22 +138,25 @@ over_db_open(
 {
        slap_overinfo *oi = be->bd_info->bi_private;
        slap_overinst *on = oi->oi_list;
-       BackendDB db = *be;
+       BackendInfo *bi_orig = be->bd_info;
        int rc = 0;
 
-       db.be_flags |= SLAP_DBFLAG_OVERLAY;
-       db.bd_info = oi->oi_orig;
-       if ( db.bd_info->bi_db_open ) {
-               rc = db.bd_info->bi_db_open( &db, cr );
+       be->be_flags |= SLAP_DBFLAG_OVERLAY;
+       be->bd_info = oi->oi_orig;
+       if ( be->bd_info->bi_db_open ) {
+               rc = be->bd_info->bi_db_open( be, cr );
        }
 
        for (; on && rc == 0; on=on->on_next) {
-               db.bd_info = &on->on_bi;
-               if ( db.bd_info->bi_db_open ) {
-                       rc = db.bd_info->bi_db_open( &db, cr );
+               be->bd_info = &on->on_bi;
+               if ( be->bd_info->bi_db_open ) {
+                       rc = be->bd_info->bi_db_open( be, cr );
                }
        }
 
+       be->bd_info = bi_orig;
+       be->be_flags ^= SLAP_DBFLAG_OVERLAY;
+
        return rc;
 }
 
@@ -193,7 +196,7 @@ over_db_destroy(
        slap_overinfo *oi = be->bd_info->bi_private;
        slap_overinst *on = oi->oi_list, *next;
        BackendInfo *bi_orig = be->bd_info;
-       int rc;
+       int rc = 0;
 
        be->bd_info = oi->oi_orig;
        if ( be->bd_info->bi_db_destroy ) {
@@ -597,6 +600,27 @@ over_acl_attribute(
        return rc;
 }
 
+int
+overlay_callback_after_backover( Operation *op, slap_callback *sc, int append )
+{
+       slap_callback **scp;
+
+       for ( scp = &op->o_callback; *scp != NULL; scp = &(*scp)->sc_next ) {
+               if ( (*scp)->sc_response == over_back_response ) {
+                       sc->sc_next = (*scp)->sc_next;
+                       (*scp)->sc_next = sc;
+                       return 0;
+               }
+       }
+
+       if ( append ) {
+               *scp = sc;
+               return 0;
+       }
+
+       return 1;
+}
+
 /*
  * default return code in case of missing backend function
  * and overlay stack returning SLAP_CB_CONTINUE
@@ -1042,7 +1066,7 @@ overlay_register_control( BackendDB *be, const char *oid )
                
                /* add to all backends... */
                LDAP_STAILQ_FOREACH( bd, &backendDB, be_next ) {
-                       if ( be == bd ) {
+                       if ( bd == be->bd_self ) {
                                gotit = 1;
                        }
 
@@ -1053,8 +1077,8 @@ overlay_register_control( BackendDB *be, const char *oid )
        }
        
        if ( !gotit ) {
-               be->be_ctrls[ cid ] = 1;
-               be->be_ctrls[ SLAP_MAX_CIDS ] = 1;
+               be->bd_self->be_ctrls[ cid ] = 1;
+               be->bd_self->be_ctrls[ SLAP_MAX_CIDS ] = 1;
        }
 
        return 0;
@@ -1086,14 +1110,15 @@ void
 overlay_remove( BackendDB *be, slap_overinst *on )
 {
        slap_overinfo *oi = on->on_info;
-       slap_overinst **oidx, *on2;
+       slap_overinst **oidx;
+       BackendInfo *bi_orig;
 
        /* remove overlay from oi_list an call db_close and db_destroy
         * handlers */
        for ( oidx = &oi->oi_list; *oidx; oidx = &(*oidx)->on_next ) {
                if ( *oidx == on ) {
                        *oidx = on->on_next;
-                       BackendInfo *bi_orig = be->bd_info;
+                       bi_orig = be->bd_info;
                        be->bd_info = (BackendInfo *)on;
                        if ( on->on_bi.bi_db_close ) {
                                on->on_bi.bi_db_close( be, NULL );