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

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 32e6cf4ca8bf924edf0bcc4ec434dd49f4780f14..f5985d5fe9105be52fcb4fd005ba14a5ea11ea87 100644 (file)
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -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";

diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index 672fcd24595e4b05271509ccd2ee9836c68db66e..5dae4398a817ad3695707e2d453bdd48a342af3a 100644 (file)
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -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;