Berkeley DB 4.2 support (DB 4.2 required by default)

[openldap] / servers / slapd / cancel.c

diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index 2e7ebfea9bb17ba16192acf1fb1726b05a935ac0..0916bcac9802f5fec580c87db00e78fc7c6cccf9 100644 (file)
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -30,14 +30,14 @@ int cancel_extop( Operation *op, SlapReply *rs )
        BerElement *ber;
        int i;
 
-       assert( ber_bvcmp( &slap_EXOP_CANCEL, &op->oq_extended.rs_reqoid ) == 0 );
+       assert( ber_bvcmp( &slap_EXOP_CANCEL, &op->ore_reqoid ) == 0 );
 
-       if ( op->oq_extended.rs_reqdata == NULL ) {
+       if ( op->ore_reqdata == NULL ) {
                rs->sr_text = "no message ID supplied";
                return LDAP_PROTOCOL_ERROR;
        }
 
-       ber = ber_init( op->oq_extended.rs_reqdata );
+       ber = ber_init( op->ore_reqdata );
        if ( ber == NULL ) {
                rs->sr_text = "internal error";
                return LDAP_OTHER;
@@ -78,7 +78,6 @@ int cancel_extop( Operation *op, SlapReply *rs )
        }
 
        if ( !found ) {
-#ifdef LDAP_SYNC
                for ( i = 0; i < nbackends; i++ ) {
                        op->o_bd = &backends[i];
                        if( !op->o_bd->be_cancel ) continue;
@@ -91,7 +90,6 @@ int cancel_extop( Operation *op, SlapReply *rs )
                        }
                        ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
                }
-#endif
                ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
                rs->sr_text = "message ID not found";
                return LDAP_NO_SUCH_OPERATION;