X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=servers%2Fslapd%2Fbackover.c;h=8d3ed4022e355b6a8854095503518df6321c3808;hb=37d65aed6e108ba43e158121086df6ce0076bd85;hp=53b8cd980b7806348e42e5970a527660fdd2b8a5;hpb=5ae46c195ed5dd2b5117d2301645e8b7a00d9a0a;p=openldap

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index 53b8cd980b..8d3ed4022e 100644
--- 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-2007 The OpenLDAP Foundation.
+ * Copyright 2003-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,7 @@ enum db_which {
 static int
 over_db_func(
 	BackendDB *be,
+	ConfigReply *cr,
 	enum db_which which
 )
 {
@@ -51,14 +52,14 @@ over_db_func(
 	func = &oi->oi_orig->bi_db_open;
 	if ( func[which] ) {
 		be->bd_info = oi->oi_orig;
-		rc = func[which]( be, NULL );
+		rc = func[which]( be, cr );
 	}
 
 	for (; on && rc == 0; on=on->on_next) {
 		be->bd_info = &on->on_bi;
 		func = &on->on_bi.bi_db_open;
 		if (func[which]) {
-			rc = func[which]( be, NULL );
+			rc = func[which]( be, cr );
 		}
 	}
 	be->bd_info = bi_orig;
@@ -169,16 +170,16 @@ over_db_config(
 static int
 over_db_open(
 	BackendDB *be,
-	ConfigArgs *ca
+	ConfigReply *cr
 )
 {
-	return over_db_func( be, db_open );
+	return over_db_func( be, cr, db_open );
 }
 
 static int
 over_db_close(
 	BackendDB *be,
-	ConfigArgs *ca
+	ConfigReply *cr
 )
 {
 	slap_overinfo *oi = be->bd_info->bi_private;
@@ -189,13 +190,13 @@ over_db_close(
 	for (; on && rc == 0; on=on->on_next) {
 		be->bd_info = &on->on_bi;
 		if ( be->bd_info->bi_db_close ) {
-			rc = be->bd_info->bi_db_close( be, NULL );
+			rc = be->bd_info->bi_db_close( be, cr );
 		}
 	}
 
 	if ( oi->oi_orig->bi_db_close ) {
 		be->bd_info = oi->oi_orig;
-		rc = be->bd_info->bi_db_close( be, NULL );
+		rc = be->bd_info->bi_db_close( be, cr );
 	}
 
 	be->bd_info = bi_orig;
@@ -205,14 +206,14 @@ over_db_close(
 static int
 over_db_destroy(
 	BackendDB *be,
-	ConfigArgs *ca
+	ConfigReply *cr
 )
 {
 	slap_overinfo *oi = be->bd_info->bi_private;
 	slap_overinst *on = oi->oi_list, *next;
 	int rc;
 
-	rc = over_db_func( be, db_destroy );
+	rc = over_db_func( be, cr, db_destroy );
 
 	if ( on ) {
 		for (next = on->on_next; on; on=next) {
@@ -1248,10 +1249,10 @@ overlay_config( BackendDB *be, const char *ov, int idx, BackendInfo **res )
 
 	} else {
 		if ( overlay_is_inst( be, ov ) ) {
-			Debug( LDAP_DEBUG_ANY, "overlay_config(): "
-				"overlay \"%s\" already in list\n",
-				ov, 0, 0 );
 			if ( SLAPO_SINGLE( be ) ) {
+				Debug( LDAP_DEBUG_ANY, "overlay_config(): "
+					"overlay \"%s\" already in list\n",
+					ov, 0, 0 );
 				return 1;
 			}
 		}