X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbackover.c;h=21ced8051a2ebf60a195974c20b2a8ad5e54e5c8;hb=89812424f4f844053cc2607e3e5e9382b0825bb8;hp=87025c1305dfe743616942951a7223cff8e6cda9;hpb=4c5de987cd2acd7ae1cd845018760180058ef847;p=openldap

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index 87025c1305..21ced8051a 100644
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -1,16 +1,21 @@
 /* backover.c - backend overlay routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-
-/*
- * Functions to overlay other modules over a backend.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2003-2004 The OpenLDAP Foundation.
+ * All rights reserved.
  *
- *  -- Howard Chu
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
+/* Functions to overlay other modules over a backend. */
+
 #include "portable.h"
 
 #include <stdio.h>
@@ -72,7 +77,7 @@ over_db_config(
 	if ( oi->oi_bd.bd_info->bi_db_config ) {
 		rc = oi->oi_bd.bd_info->bi_db_config( &oi->oi_bd, fname, lineno,
 			argc, argv );
-		if ( rc ) return rc;
+		if ( rc != SLAP_CONF_UNKNOWN ) return rc;
 	}
 
 	bd = *be;
@@ -81,7 +86,7 @@ over_db_config(
 		if (on->on_bi.bi_db_config) {
 			rc = on->on_bi.bi_db_config( &bd, fname, lineno,
 				argc, argv );
-			if ( rc ) break;
+			if ( rc != SLAP_CONF_UNKNOWN ) break;
 		}
 	}
 	return rc;
@@ -129,22 +134,16 @@ over_back_response ( Operation *op, SlapReply *rs )
 	slap_overinst *on = oi->oi_list;
 	int rc = SLAP_CB_CONTINUE;
 	BackendDB *be = op->o_bd, db = *op->o_bd;
-	slap_callback *sc = op->o_callback->sc_private;
 
 	op->o_bd = &db;
 	for (; on; on=on->on_next ) {
 		if ( on->on_response ) {
 			db.bd_info = (BackendInfo *)on;
 			rc = on->on_response( op, rs );
-			if ( ! (rc & SLAP_CB_CONTINUE) ) break;
+			if ( rc != SLAP_CB_CONTINUE ) break;
 		}
 	}
-	op->o_callback = sc;
-	if ( sc && (rc & SLAP_CB_CONTINUE) ) {
-		rc = sc->sc_response( op, rs );
-	}
 	op->o_bd = be;
-	rc &= ~SLAP_CB_CONTINUE;
 	return rc;
 }
 
@@ -163,11 +162,11 @@ over_op_func(
 	slap_overinst *on = oi->oi_list;
 	BI_op_bind **func;
 	BackendDB *be = op->o_bd, db = *op->o_bd;
-	slap_callback cb = {over_back_response, NULL};
-	int rc = 0;
+	slap_callback cb = {NULL, over_back_response, NULL, NULL};
+	int rc = SLAP_CB_CONTINUE;
 
 	op->o_bd = &db;
-	cb.sc_private = op->o_callback;
+	cb.sc_next = op->o_callback;
 	op->o_callback = &cb;
 
 	for (; on; on=on->on_next ) {
@@ -175,16 +174,20 @@ over_op_func(
 		if ( func[which] ) {
 			db.bd_info = (BackendInfo *)on;
 			rc = func[which]( op, rs );
-			if ( rc ) break;
+			if ( rc != SLAP_CB_CONTINUE ) break;
 		}
 	}
 
+	op->o_bd = be;
 	func = &oi->oi_bd.bd_info->bi_op_bind;
-	if ( func[which] ) {
+	if ( func[which] && rc == SLAP_CB_CONTINUE ) {
 		rc = func[which]( op, rs );
 	}
-
-	op->o_bd = be;
+	/* should not fall thru this far without anything happening... */
+	if ( rc == SLAP_CB_CONTINUE ) {
+		rc = LDAP_UNWILLING_TO_PERFORM;
+	}
+	op->o_callback = cb.sc_next;
 	return rc;
 }
 
@@ -315,18 +318,31 @@ overlay_config( BackendDB *be, const char *ov )
 		be->bd_info = bi;
 	}
 
+#if 0
 	/* Walk to the end of the list of overlays, add the new
 	 * one onto the end
 	 */
 	oi = (slap_overinfo *) be->bd_info;
 	for ( prev=NULL, on2 = oi->oi_list; on2; prev=on2, on2=on2->on_next );
-	on2 = ch_malloc( sizeof(slap_overinst) );
+	on2 = ch_calloc( 1, sizeof(slap_overinst) );
 	if ( !prev ) {
 		oi->oi_list = on2;
 	} else {
 		prev->on_next = on2;
 	}
 	*on2 = *on;
+	on2->on_next = NULL;
+	on2->on_info = oi;
+#else
+	/* Insert new overlay on head of list. Overlays are executed
+	 * in reverse of config order...
+	 */
+	on2 = ch_calloc( 1, sizeof(slap_overinst) );
+	*on2 = *on;
+	on2->on_info = oi;
+	on2->on_next = oi->oi_list;
+	oi->oi_list = on2;
+#endif
 
 	/* Any initialization needed? */
 	if ( on->on_bi.bi_db_init ) {