Commit d3bd4aa7 authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

ITS#6138 don't allow redundant abandon/cancel ops

parent bc29154c
......@@ -102,10 +102,8 @@ do_abandon( Operation *op, SlapReply *rs )
|| o->o_tag == LDAP_REQ_ABANDON ) {
msg = "cannot be abandoned";
#if 0 /* Would break o_abandon used as "suppress response" flag, ITS#6138 */
} else if ( o->o_abandon ) {
msg = "already being abandoned";
#endif
} else {
msg = "found";
......
......@@ -113,13 +113,8 @@ int cancel_extop( Operation *op, SlapReply *rs )
rc = LDAP_OPERATIONS_ERROR;
rs->sr_text = "message ID already being cancelled";
#if 0
} else if ( o->o_abandon ) {
/* TODO: Would this break something when
* o_abandon="suppress response"? (ITS#6138)
*/
rc = LDAP_TOO_LATE;
#endif
} else {
rc = LDAP_SUCCESS;
......
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