From 0a999f19f80ad4d1ef26dc03e41d1abdb937c0ec Mon Sep 17 00:00:00 2001 From: Thierry Bordaz Date: Thu, 14 Dec 2017 15:09:56 +0100 Subject: [PATCH] merging postop calls --- ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c index 20912ff..9edf357 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c @@ -1188,29 +1188,13 @@ ldbm_back_modrdn(Slapi_PBlock *pb) } slapi_pblock_set(pb, SLAPI_ENTRY_POST_OP, postentry); /* call the transaction post modrdn plugins just before the commit */ - if ((retval = plugin_call_plugins(pb, SLAPI_PLUGIN_BE_TXN_POST_MODRDN_FN))) { + if ((retval = plugin_call_plugins(pb, SLAPI_PLUGIN_BE_TXN_POST_MODRDN_FN)) || + (retval = plugin_call_mmr_plugin_postop(pb, NULL,SLAPI_PLUGIN_BE_TXN_POST_MODRDN_FN))) { slapi_log_err(SLAPI_LOG_TRACE, "ldbm_back_modrdn", "SLAPI_PLUGIN_BE_TXN_POST_MODRDN_FN plugin returned error code %d\n", retval); - if (!ldap_result_code) { - slapi_pblock_get(pb, SLAPI_RESULT_CODE, &ldap_result_code); - } - if (!ldap_result_code) { - slapi_log_err(SLAPI_LOG_ERR, "ldbm_back_modrdn", - "SLAPI_PLUGIN_BE_TXN_POST_MODRDN_FN plugin " - "returned error but did not set SLAPI_RESULT_CODE\n"); - ldap_result_code = LDAP_OPERATIONS_ERROR; - slapi_pblock_set(pb, SLAPI_RESULT_CODE, &ldap_result_code); - } - if (!opreturn) { - slapi_pblock_get(pb, SLAPI_PLUGIN_OPRETURN, &opreturn); - } - if (!opreturn) { - slapi_pblock_set(pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &retval); - } - slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); + ldbm_set_error(pb, retval, &ldap_result_code, &ldap_result_message); goto error_return; } - retval = plugin_call_mmr_plugin_postop(pb, NULL,SLAPI_PLUGIN_BE_TXN_POST_MODRDN_FN); /* Release SERIAL LOCK */ retval = dblayer_txn_commit(be, &txn); -- 2.5.5