- use internal wrappers so that we can better know which callback we're

  answering

1 files changed, 48 insertions, 8 deletions

diff --git a/src/back-shr.c b/src/back-shr.c
index 803435a..31edfe9 100644
--- a/src/back-shr.c
+++ b/src/back-shr.c
@@ -1555,6 +1555,11 @@ backend_shr_add_cb(Slapi_PBlock *pb)
 	wrap_dec_call_level();
 	return 0;
 }
+static int
+backend_shr_internal_add_cb(Slapi_PBlock *pb)
+{
+	return backend_shr_add_cb(pb);
+}
 
 struct backend_shr_modify_entry_cbdata {
 	struct plugin_state *state;
@@ -1729,6 +1734,11 @@ backend_shr_modify_cb(Slapi_PBlock *pb)
 	free(cbdata.modlist);
 	return 0;
 }
+static int
+backend_shr_internal_modify_cb(Slapi_PBlock *pb)
+{
+	return backend_shr_modify_cb(pb);
+}
 
 struct backend_shr_modrdn_entry_cbdata {
 	struct plugin_state *state;
@@ -1850,6 +1860,11 @@ backend_shr_modrdn_cb(Slapi_PBlock *pb)
 	wrap_dec_call_level();
 	return 0;
 }
+static int
+backend_shr_internal_modrdn_cb(Slapi_PBlock *pb)
+{
+	return backend_shr_modrdn_cb(pb);
+}
 
 /* Delete any map entries which correspond to a directory server entry in this
  * map. */
@@ -1938,6 +1953,11 @@ backend_shr_delete_cb(Slapi_PBlock *pb)
 	wrap_dec_call_level();
 	return 0;
 }
+static int
+backend_shr_internal_delete_cb(Slapi_PBlock *pb)
+{
+	return backend_shr_delete_cb(pb);
+}
 
 /* Set up our post-op callbacks. */
 
@@ -1975,25 +1995,25 @@ int
 backend_shr_internal_postop_init(Slapi_PBlock *pb, struct plugin_state *state)
 {
 	if (slapi_pblock_set(pb, SLAPI_PLUGIN_INTERNAL_POST_ADD_FN,
-			     backend_shr_add_cb) != 0) {
+			     backend_shr_internal_add_cb) != 0) {
 		slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id,
 				"error hooking up internal add callback\n");
 		return -1;
 	}
 	if (slapi_pblock_set(pb, SLAPI_PLUGIN_INTERNAL_POST_MODIFY_FN,
-			     backend_shr_modify_cb) != 0) {
+			     backend_shr_internal_modify_cb) != 0) {
 		slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id,
 				"error hooking up internal modify callback\n");
 		return -1;
 	}
 	if (slapi_pblock_set(pb, SLAPI_PLUGIN_INTERNAL_POST_MODRDN_FN,
-			     backend_shr_modrdn_cb) != 0) {
+			     backend_shr_internal_modrdn_cb) != 0) {
 		slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id,
 				"error hooking up internal modrdn callback\n");
 		return -1;
 	}
 	if (slapi_pblock_set(pb, SLAPI_PLUGIN_INTERNAL_POST_DELETE_FN,
-			     backend_shr_delete_cb) != 0) {
+			     backend_shr_internal_delete_cb) != 0) {
 		slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id,
 				"error hooking up internal delete callback\n");
 		return -1;
@@ -2002,29 +2022,49 @@ backend_shr_internal_postop_init(Slapi_PBlock *pb, struct plugin_state *state)
 }
 
 #ifdef USE_SLAPI_BE_TXNS
+static int
+backend_shr_be_txn_post_add_cb(Slapi_PBlock *pb)
+{
+	return backend_shr_add_cb(pb);
+}
+static int
+backend_shr_be_txn_post_modify_cb(Slapi_PBlock *pb)
+{
+	return backend_shr_modify_cb(pb);
+}
+static int
+backend_shr_be_txn_post_modrdn_cb(Slapi_PBlock *pb)
+{
+	return backend_shr_modrdn_cb(pb);
+}
+static int
+backend_shr_be_txn_post_delete_cb(Slapi_PBlock *pb)
+{
+	return backend_shr_delete_cb(pb);
+}
 int
 backend_shr_be_txn_postop_init(Slapi_PBlock *pb, struct plugin_state *state)
 {
 	if (slapi_pblock_set(pb, SLAPI_PLUGIN_BE_TXN_POST_ADD_FN,
-			     backend_shr_add_cb) != 0) {
+			     backend_shr_be_txn_post_add_cb) != 0) {
 		slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id,
 				"error hooking up be-txn-post add callback\n");
 		return -1;
 	}
 	if (slapi_pblock_set(pb, SLAPI_PLUGIN_BE_TXN_POST_MODIFY_FN,
-			     backend_shr_modify_cb) != 0) {
+			     backend_shr_be_txn_post_modify_cb) != 0) {
 		slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id,
 				"error hooking up be-txn-post modify callback\n");
 		return -1;
 	}
 	if (slapi_pblock_set(pb, SLAPI_PLUGIN_BE_TXN_POST_MODRDN_FN,
-			     backend_shr_modrdn_cb) != 0) {
+			     backend_shr_be_txn_post_modrdn_cb) != 0) {
 		slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id,
 				"error hooking up be-txn-post modrdn callback\n");
 		return -1;
 	}
 	if (slapi_pblock_set(pb, SLAPI_PLUGIN_BE_TXN_POST_DELETE_FN,
-			     backend_shr_delete_cb) != 0) {
+			     backend_shr_be_txn_post_delete_cb) != 0) {
 		slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id,
 				"error hooking up be-txn-post delete callback\n");
 		return -1;