Commit 78a06256 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

Merge branch its7080 with refs/heads/master into refs/merge-requests/467/train

parents d8331e1b 2bf59ff6
Pipeline #3953 passed with stage
in 43 minutes and 26 seconds
......@@ -6599,6 +6599,7 @@ config_back_delete( Operation *op, SlapReply *rs )
cfb = (CfBackInfo *)op->o_bd->be_private;
/* If we have a backend, it will handle the control */
ce = config_find_base( cfb->cb_root, &op->o_req_ndn, &last );
if ( ce && !cfb->cb_use_ldif && op->o_preread ) {
if ( preread_ctrl == NULL ) {
preread_ctrl = &ctrls[num_ctrls++];
......@@ -6618,7 +6619,6 @@ config_back_delete( Operation *op, SlapReply *rs )
}
}
ce = config_find_base( cfb->cb_root, &op->o_req_ndn, &last );
if ( !ce ) {
if ( last )
rs->sr_matched = last->ce_entry->e_name.bv_val;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment