cleanup bind

[openldap] / servers / slapd / cancel.c

diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index 4416869ad26f936ab92d9a959e0489ee475cd012..0fcce20d6991cff670ec92f99b61b7950ec06a98 100644 (file)
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -24,7 +24,7 @@
 int cancel_extop(
        Connection *conn,
        Operation *op,
-       const char *reqoid,
+       struct berval *reqoid,
        struct berval *reqdata,
        char **rspoid,
        struct berval **rspdata,
@@ -40,7 +40,7 @@ int cancel_extop(
        int i;
 
        assert( reqoid != NULL );
-       assert( strcmp( LDAP_EXOP_X_CANCEL, reqoid ) == 0 );
+       assert( ber_bvcmp( &slap_EXOP_CANCEL, reqoid ) == 0 );
 
        if ( reqdata == NULL ) {
                *text = "no message ID supplied";
@@ -91,8 +91,7 @@ int cancel_extop(
 #ifdef LDAP_SYNC
                for ( i = 0; i < nbackends; i++ ) {
                        Backend *be = &backends[i];
-                       if( !be->be_abandon ) continue;
-
+                       if( !be->be_cancel ) continue;
 
                        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );