X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapi%2Fslapi_overlay.c;h=79796ffff296644108dfb3bc9912bd2531137492;hb=55339651d6d6e21dc85dca7949cb094e57a1f6b2;hp=80671dccc663fe7bf1bf6220addf96613dff191f;hpb=92df34238ad632a954e05887740a14ea93c147db;p=openldap

diff --git a/servers/slapd/slapi/slapi_overlay.c b/servers/slapd/slapi/slapi_overlay.c
index 80671dccc6..79796ffff2 100644
--- a/servers/slapd/slapi/slapi_overlay.c
+++ b/servers/slapd/slapi/slapi_overlay.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2005 The OpenLDAP Foundation.
+ * Copyright 2001-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,59 +27,60 @@
 
 #include "slap.h"
 #include "slapi.h"
+#include "config.h"
 
 #ifdef LDAP_SLAPI
 
 static slap_overinst slapi;
+static int slapi_over_initialized = 0;
 
 static int slapi_over_response( Operation *op, SlapReply *rs );
 static int slapi_over_cleanup( Operation *op, SlapReply *rs );
 
 static Slapi_PBlock *
-slapi_over_pblock_new ( Operation *op )
+slapi_over_pblock_new( Operation *op, SlapReply *rs )
 {
 	Slapi_PBlock		*pb;
 
 	pb = slapi_pblock_new();
-	if ( pb == NULL ) {
-		return NULL;
-	}
+	pb->pb_op = op;
+	pb->pb_conn = op->o_conn;
+	pb->pb_rs = rs;
+	pb->pb_intop = 0;
 
-	slapi_int_pblock_set_operation( pb, op );
+	PBLOCK_ASSERT_OP( pb, op->o_tag );
 
 	return pb;
 }
 
 static int
-slapi_op_internal_p( Operation *op, slap_callback *cb )
+slapi_op_internal_p( Operation *op, SlapReply *rs, slap_callback *cb )
 {
 	int			internal_op = 0;
 	Slapi_PBlock		*pb = NULL;
 	slap_callback		*pcb;
 
-	/* Abstraction violating check for SLAPI internal operations */
-	/* allows pblock to remain consistent when invoking internal op plugins */
+	/*
+	 * Abstraction violating check for SLAPI internal operations
+	 * allows pblock to remain consistent when invoking internal
+	 * op plugins
+	 */
 	for ( pcb = op->o_callback; pcb != NULL; pcb = pcb->sc_next ) {
 		if ( pcb->sc_response == slapi_int_response ) {
 			pb = (Slapi_PBlock *)pcb->sc_private;
+			PBLOCK_ASSERT_INTOP( pb, 0 );
 			internal_op = 1;
 			break;
 		}
 	}
 
 	if ( cb != NULL ) {
-		if ( !internal_op ) {
-			cb->sc_response = slapi_over_response;
-			cb->sc_cleanup = slapi_over_cleanup;
-		} else {
-			cb->sc_response = NULL;
-			cb->sc_cleanup = NULL;
-		}
-
 		if ( pb == NULL ) {
-			pb = slapi_over_pblock_new( op );
+			pb = slapi_over_pblock_new( op, rs );
 		}
 
+		cb->sc_response = slapi_over_response;
+		cb->sc_cleanup = slapi_over_cleanup;
 		cb->sc_private = pb;
 		cb->sc_next = op->o_callback;
 		op->o_callback = cb;
@@ -97,12 +98,14 @@ slapi_over_compute_output(
 {
 	Attribute		**a;
 	AttributeDescription	*desc;
-	SlapReply		*rs = (SlapReply *)c->cac_private;
+	SlapReply		*rs;
 
 	if ( c == NULL || attribute == NULL || entry == NULL ) {
 		return 0;
 	}
 
+	rs = (SlapReply *)c->cac_private;
+
 	assert( rs->sr_entry == entry );
 
 	desc = attribute->a_desc;
@@ -131,7 +134,7 @@ slapi_over_compute_output(
 	for ( a = &rs->sr_operational_attrs; *a != NULL; a = &(*a)->a_next )
 		;
 
-	*a = attr_dup( attribute );
+	*a = slapi_attr_dup( attribute );
 
 	return 0;
 }
@@ -143,11 +146,11 @@ slapi_over_aux_operational( Operation *op, SlapReply *rs )
 	computed_attr_context    ctx;
 	AttributeName		*anp;
 
-	if ( slapi_op_internal_p( op, NULL ) ) {
+	if ( slapi_op_internal_p( op, rs, NULL ) ) {
 		return SLAP_CB_CONTINUE;
 	}
 
-	ctx.cac_pb = slapi_over_pblock_new( op );
+	ctx.cac_pb = slapi_over_pblock_new( op, rs );
 	ctx.cac_op = op;
 	ctx.cac_private = rs;
 
@@ -177,6 +180,29 @@ slapi_over_aux_operational( Operation *op, SlapReply *rs )
 	return SLAP_CB_CONTINUE;
 }
 
+/*
+ * We need this function to call frontendDB (global) plugins before
+ * database plugins, if we are invoked by a slap_callback.
+ */
+static int
+slapi_over_call_plugins( Slapi_PBlock *pb, int type )
+{
+	int 			rc = 1; /* means no plugins called */
+	Operation		*op;
+
+	PBLOCK_ASSERT_OP( pb, 0 );
+	op = pb->pb_op;
+
+	if ( !be_match( op->o_bd, frontendDB ) ) {
+		rc = slapi_int_call_plugins( frontendDB, type, pb );
+	}
+	if ( rc >= 0 ) {
+		rc = slapi_int_call_plugins( op->o_bd, type, pb );
+	}
+
+	return rc;
+}
+
 static int
 slapi_over_search( Operation *op, SlapReply *rs, int type )
 {
@@ -186,154 +212,39 @@ slapi_over_search( Operation *op, SlapReply *rs, int type )
 	assert( rs->sr_type == REP_SEARCH || rs->sr_type == REP_SEARCHREF );
 
 	/* create a new pblock to not trample on result controls */
-	pb = slapi_over_pblock_new( op );
-
-	slapi_pblock_set( pb, SLAPI_RESCONTROLS,         (void *)rs->sr_ctrls );
-	slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_ENTRY, (void *)rs->sr_entry );
+	pb = slapi_over_pblock_new( op, rs );
 
-	rc = slapi_int_call_plugins( op->o_bd, type, pb );
+	rc = slapi_over_call_plugins( pb, type );
 	if ( rc >= 0 ) /* 1 means no plugins called */
 		rc = SLAP_CB_CONTINUE;
 	else
 		rc = LDAP_SUCCESS; /* confusing: don't abort, but don't send */
 
-	slapi_pblock_set( pb, SLAPI_RESCONTROLS, NULL ); /* don't free */
 	slapi_pblock_destroy(pb);
 
 	return rc;
 }
 
-static int
-slapi_over_count_controls( LDAPControl **controls )
-{
-	int			i;
-
-	if ( controls == NULL )
-		return 0;
-
-	for ( i = 0; controls[i] != NULL; i++ )
-		;
-
-	return i;
-}
-
-static int
-slapi_over_merge_controls( Operation *op, SlapReply *rs )
-{
-	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
-	LDAPControl		**slapiControls = NULL, **mergedControls;
-	int			nSlapiControls = 0;
-	int			nResControls = 0;
-	int			i;
-
-	slapi_pblock_get( pb, SLAPI_RESCONTROLS, (void **)&slapiControls );
-	nSlapiControls = slapi_over_count_controls( slapiControls );
-
-	if ( nSlapiControls == 0 ) {
-		/* short-circuit */
-		return LDAP_SUCCESS;
-	}
-
-	nResControls = slapi_over_count_controls( rs->sr_ctrls );
-
-	/* XXX this is a bit tricky, rs->sr_ctrls may have been allocated on stack */
-	mergedControls = (LDAPControl **)op->o_tmpalloc( ( nResControls + nSlapiControls + 1 ) *
-							 sizeof( LDAPControl *), op->o_tmpmemctx );
-	if ( mergedControls == NULL ) {
-		return LDAP_NO_MEMORY;
-	}
-
-	if ( rs->sr_ctrls != NULL ) {
-		for ( i = 0; i < nResControls; i++ )
-			mergedControls[i] = rs->sr_ctrls[i];
-	}
-	if ( slapiControls != NULL ) {
-		for ( i = 0; i < nSlapiControls; i++ )
-			mergedControls[nResControls + i] = slapiControls[i];
-	}
-	mergedControls[nResControls + nSlapiControls] = NULL;
-
-	if ( slapiControls != NULL ) {
-		slapi_ch_free( (void **)&slapiControls );
-		slapi_pblock_set( pb, SLAPI_RESCONTROLS, NULL ); /* don't free */
-	}
-
-	rs->sr_ctrls = mergedControls;
-
-	return LDAP_SUCCESS;
-}
-
 /*
  * Call pre- and post-result plugins
  */
 static int
 slapi_over_result( Operation *op, SlapReply *rs, int type )
 {
-	int			rc;
 	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
 
-	assert( rs->sr_type == REP_RESULT );
-
-	slapi_pblock_set( pb, SLAPI_RESULT_CODE,    (void *)rs->sr_err );
-	slapi_pblock_set( pb, SLAPI_RESULT_TEXT,    (void *)rs->sr_text );
-	slapi_pblock_set( pb, SLAPI_RESULT_MATCHED, (void *)rs->sr_matched );
+	assert( rs->sr_type == REP_RESULT || rs->sr_type == REP_SASL || rs->sr_type == REP_EXTENDED );
 
-	rc = slapi_int_call_plugins( op->o_bd, type, pb );
-	
-	slapi_pblock_get( pb, SLAPI_RESULT_CODE,    (void **)&rs->sr_err );
-	slapi_pblock_get( pb, SLAPI_RESULT_TEXT,    (void **)&rs->sr_text );
-	slapi_pblock_get( pb, SLAPI_RESULT_MATCHED, (void **)&rs->sr_matched );
-
-	if ( type == SLAPI_PLUGIN_PRE_RESULT_FN ) {
-		rc = slapi_over_merge_controls( op, rs );
-	}
+	slapi_over_call_plugins( pb, type );
 
 	return SLAP_CB_CONTINUE;
 }
 
-static int
-slapi_op_add_init( Operation *op, SlapReply *rs )
-{
-	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
-
-	slapi_pblock_set( pb, SLAPI_ADD_ENTRY, (void *)op->ora_e );
-
-	return LDAP_SUCCESS;
-}
-
-static int
-slapi_op_bind_preop_init( Operation *op, SlapReply *rs )
-{
-	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
-
-	slapi_pblock_set( pb, SLAPI_BIND_TARGET,      (void *)op->o_req_dn.bv_val );
-	slapi_pblock_set( pb, SLAPI_BIND_METHOD,      (void *)op->orb_method );
-	slapi_pblock_set( pb, SLAPI_BIND_CREDENTIALS, (void *)&op->orb_cred );
-	slapi_pblock_set( pb, SLAPI_CONN_DN,          NULL );
-
-	return LDAP_SUCCESS;
-}
-
-static int
-slapi_op_bind_postop_init( Operation *op, SlapReply *rs )
-{
-	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
-
-	if ( rs->sr_err == LDAP_SUCCESS ) {
-		/* fix for ITS#2971 */
-		slapi_pblock_set( pb, SLAPI_CONN_DN, op->o_conn->c_authz.sai_dn.bv_val );
-	}
-
-	return LDAP_SUCCESS;
-}
 
 static int
-slapi_op_bind_callback( Operation *op, SlapReply *rs )
+slapi_op_bind_callback( Operation *op, SlapReply *rs, int prc )
 {
-	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
-	int			rc = rs->sr_err;
-
-	switch ( rc ) {
+	switch ( prc ) {
 	case SLAPI_BIND_SUCCESS:
 		/* Continue with backend processing */
 		break;
@@ -345,37 +256,24 @@ slapi_op_bind_callback( Operation *op, SlapReply *rs )
 		break;
 	case SLAPI_BIND_ANONYMOUS: /* undocumented */
 	default: /* plugin sent result or no plugins called */
-		if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void **)&rs->sr_err ) != 0 ) {
-			rs->sr_err = LDAP_OTHER;
-		}
-
 		BER_BVZERO( &op->orb_edn );
 
 		if ( rs->sr_err == LDAP_SUCCESS ) {
-			slapi_pblock_get( pb, SLAPI_CONN_DN, (void *)&op->orb_edn.bv_val );
-			if ( BER_BVISNULL( &op->orb_edn ) ) {
-				if ( rc == 1 ) {
-					/* No plugins were called; continue processing */
-					return LDAP_SUCCESS;
-				}
-			} else {
-				op->orb_edn.bv_len = strlen( op->orb_edn.bv_val );
+			/*
+			 * Plugin will have called slapi_pblock_set(LDAP_CONN_DN) which
+			 * will have set conn->c_dn and conn->c_ndn
+			 */
+			if ( BER_BVISNULL( &op->o_conn->c_ndn ) && prc == 1 ) {
+				/* No plugins were called; continue processing */
+				return LDAP_SUCCESS;
 			}
-			rs->sr_err = dnPrettyNormal( NULL, &op->orb_edn,
-				&op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx );
-
 			ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
-			ber_dupbv(&op->o_conn->c_dn, &op->o_req_dn);
-			ber_dupbv(&op->o_conn->c_ndn, &op->o_req_ndn);
-			op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
-			BER_BVZERO( &op->o_req_dn );
-			op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
-			BER_BVZERO( &op->o_req_ndn );
-			if ( !BER_BVISEMPTY( &op->o_conn->c_dn ) ) {
+			if ( !BER_BVISEMPTY( &op->o_conn->c_ndn ) ) {
 				ber_len_t max = sockbuf_max_incoming_auth;
 				ber_sockbuf_ctrl( op->o_conn->c_sb,
 					LBER_SB_OPT_SET_MAX_INCOMING, &max );
 			}
+			ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
 
 			/* log authorization identity */
 			Statslog( LDAP_DEBUG_STATS,
@@ -383,169 +281,39 @@ slapi_op_bind_callback( Operation *op, SlapReply *rs )
 				op->o_log_prefix,
 				BER_BVISNULL( &op->o_conn->c_dn )
 					? "<empty>" : op->o_conn->c_dn.bv_val,
-				op->orb_tmp_mech.bv_val, 0, 0 );
+				BER_BVISNULL( &op->orb_mech )
+					? "<empty>" : op->orb_mech.bv_val, 0, 0 );
 
-			ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
 			return -1;
 		}
 		break;
 	}
 
-	return rc;
-}
-
-static int
-slapi_op_compare_init( Operation *op, SlapReply *rs )
-{
-	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
-
-	slapi_pblock_set( pb, SLAPI_COMPARE_TYPE,  (void *)op->orc_ava->aa_desc->ad_cname.bv_val );
-	slapi_pblock_set( pb, SLAPI_COMPARE_VALUE, (void *)&op->orc_ava->aa_value );
-
-	return LDAP_SUCCESS;
-}
-
-static int
-slapi_op_modify_init( Operation *op, SlapReply *rs )
-{
-	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
-	LDAPMod			**modv = NULL;
-
-	modv = slapi_int_modifications2ldapmods( &op->orm_modlist );
-	slapi_pblock_set( pb, SLAPI_MODIFY_MODS, (void *)modv );
-
-	return LDAP_SUCCESS;
-}
-
-static int
-slapi_op_modify_callback( Operation *op, SlapReply *rs )
-{
-	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
-	LDAPMod			**modv = NULL;
-
-	/* check preoperation result code */
-	if ( rs->sr_err < 0 ) {
-		slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void **)&rs->sr_err );
-		return rs->sr_err;
-	}
-
-	/*
-	 * NB: it is valid for the plugin to return no modifications
-	 * (for example, a plugin might store some attributes elsewhere
-	 * and remove them from the modification list; if only those
-	 * attribute types were included in the modification request,
-	 * then slapi_int_ldapmods2modifications() above will return
-	 * NULL).
-	 *
-	 * However, the post-operation plugin should still be
-	 * called.
-	 */
-
-	slapi_pblock_get( pb, SLAPI_MODIFY_MODS, (void **)&modv );
-	op->orm_modlist = slapi_int_ldapmods2modifications( modv );
-
-	return LDAP_SUCCESS;
-}
-
-static int
-slapi_op_modify_cleanup( Operation *op, SlapReply *rs )
-{
-	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
-	LDAPMod			**modv = NULL;
-
-	slapi_pblock_get( pb, SLAPI_MODIFY_MODS, (void **)&modv );
-
-	if ( modv != NULL )
-		slapi_int_free_ldapmods( modv );
-
-	return LDAP_SUCCESS;
-}
-
-static int
-slapi_op_modrdn_init( Operation *op, SlapReply *rs )
-{
-	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
-
-	slapi_pblock_set( pb, SLAPI_MODRDN_NEWRDN,      (void *)op->orr_newrdn.bv_val );
-	slapi_pblock_set( pb, SLAPI_MODRDN_NEWSUPERIOR, (void *)op->orr_newSup->bv_val );
-	slapi_pblock_set( pb, SLAPI_MODRDN_DELOLDRDN,   (void *)op->orr_deleteoldrdn );
-
-	return LDAP_SUCCESS;
-}
-
-static int
-slapi_op_search_init( Operation *op, SlapReply *rs )
-{
-	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
-	char			**attrs;
-
-	attrs = anlist2charray_x( op->ors_attrs, 0, op->o_tmpmemctx );
-
-	slapi_pblock_set( pb, SLAPI_SEARCH_SCOPE,     (void *)op->ors_scope );
-	slapi_pblock_set( pb, SLAPI_SEARCH_DEREF,     (void *)op->ors_deref );
-	slapi_pblock_set( pb, SLAPI_SEARCH_SIZELIMIT, (void *)op->ors_slimit );
-	slapi_pblock_set( pb, SLAPI_SEARCH_TIMELIMIT, (void *)op->ors_tlimit );
-	slapi_pblock_set( pb, SLAPI_SEARCH_FILTER,    (void *)op->ors_filter );
-	slapi_pblock_set( pb, SLAPI_SEARCH_STRFILTER, (void *)op->ors_filterstr.bv_val );
-	slapi_pblock_set( pb, SLAPI_SEARCH_ATTRS,     (void *)attrs );
-	slapi_pblock_set( pb, SLAPI_SEARCH_ATTRSONLY, (void *)op->ors_attrsonly );
-
-	return LDAP_SUCCESS;
+	return rs->sr_err;
 }
 
 static int
-slapi_op_search_callback( Operation *op, SlapReply *rs )
+slapi_op_search_callback( Operation *op, SlapReply *rs, int prc )
 {
 	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
 
 	/* check preoperation result code */
-	if ( rs->sr_err < 0 ) {
-		slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void **)&rs->sr_err );
+	if ( prc < 0 ) {
 		return rs->sr_err;
 	}
 
-	if ( slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_COMPUTE_SEARCH_REWRITER_FN, pb ) != 0 ) {
-		return LDAP_SUCCESS;
-	}
-
-	/*
-	 * The plugin can set the SLAPI_SEARCH_FILTER.
-	 * SLAPI_SEARCH_STRFILER is not normative.
-	 */
-	slapi_pblock_get( pb, SLAPI_SEARCH_FILTER, (void *)&op->ors_filter );
-	op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
-	filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
-
-	slapi_pblock_get( pb, SLAPI_SEARCH_TARGET, (void **)&op->o_req_dn.bv_val );
-	op->o_req_dn.bv_len = strlen( op->o_req_dn.bv_val );
+	rs->sr_err = LDAP_SUCCESS;
 
-	if( !BER_BVISNULL( &op->o_req_ndn ) ) {
-		slap_sl_free( op->o_req_ndn.bv_val, op->o_tmpmemctx );
-	}
-	rs->sr_err = dnNormalize( 0, NULL, NULL, &op->o_req_dn, &op->o_req_ndn,
-				  op->o_tmpmemctx );
-	if ( rs->sr_err != LDAP_SUCCESS ) {
-		send_ldap_result( op, rs );
-		return rs->sr_err;
+	if ( pb->pb_intop == 0 && 
+	     slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_COMPUTE_SEARCH_REWRITER_FN, pb ) == 0 ) {
+		/*
+		 * The plugin can set the SLAPI_SEARCH_FILTER.
+		 * SLAPI_SEARCH_STRFILER is not normative.
+		 */
+		op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
+		filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
 	}
 
-	slapi_pblock_get( pb, SLAPI_SEARCH_SCOPE, (void **)&op->ors_scope );
-	slapi_pblock_get( pb, SLAPI_SEARCH_DEREF, (void **)&op->ors_deref );
-
-	return LDAP_SUCCESS;
-}
-
-static int
-slapi_op_search_cleanup( Operation *op, SlapReply *rs )
-{
-	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
-	char			**attrs = NULL;
-
-	slapi_pblock_get( pb, SLAPI_SEARCH_ATTRS,     (void *)&attrs );
-
-	if ( attrs != NULL )
-		op->o_tmpfree( attrs, op->o_tmpmemctx );
-
 	return LDAP_SUCCESS;
 }
 
@@ -554,49 +322,34 @@ struct slapi_op_info {
 	int soi_postop;			/* postoperation plugin parameter */
 	int soi_internal_preop;		/* internal preoperation plugin parameter */
 	int soi_internal_postop;	/* internal postoperation plugin parameter */
-	slap_response *soi_preop_init;	/* preoperation pblock init function */
-	slap_response *soi_callback; 	/* preoperation result handler */
-	slap_response *soi_postop_init;	/* postoperation pblock init function */
-	slap_response *soi_cleanup;	/* cleanup function (not for internal ops) */
+	int (*soi_callback)(Operation *, SlapReply *, int); /* preoperation result handler */
 } slapi_op_dispatch_table[] = {
 	{
 		SLAPI_PLUGIN_PRE_BIND_FN,
 		SLAPI_PLUGIN_POST_BIND_FN,
-		0,
-		0,
-		slapi_op_bind_preop_init,
-		slapi_op_bind_callback,
-		slapi_op_bind_postop_init,
-		NULL
+		SLAPI_PLUGIN_INTERNAL_PRE_BIND_FN,
+		SLAPI_PLUGIN_INTERNAL_POST_BIND_FN,
+		slapi_op_bind_callback
 	},
 	{
 		SLAPI_PLUGIN_PRE_UNBIND_FN,
 		SLAPI_PLUGIN_POST_UNBIND_FN,
-		0,
-		0,
-		NULL,
-		NULL,
-		NULL,
+		SLAPI_PLUGIN_INTERNAL_PRE_UNBIND_FN,
+		SLAPI_PLUGIN_INTERNAL_POST_UNBIND_FN,
 		NULL
 	},
 	{
 		SLAPI_PLUGIN_PRE_SEARCH_FN,
 		SLAPI_PLUGIN_POST_SEARCH_FN,
-		0,
-		0,
-		slapi_op_search_init,
-		slapi_op_search_callback,
-		NULL,
-		slapi_op_search_cleanup
+		SLAPI_PLUGIN_INTERNAL_PRE_SEARCH_FN,
+		SLAPI_PLUGIN_INTERNAL_POST_SEARCH_FN,
+		slapi_op_search_callback
 	},
 	{
 		SLAPI_PLUGIN_PRE_COMPARE_FN,
 		SLAPI_PLUGIN_POST_COMPARE_FN,
-		0,
-		0,
-		slapi_op_compare_init,
-		NULL,
-		NULL,
+		SLAPI_PLUGIN_INTERNAL_PRE_COMPARE_FN,
+		SLAPI_PLUGIN_INTERNAL_POST_COMPARE_FN,
 		NULL
 	},
 	{
@@ -604,19 +357,13 @@ struct slapi_op_info {
 		SLAPI_PLUGIN_POST_MODIFY_FN,
 		SLAPI_PLUGIN_INTERNAL_PRE_MODIFY_FN,
 		SLAPI_PLUGIN_INTERNAL_POST_MODIFY_FN,
-		slapi_op_modify_init,
-		slapi_op_modify_callback,
-		NULL,
-		slapi_op_modify_cleanup
+		NULL
 	},
 	{
 		SLAPI_PLUGIN_PRE_MODRDN_FN,
 		SLAPI_PLUGIN_POST_MODRDN_FN,
 		SLAPI_PLUGIN_INTERNAL_PRE_MODRDN_FN,
 		SLAPI_PLUGIN_INTERNAL_POST_MODRDN_FN,
-		slapi_op_modrdn_init,
-		NULL,
-		NULL,
 		NULL
 	},
 	{
@@ -624,9 +371,6 @@ struct slapi_op_info {
 		SLAPI_PLUGIN_POST_ADD_FN,
 		SLAPI_PLUGIN_INTERNAL_PRE_ADD_FN,
 		SLAPI_PLUGIN_INTERNAL_POST_ADD_FN,
-		slapi_op_add_init,
-		NULL,
-		NULL,
 		NULL
 	},
 	{
@@ -634,19 +378,13 @@ struct slapi_op_info {
 		SLAPI_PLUGIN_POST_DELETE_FN,
 		SLAPI_PLUGIN_INTERNAL_PRE_DELETE_FN,
 		SLAPI_PLUGIN_INTERNAL_POST_DELETE_FN,
-		NULL,
-		NULL,
-		NULL,
 		NULL
 	},
 	{
 		SLAPI_PLUGIN_PRE_ABANDON_FN,
 		SLAPI_PLUGIN_POST_ABANDON_FN,
-		0,
-		0,
-		NULL,
-		NULL,
-		NULL,
+		SLAPI_PLUGIN_INTERNAL_PRE_ABANDON_FN,
+		SLAPI_PLUGIN_INTERNAL_POST_ABANDON_FN,
 		NULL
 	},
 	{
@@ -654,9 +392,6 @@ struct slapi_op_info {
 		0,
 		0,
 		0,
-		NULL,
-		NULL,
-		NULL,
 		NULL
 	}
 };
@@ -674,7 +409,7 @@ slapi_tag2op( ber_tag_t tag )
 		op = op_add;
 		break;
 	case LDAP_REQ_DELETE:
-		op = op_compare;
+		op = op_delete;
 		break;
 	case LDAP_REQ_MODRDN:
 		op = op_modrdn;
@@ -699,47 +434,119 @@ slapi_tag2op( ber_tag_t tag )
 	return op;
 }
 
+/* Add SLAPI_RESCONTROLS to rs->sr_ctrls, with care, because
+ * rs->sr_ctrls could be allocated on the stack */
 static int
-slapi_over_response( Operation *op, SlapReply *rs )
+slapi_over_merge_controls( Operation *op, SlapReply *rs )
 {
-	int			rc;
+	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
+	LDAPControl		**ctrls = NULL;
+	LDAPControl		**slapi_ctrls = NULL;
+	size_t			n_slapi_ctrls = 0;
+	size_t			n_rs_ctrls = 0;
+	size_t			i;
 
-	switch ( rs->sr_type ) {
-	case REP_RESULT:
-		rc = slapi_over_result( op, rs, SLAPI_PLUGIN_PRE_RESULT_FN );
-		break;
-	case REP_SEARCH:
-		rc = slapi_over_search( op, rs, SLAPI_PLUGIN_PRE_ENTRY_FN );
-		break;
-	case REP_SEARCHREF:
-		rc = slapi_over_search( op, rs, SLAPI_PLUGIN_PRE_REFERRAL_FN );
-		break;
-	default:
-		rc = SLAP_CB_CONTINUE;
-		break;
+	slapi_pblock_get( pb, SLAPI_RESCONTROLS, (void **)&slapi_ctrls );
+
+	n_slapi_ctrls = slapi_int_count_controls( slapi_ctrls );
+	n_rs_ctrls = slapi_int_count_controls( rs->sr_ctrls );
+
+	slapi_pblock_set( pb, SLAPI_X_OLD_RESCONTROLS, (void *)rs->sr_ctrls );
+
+	if ( n_slapi_ctrls == 0 )
+		return LDAP_SUCCESS; /* no SLAPI controls */
+
+	ctrls = (LDAPControl **) op->o_tmpalloc(
+		( n_slapi_ctrls + n_rs_ctrls + 1 ) * sizeof(LDAPControl *),
+		op->o_tmpmemctx );
+
+	for ( i = 0; i < n_slapi_ctrls; i++ ) {
+		ctrls[i] = slapi_ctrls[i];
+	}
+	if ( rs->sr_ctrls != NULL ) {
+		for ( i = 0; i < n_rs_ctrls; i++ ) {
+			ctrls[n_slapi_ctrls + i] = rs->sr_ctrls[i];
+		}
+	}
+	ctrls[n_slapi_ctrls + n_rs_ctrls] = NULL;
+
+	rs->sr_ctrls = ctrls;
+
+	return LDAP_SUCCESS;
+}
+
+static int
+slapi_over_unmerge_controls( Operation *op, SlapReply *rs )
+{
+	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
+	LDAPControl		**rs_ctrls = NULL;
+
+	slapi_pblock_get( pb, SLAPI_X_OLD_RESCONTROLS, (void **)&rs_ctrls );
+
+	if ( rs_ctrls == NULL || rs->sr_ctrls == rs_ctrls ) {
+		/* no copying done */
+		return LDAP_SUCCESS;
+	}
+
+	op->o_tmpfree( rs->sr_ctrls, op->o_tmpmemctx );
+	rs->sr_ctrls = rs_ctrls;
+
+	return LDAP_SUCCESS;
+}
+
+static int
+slapi_over_response( Operation *op, SlapReply *rs )
+{
+	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
+	int			rc = SLAP_CB_CONTINUE;
+
+	if ( pb->pb_intop == 0 ) {
+		switch ( rs->sr_type ) {
+		case REP_RESULT:
+		case REP_SASL:
+		case REP_EXTENDED:
+			rc = slapi_over_result( op, rs, SLAPI_PLUGIN_PRE_RESULT_FN );
+			break;
+		case REP_SEARCH:
+			rc = slapi_over_search( op, rs, SLAPI_PLUGIN_PRE_ENTRY_FN );
+			break;
+		case REP_SEARCHREF:
+			rc = slapi_over_search( op, rs, SLAPI_PLUGIN_PRE_REFERRAL_FN );
+			break;
+		default:
+			break;
+		}
 	}
 
+	slapi_over_merge_controls( op, rs );
+
 	return rc;
 }
 
 static int
 slapi_over_cleanup( Operation *op, SlapReply *rs )
 {
-	int			rc;
+	Slapi_PBlock		*pb = SLAPI_OPERATION_PBLOCK( op );
+	int			rc = SLAP_CB_CONTINUE;
 
-	switch ( rs->sr_type ) {
-	case REP_RESULT:
-		rc = slapi_over_result( op, rs, SLAPI_PLUGIN_POST_RESULT_FN );
-		break;
-	case REP_SEARCH:
-		rc = slapi_over_search( op, rs, SLAPI_PLUGIN_POST_ENTRY_FN );
-		break;
-	case REP_SEARCHREF:
-		rc = slapi_over_search( op, rs, SLAPI_PLUGIN_POST_REFERRAL_FN );
-		break;
-	default:
-		rc = SLAP_CB_CONTINUE;
-		break;
+	slapi_over_unmerge_controls( op, rs );
+
+	if ( pb->pb_intop == 0 ) {
+		switch ( rs->sr_type ) {
+		case REP_RESULT:
+		case REP_SASL:
+		case REP_EXTENDED:
+			rc = slapi_over_result( op, rs, SLAPI_PLUGIN_POST_RESULT_FN );
+			break;
+		case REP_SEARCH:
+			rc = slapi_over_search( op, rs, SLAPI_PLUGIN_POST_ENTRY_FN );
+			break;
+		case REP_SEARCHREF:
+			rc = slapi_over_search( op, rs, SLAPI_PLUGIN_POST_REFERRAL_FN );
+			break;
+		default:
+			break;
+		}
 	}
 
 	return rc;
@@ -757,6 +564,7 @@ slapi_op_func( Operation *op, SlapReply *rs )
 	slap_callback		cb;
 	int			internal_op;
 	int			preop_type, postop_type;
+	BackendDB		*be;
 
 	if ( !slapi_plugins_used )
 		return SLAP_CB_CONTINUE;
@@ -779,7 +587,7 @@ slapi_op_func( Operation *op, SlapReply *rs )
 		return SLAP_CB_CONTINUE;
 	}
 
-	internal_op = slapi_op_internal_p( op, &cb );
+	internal_op = slapi_op_internal_p( op, rs, &cb );
 
 	if ( internal_op ) {
 		preop_type = opinfo->soi_internal_preop;
@@ -791,32 +599,23 @@ slapi_op_func( Operation *op, SlapReply *rs )
 
 	if ( preop_type == 0 ) {
 		/* no SLAPI plugin types for this operation */
-		rs->sr_err = SLAP_CB_CONTINUE;
+		pb = NULL;
+		rc = SLAP_CB_CONTINUE;
 		goto cleanup;
 	}
 
 	pb = SLAPI_OPERATION_PBLOCK( op );
 
-	slapi_pblock_set( pb, SLAPI_TARGET_ADDRESS, NULL );
-	slapi_pblock_set( pb, SLAPI_TARGET_UNIQUEID, NULL );
-	slapi_pblock_set( pb, SLAPI_TARGET_DN, (void *)op->o_req_dn.bv_val );
-
-	/*
-	 * Call preoperation plugins 
-	 */
-	if ( opinfo->soi_preop_init != NULL ) {
-		rs->sr_err = (opinfo->soi_preop_init)( op, rs );
-		if ( rs->sr_err != LDAP_SUCCESS )
-			goto cleanup;
-	}
+	/* cache backend so we call correct postop plugins */
+	be = pb->pb_op->o_bd;
 
-	rs->sr_err = slapi_int_call_plugins( op->o_bd, preop_type, pb );
+	rc = slapi_int_call_plugins( be, preop_type, pb );
 
 	/*
 	 * soi_callback is responsible for examining the result code
 	 * of the preoperation plugin and determining whether to
 	 * abort. This is needed because of special SLAPI behaviour
-	 * with bind preoperation plugins.
+	 e with bind preoperation plugins.
 	 *
 	 * The soi_callback function is also used to reset any values
 	 * returned from the preoperation plugin before calling the
@@ -824,14 +623,12 @@ slapi_op_func( Operation *op, SlapReply *rs )
 	 */
 	if ( opinfo->soi_callback == NULL ) {
 		/* default behaviour is preop plugin can abort operation */
-		if ( rs->sr_err < 0 ) {
-			slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void **)&rs->sr_err );
+		if ( rc < 0 ) {
+			rc = rs->sr_err;
 			goto cleanup;
-		} else {
-			rs->sr_err = LDAP_SUCCESS;
 		}
 	} else {
-		rc = (opinfo->soi_callback)( op, rs );
+		rc = (opinfo->soi_callback)( op, rs, rc );
 		if ( rc )
 			goto cleanup;
 	}
@@ -847,31 +644,22 @@ slapi_op_func( Operation *op, SlapReply *rs )
 	on = (slap_overinst *)op->o_bd->bd_info;
 	oi = on->on_info;
 
-	rs->sr_err = overlay_op_walk( op, rs, which, oi, on->on_next );
+	rc = overlay_op_walk( op, rs, which, oi, on->on_next );
 
 	/*
 	 * Call postoperation plugins
 	 */
-	slapi_pblock_set( pb, SLAPI_RESULT_CODE, (void *)rs->sr_err );
-
-	if ( opinfo->soi_postop_init != NULL ) {
-		(opinfo->soi_postop_init)( op, rs );
-	}
-
-	slapi_int_call_plugins( op->o_bd, postop_type, pb );
+	slapi_int_call_plugins( be, postop_type, pb );
 
 cleanup:
 	if ( !internal_op ) {
-		if ( opinfo->soi_cleanup != NULL ) {
-			(opinfo->soi_cleanup)( op, rs );
-		}
 		slapi_pblock_destroy(pb);
 		cb.sc_private = NULL;
 	}
 
 	op->o_callback = cb.sc_next;
 
-	return rs->sr_err;
+	return rc;
 }
 
 static int
@@ -880,7 +668,6 @@ slapi_over_extended( Operation *op, SlapReply *rs )
 	Slapi_PBlock	*pb;
 	SLAPI_FUNC	callback;
 	int		rc;
-	struct berval	reqdata = BER_BVNULL;
 	int		internal_op;
 	slap_callback	cb;
 
@@ -889,43 +676,39 @@ slapi_over_extended( Operation *op, SlapReply *rs )
 		return SLAP_CB_CONTINUE;
 	}
 
-	internal_op = slapi_op_internal_p( op, &cb );
+	internal_op = slapi_op_internal_p( op, rs, &cb );
 	if ( internal_op ) {
 		return SLAP_CB_CONTINUE;
 	}
 
 	pb = SLAPI_OPERATION_PBLOCK( op );
 
-	if ( op->ore_reqdata != NULL ) {
-		reqdata = *op->ore_reqdata;
-	}
-
-	slapi_pblock_set( pb, SLAPI_EXT_OP_REQ_OID,   (void *)op->ore_reqoid.bv_val);
-	slapi_pblock_set( pb, SLAPI_EXT_OP_REQ_VALUE, (void *)&reqdata);
-
 	rc = (*callback)( pb );
 	if ( rc == SLAPI_PLUGIN_EXTENDED_SENT_RESULT ) {
-		slapi_pblock_destroy( pb );
-		return rc;
+		goto cleanup;
 	} else if ( rc == SLAPI_PLUGIN_EXTENDED_NOT_HANDLED ) {
-		slapi_pblock_destroy( pb );
-		return SLAP_CB_CONTINUE;
+		rc = SLAP_CB_CONTINUE;
+		goto cleanup;
 	}
 
-	slapi_pblock_get( pb, SLAPI_EXT_OP_RET_OID,   (void **)&rs->sr_rspoid );
-	slapi_pblock_get( pb, SLAPI_EXT_OP_RET_VALUE, (void **)&rs->sr_rspdata );
+	assert( rs->sr_rspoid != NULL );
 
-	rs->sr_err = rc;
 	send_ldap_extended( op, rs );
 
+#if 0
 	slapi_ch_free_string( (char **)&rs->sr_rspoid );
+#endif
 
 	if ( rs->sr_rspdata != NULL )
 		ber_bvfree( rs->sr_rspdata );
 
+	rc = rs->sr_err;
+
+cleanup:
 	slapi_pblock_destroy( pb );
+	op->o_callback = cb.sc_next;
 
-	return rs->sr_err;
+	return rc;
 }
 
 static int
@@ -942,8 +725,9 @@ slapi_over_access_allowed(
 	Slapi_PBlock		*pb;
 	slap_callback		cb;
 	int			internal_op;
+	SlapReply		rs = { REP_RESULT };
 
-	internal_op = slapi_op_internal_p( op, &cb );
+	internal_op = slapi_op_internal_p( op, &rs, &cb );
 
 	cb.sc_response = NULL;
 	cb.sc_cleanup = NULL;
@@ -955,10 +739,11 @@ slapi_over_access_allowed(
 		rc = SLAP_CB_CONTINUE;
 	}
 
-	op->o_callback = cb.sc_next;
-
-	if ( !internal_op )
+	if ( !internal_op ) {
 		slapi_pblock_destroy( pb );
+	}
+
+	op->o_callback = cb.sc_next;
 
 	return rc;
 }
@@ -977,8 +762,9 @@ slapi_over_acl_group(
 	Slapi_PBlock		*pb;
 	BackendDB		*be = op->o_bd;
 	GroupAssertion		*g;
+	SlapReply		rs = { REP_RESULT };
 
-	op->o_bd = select_backend( gr_ndn, 0, 0 );
+	op->o_bd = select_backend( gr_ndn, 0 );
 
 	for ( g = op->o_groups; g; g = g->ga_next ) {
 		if ( g->ga_be != op->o_bd || g->ga_oc != group_oc ||
@@ -1005,7 +791,7 @@ slapi_over_acl_group(
 		int			internal_op;
 		slap_callback		cb;
 
-		internal_op = slapi_op_internal_p( op, &cb );
+		internal_op = slapi_op_internal_p( op, &rs, &cb );
 
 		cb.sc_response = NULL;
 		cb.sc_cleanup = NULL;
@@ -1017,11 +803,16 @@ slapi_over_acl_group(
 		slapi_pblock_set( pb, SLAPI_X_GROUP_ATTRIBUTE,    (void *)group_at->ad_cname.bv_val );
 		slapi_pblock_set( pb, SLAPI_X_GROUP_TARGET_ENTRY, (void *)target );
 
-		rc = slapi_int_call_plugins( op->o_bd, SLAPI_X_PLUGIN_PRE_GROUP_FN, pb );
+		rc = slapi_over_call_plugins( pb, SLAPI_X_PLUGIN_PRE_GROUP_FN );
 		if ( rc >= 0 ) /* 1 means no plugins called */
 			rc = SLAP_CB_CONTINUE;
 		else
-			slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void **)&rc );
+			rc = pb->pb_rs->sr_err;
+
+		slapi_pblock_delete_param( pb, SLAPI_X_GROUP_ENTRY );
+		slapi_pblock_delete_param( pb, SLAPI_X_GROUP_OPERATION_DN );
+		slapi_pblock_delete_param( pb, SLAPI_X_GROUP_ATTRIBUTE );
+		slapi_pblock_delete_param( pb, SLAPI_X_GROUP_TARGET_ENTRY );
 
 		if ( !internal_op )
 			slapi_pblock_destroy( pb );
@@ -1029,6 +820,8 @@ slapi_over_acl_group(
 		if ( e != target ) {
 			be_entry_release_r( op, e );
 		}
+
+		op->o_callback = cb.sc_next;
 	} else {
 		rc = LDAP_NO_SUCH_OBJECT; /* return SLAP_CB_CONTINUE for correctness? */
 	}
@@ -1055,8 +848,42 @@ done:
 	return rc;
 }
 
-int
-slapi_int_overlay_init()
+static int
+slapi_over_db_open(
+	BackendDB	*be,
+	ConfigReply	*cr )
+{
+	Slapi_PBlock		*pb;
+	int			rc;
+
+	pb = slapi_pblock_new();
+
+	rc = slapi_int_call_plugins( be, SLAPI_PLUGIN_START_FN, pb );
+
+	slapi_pblock_destroy( pb );
+
+	return rc;
+}
+
+static int
+slapi_over_db_close(
+	BackendDB	*be,
+	ConfigReply	*cr )
+{
+	Slapi_PBlock		*pb;
+	int			rc;
+
+	pb = slapi_pblock_new();
+
+	rc = slapi_int_call_plugins( be, SLAPI_PLUGIN_CLOSE_FN, pb );
+
+	slapi_pblock_destroy( pb );
+
+	return rc;
+}
+
+static int
+slapi_over_init()
 {
 	memset( &slapi, 0, sizeof(slapi) );
 
@@ -1073,6 +900,9 @@ slapi_int_overlay_init()
 	slapi.on_bi.bi_op_abandon	= slapi_op_func;
 	slapi.on_bi.bi_op_cancel	= slapi_op_func;
 
+	slapi.on_bi.bi_db_open		= slapi_over_db_open;
+	slapi.on_bi.bi_db_close		= slapi_over_db_close;
+
 	slapi.on_bi.bi_extended		= slapi_over_extended;
 	slapi.on_bi.bi_access_allowed	= slapi_over_access_allowed;
 	slapi.on_bi.bi_operational	= slapi_over_aux_operational;
@@ -1081,4 +911,36 @@ slapi_int_overlay_init()
 	return overlay_register( &slapi );
 }
 
+int slapi_over_is_inst( BackendDB *be )
+{
+	return overlay_is_inst( be, SLAPI_OVERLAY_NAME );
+}
+
+int slapi_over_config( BackendDB *be, ConfigReply *cr )
+{
+	if ( slapi_over_initialized == 0 ) {
+		int rc;
+
+		/* do global initializaiton */
+		ldap_pvt_thread_mutex_init( &slapi_hn_mutex );
+		ldap_pvt_thread_mutex_init( &slapi_time_mutex );
+		ldap_pvt_thread_mutex_init( &slapi_printmessage_mutex );
+
+		if ( slapi_log_file == NULL )
+			slapi_log_file = slapi_ch_strdup( LDAP_RUNDIR LDAP_DIRSEP "errors" );
+
+		rc = slapi_int_init_object_extensions();
+		if ( rc != 0 )
+			return rc;
+
+		rc = slapi_over_init();
+		if ( rc != 0 )
+			return rc;
+
+		slapi_over_initialized = 1;
+	}
+
+	return overlay_config( be, SLAPI_OVERLAY_NAME, -1, NULL, cr );
+}
+
 #endif /* LDAP_SLAPI */