Import ITS#3160 fix from HEAD

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 447a4e7f61a777970b5a30f88e91941a0f6797a6..b5c384d584a53f602511d886ff5bd4fbc9544045 100644 (file)
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -100,6 +100,7 @@ do_abandon(
        LDAP_STAILQ_FOREACH( o, &conn->c_pending_ops, o_next ) {
                if ( o->o_msgid == id ) {
                        LDAP_STAILQ_REMOVE( &conn->c_pending_ops, o, slap_op, o_next );
+                       conn->c_n_ops_pending--;
                        slap_op_free( o );
                        goto done;
                }

diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index 08557824014ef01936f4d7430a9ada3854dd30cb..bcb8e1c06a1de35834384a5b874818f268e919a1 100644 (file)
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -69,6 +69,7 @@ int cancel_extop(
        LDAP_STAILQ_FOREACH( op, &conn->c_pending_ops, o_next ) {
                if ( op->o_msgid == opid ) {
                        LDAP_STAILQ_REMOVE( &conn->c_pending_ops, op, slap_op, o_next );
+                       conn->c_n_ops_pending--;
                        slap_op_free( op );
                        found = 1;
                        break;