Plug mutex/rwlock leaks (destroy them)

[openldap] / servers / slapd / backover.c

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index 25656375da1502ee80a87632b59604a1568c7a36..cef32866c163c33b724c1a7b3d6ae16635f33e47 100644 (file)
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2008 The OpenLDAP Foundation.
+ * Copyright 2003-2010 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -103,6 +103,8 @@ over_db_config(
        ca.be = be;
        snprintf( ca.log, sizeof( ca.log ), "%s: line %d",
                        ca.fname, ca.lineno );
+       ca.op = SLAP_CONFIG_ADD;
+       ca.valx = -1;
 
        for (; on; on=on->on_next) {
                rc = SLAP_CONF_UNKNOWN;
@@ -138,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;
 }
 
@@ -700,7 +699,7 @@ over_op_func(
        slap_overinfo *oi;
        slap_overinst *on;
        BackendDB *be = op->o_bd, db;
-       slap_callback cb = {NULL, over_back_response, NULL, NULL};
+       slap_callback cb = {NULL, over_back_response, NULL, NULL}, **sc;
        int rc = SLAP_CB_CONTINUE;
 
        /* FIXME: used to happen for instance during abandon
@@ -720,9 +719,14 @@ over_op_func(
        op->o_callback = &cb;
 
        rc = overlay_op_walk( op, rs, which, oi, on );
+       for ( sc = &op->o_callback; *sc; sc = &(*sc)->sc_next ) {
+               if ( *sc == &cb ) {
+                       *sc = cb.sc_next;
+                       break;
+               }
+       }
 
        op->o_bd = be;
-       op->o_callback = cb.sc_next;
        return rc;
 }