Revert 1.91, breaks #5346. (ITS#5724)

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index d69cf12c06b24781ea34923c856395c57f44f88c..1be6cfa3e9000e8034454bd54e9ac0a83a65832b 100644 (file)
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -140,25 +140,22 @@ over_db_open(
 {
        slap_overinfo *oi = be->bd_info->bi_private;
        slap_overinst *on = oi->oi_list;
-       BackendInfo *bi_orig = be->bd_info;
+       BackendDB db = *be;
        int rc = 0;
 
-       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 );
+       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 );
        }
 
        for (; on && rc == 0; on=on->on_next) {
-               be->bd_info = &on->on_bi;
-               if ( be->bd_info->bi_db_open ) {
-                       rc = be->bd_info->bi_db_open( be, cr );
+               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 = bi_orig;
-       be->be_flags ^= SLAP_DBFLAG_OVERLAY;
-
        return rc;
 }