tolerate that config_get_vals() returns success with no values (ITS#4341)

[openldap] / servers / slapd / cancel.c

diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index e1256de909a789cfc43e9371fe3980cb8a6b1bbe..1c209729e9459fec1f7a844fdc98b1d9a494106d 100644 (file)
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,6 @@ int cancel_extop( Operation *op, SlapReply *rs )
        int rc;
        int opid;
        BerElement *ber;
-       int i;
 
        assert( ber_bvcmp( &slap_EXOP_CANCEL, &op->ore_reqoid ) == 0 );
 
@@ -61,6 +60,9 @@ int cancel_extop( Operation *op, SlapReply *rs )
                return LDAP_PROTOCOL_ERROR;
        }
 
+       Statslog( LDAP_DEBUG_STATS, "%s CANCEL msg=%d\n",
+               op->o_log_prefix, opid, 0, 0, 0 );
+
        ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
        LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
                if ( o->o_msgid == opid ) {
@@ -90,8 +92,7 @@ int cancel_extop( Operation *op, SlapReply *rs )
 
                o->o_cancel = SLAP_CANCEL_REQ;
 
-               for ( i = 0; i < nbackends; i++ ) {
-                       op->o_bd = &backends[i];
+               LDAP_STAILQ_FOREACH( op->o_bd, &backendDB, be_next ) {
                        if( !op->o_bd->be_cancel ) continue;
 
                        op->oq_cancel.rs_msgid = opid;