upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 07:39:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Howard Chu 2021-07-27 18:02:20 +01:00 committed by Quanah Gibson-Mount
parent bc29154c62
commit d3bd4aa76d
2 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/slapd/abandon.c
View file

@ -102,10 +102,8 @@ do_abandon( Operation *op, SlapReply *rs )
|| o->o_tag == LDAP_REQ_ABANDON ) { || o->o_tag == LDAP_REQ_ABANDON ) {
msg = "cannot be abandoned"; msg = "cannot be abandoned";
#if 0 /* Would break o_abandon used as "suppress response" flag, ITS#6138 */
} else if ( o->o_abandon ) { } else if ( o->o_abandon ) {
msg = "already being abandoned"; msg = "already being abandoned";
#endif
} else { } else {
msg = "found"; msg = "found";

5
servers/slapd/cancel.c
View file

@ -113,13 +113,8 @@ int cancel_extop( Operation *op, SlapReply *rs )
rc = LDAP_OPERATIONS_ERROR; rc = LDAP_OPERATIONS_ERROR;
rs->sr_text = "message ID already being cancelled"; rs->sr_text = "message ID already being cancelled";
#if 0
} else if ( o->o_abandon ) { } else if ( o->o_abandon ) {
/* TODO: Would this break something when
* o_abandon="suppress response"? (ITS#6138)
*/
rc = LDAP_TOO_LATE; rc = LDAP_TOO_LATE;
#endif
} else { } else {
rc = LDAP_SUCCESS; rc = LDAP_SUCCESS;