X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdelete.c;h=078505cd221eaf2affd0cff80b67fd9a364f7e62;hb=93d0ef91e65c6d11991b1c36faba67f212f43a34;hp=722359ae06e9b99979f80249c9ce8475ef45047e;hpb=ffe20229dc2a3c0b69c327d49dbbea172d213e4c;p=openldap diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c index 722359ae06..078505cd22 100644 --- a/servers/slapd/delete.c +++ b/servers/slapd/delete.c @@ -91,8 +91,6 @@ do_delete( rs->sr_err = frontendDB->be_delete( op, rs ); cleanup:; - slap_graduate_commit_csn( op ); - op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx ); op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx ); return rs->sr_err; @@ -174,12 +172,6 @@ fe_op_delete( Operation *op, SlapReply *rs ) op->o_bd = op_be; - if ( !repl_user ) { - struct berval csn = BER_BVNULL; - char csnbuf[LDAP_LUTIL_CSNSTR_BUFSIZE]; - slap_get_csn( op, csnbuf, sizeof(csnbuf), &csn, 1 ); - } - #ifdef SLAPD_MULTIMASTER if ( !op->o_bd->be_update_ndn.bv_len || !repl_user ) #endif @@ -204,7 +196,7 @@ fe_op_delete( Operation *op, SlapReply *rs ) { op->o_delete_glue_parent = 0; if ( !be_issuffix( op->o_bd, &op->o_req_ndn )) { - slap_callback cb = { NULL }; + slap_callback cb = { NULL, NULL, NULL, NULL }; cb.sc_response = slap_null_cb; dnParent( &op->o_req_ndn, &pdn ); op->o_req_dn = pdn;