X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbackover.c;h=e1b31a50c1d6f6817afd4502e376361d11c2d112;hb=5c3a4e176e9539f58a1ac666ad370b4c204cd44c;hp=ee3ecafe6eea9daf57cd6d1e0fc2dc807aced0ad;hpb=5b193c218fcc45a909169a18500e49185fb71d52;p=openldap

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index ee3ecafe6e..e1b31a50c1 100644
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -223,6 +223,7 @@ enum op_which {
 	op_extended,
 	op_aux_operational,
 	op_aux_chk_referrals,
+	op_aux_chk_controls,
 	op_last
 };
 
@@ -234,7 +235,7 @@ static int op_rc[] = {
 	LDAP_UNWILLING_TO_PERFORM,	/* bind */
 	LDAP_UNWILLING_TO_PERFORM,	/* unbind */
 	LDAP_UNWILLING_TO_PERFORM,	/* search */
-	LDAP_UNWILLING_TO_PERFORM,	/* compare */
+	SLAP_CB_CONTINUE,		/* compare; pass to frontend */
 	LDAP_UNWILLING_TO_PERFORM,	/* modify */
 	LDAP_UNWILLING_TO_PERFORM,	/* modrdn */
 	LDAP_UNWILLING_TO_PERFORM,	/* add */
@@ -243,7 +244,8 @@ static int op_rc[] = {
 	LDAP_UNWILLING_TO_PERFORM,	/* cancel */
 	LDAP_UNWILLING_TO_PERFORM,	/* extended */
 	LDAP_SUCCESS,			/* aux_operational */
-	LDAP_SUCCESS			/* aux_chk_referrals */
+	LDAP_SUCCESS,			/* aux_chk_referrals */
+	SLAP_CB_CONTINUE		/* aux_chk_controls; pass to frontend */
 };
 
 static int
@@ -294,6 +296,20 @@ over_op_func(
 	if ( rc == SLAP_CB_CONTINUE ) {
 		rc = op_rc[ which ];
 	}
+
+	/* The underlying backend didn't handle the request, make sure
+	 * overlay cleanup is processed.
+	 */
+	if ( rc == LDAP_UNWILLING_TO_PERFORM ) {
+		slap_callback *sc_next;
+		for ( ; op->o_callback && op->o_callback != cb.sc_next; 
+			op->o_callback = sc_next ) {
+			sc_next = op->o_callback->sc_next;
+			if ( op->o_callback->sc_cleanup ) {
+				op->o_callback->sc_cleanup( op, rs );
+			}
+		}
+	}
 	op->o_bd = be;
 	op->o_callback = cb.sc_next;
 	return rc;
@@ -377,6 +393,56 @@ over_aux_chk_referrals( Operation *op, SlapReply *rs )
 	return over_op_func( op, rs, op_aux_chk_referrals );
 }
 
+static int
+over_aux_chk_controls( Operation *op, SlapReply *rs )
+{
+	return over_op_func( op, rs, op_aux_chk_controls );
+}
+
+static int
+over_connection_destroy(
+	BackendDB	*bd,
+	Connection	*conn
+)
+{
+	slap_overinfo *oi;
+	slap_overinst *on;
+	BackendDB db;
+	int rc = SLAP_CB_CONTINUE;
+
+	/* FIXME: used to happen for instance during abandon
+	 * when global overlays are used... */
+	assert( bd != NULL );
+
+	oi = bd->bd_info->bi_private;
+	on = oi->oi_list;
+
+ 	if ( !SLAP_ISOVERLAY( bd )) {
+ 		db = *bd;
+		db.be_flags |= SLAP_DBFLAG_OVERLAY;
+		bd = &db;
+	}
+
+	for (; on; on=on->on_next ) {
+		if ( on->on_bi.bi_connection_destroy ) {
+			bd->bd_info = (BackendInfo *)on;
+			rc = on->on_bi.bi_connection_destroy( bd, conn );
+			if ( rc != SLAP_CB_CONTINUE ) break;
+		}
+	}
+
+	if ( oi->oi_orig->bi_connection_destroy && rc == SLAP_CB_CONTINUE ) {
+		bd->bd_info = oi->oi_orig;
+		rc = oi->oi_orig->bi_connection_destroy( bd, conn );
+	}
+	/* should not fall thru this far without anything happening... */
+	if ( rc == SLAP_CB_CONTINUE ) {
+		rc = LDAP_UNWILLING_TO_PERFORM;
+	}
+
+	return rc;
+}
+
 int
 overlay_register(
 	slap_overinst *on
@@ -467,33 +533,18 @@ overlay_is_inst( BackendDB *be, const char *over_type )
 	return 0;
 }
 
-#if 0
-int
-overlay_is_global( BackendDB *be )
-{
-	BackendInfo	*frontendBI;
-
-	if ( !overlay_is_over( be ) ) {
-		return 0;
-	}
-
-	frontendBI = frontendDB->bd_info;
-	if ( overlay_is_over( frontendDB ) ) {
-		frontendBI = ((slap_overinfo *)frontendBI->bi_private)->oi_orig;
-	}
-
-	return ((slap_overinfo *)be->bd_info->bi_private)->oi_orig == frontendBI;
-}
-#endif
-
 int
 overlay_register_control( BackendDB *be, const char *oid )
 {
 	int		rc = 0;
 	int		gotit = 0;
+	int		cid;
+
+	if ( slap_find_control_id( oid, &cid ) == LDAP_CONTROL_NOT_FOUND ) {
+		return -1;
+	}
 
-#if 0
-	if ( overlay_is_global( be ) ) {
+	if ( SLAP_DBFLAGS( be ) & SLAP_DBFLAG_GLOBAL_OVERLAY ) {
 		int	i;
 		
 		/* add to all backends... */
@@ -504,24 +555,15 @@ overlay_register_control( BackendDB *be, const char *oid )
 				gotit = 1;
 			}
 
-			if ( bd->be_controls == NULL ||
-				!ldap_charray_inlist( bd->be_controls, oid ) )
-			{
-				rc = ldap_charray_add( &be->be_controls, oid );
-				if ( rc ) {
-					break;
-				}
-			}
+			bd->be_ctrls[ cid ] = 1;
+			bd->be_ctrls[ SLAP_MAX_CIDS ] = 1;
 		}
 
 	}
-#endif
 	
-	if ( rc == 0 && !gotit && !ldap_charray_inlist( be->be_controls, oid ) ) {
-		rc = ldap_charray_add( &be->be_controls, oid );
-		if ( rc ) {
-			return rc;
-		}
+	if ( rc == 0 && !gotit ) {
+		be->be_ctrls[ cid ] = 1;
+		be->be_ctrls[ SLAP_MAX_CIDS ] = 1;
 	}
 
 	return rc;
@@ -549,6 +591,13 @@ overlay_config( BackendDB *be, const char *ov )
 		oi->oi_orig = be->bd_info;
 		oi->oi_bi = *be->bd_info;
 
+		/* NOTE: the first time a global overlay is configured,
+		 * frontendDB gets this flag; it is used later by overlays
+		 * to determine if they're stacked on top of the frontendDB */
+		if ( oi->oi_orig == frontendDB->bd_info ) {
+			SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_GLOBAL_OVERLAY;
+		}
+
 		/* Save a pointer to ourself in bi_private.
 		 */
 		oi->oi_bi.bi_private = oi;
@@ -583,6 +632,9 @@ overlay_config( BackendDB *be, const char *ov )
 		 */
 		bi->bi_operational = over_aux_operational;
 		bi->bi_chk_referrals = over_aux_chk_referrals;
+		bi->bi_chk_controls = over_aux_chk_controls;
+		
+		bi->bi_connection_destroy = over_connection_destroy;
 
 		be->bd_info = bi;
 
@@ -607,9 +659,11 @@ overlay_config( BackendDB *be, const char *ov )
 
 	/* Any initialization needed? */
 	if ( on->on_bi.bi_db_init ) {
+		int rc;
 		be->bd_info = (BackendInfo *)on2;
-		on2->on_bi.bi_db_init( be );
+		rc = on2->on_bi.bi_db_init( be );
 		be->bd_info = (BackendInfo *)oi;
+		if ( rc ) return rc;
 	}
 
 	return 0;