Fix ITS#3160, decrement conn->c_n_ops_pending when removing an op from

the conn->c_pending_ops queue.

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 96d29297c88ee45c2bb8ee3dba35a70e404135a0..10dab8d82cb6c279f5dc46bd4874b23ac4ceddca 100644 (file)
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -103,6 +103,7 @@ do_abandon( Operation *op, SlapReply *rs )
        LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
                if ( o->o_msgid == id ) {
                        LDAP_STAILQ_REMOVE( &op->o_conn->c_pending_ops, o, slap_op, o_next );
+                       op->o_conn->c_n_ops_pending--;
                        slap_op_free( o );
                        goto done;
                }

diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index 70f3be3369b7187952c72c9cb752c8e62cf0e00d..005dbba0b27e75f9983610d06a8077257a1705fc 100644 (file)
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -66,6 +66,7 @@ int cancel_extop( Operation *op, SlapReply *rs )
        LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
                if ( o->o_msgid == opid ) {
                        LDAP_STAILQ_REMOVE( &op->o_conn->c_pending_ops, o, slap_op, o_next );
+                       op->o_conn->c_n_ops_pending--;
                        slap_op_free( o );
                        found = 1;
                        break;