ITS#3549 acknowledge CANCEL requests

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index fe2f6e0c2f5384b601850964193395f226085577..c2efc492fd8dc75a0f76a1f7872098e3451c280a 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -381,11 +381,15 @@ send_ldap_response(
        {
                if ( rs->sr_rspoid != NULL ) {
                        rc = ber_printf( ber, "ts",
-                               LDAP_TAG_EXOP_RES_OID, rs->sr_rspoid );
+                               rs->sr_type == REP_EXTENDED
+                                       ? LDAP_TAG_EXOP_RES_OID : LDAP_TAG_IM_RES_OID,
+                               rs->sr_rspoid );
                }
                if( rc != -1 && rs->sr_rspdata != NULL ) {
                        rc = ber_printf( ber, "tO",
-                               LDAP_TAG_EXOP_RES_VALUE, rs->sr_rspdata );
+                               rs->sr_type == REP_EXTENDED
+                                       ? LDAP_TAG_EXOP_RES_VALUE : LDAP_TAG_IM_RES_VALUE,
+                               rs->sr_rspdata );
                }
        }
 
@@ -449,7 +453,7 @@ send_ldap_response(
 
        ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex );
        ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 );
-       ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, bytes );
+       ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes );
        ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex );
 
 cleanup:;
@@ -1176,7 +1180,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                rs->sr_nentries++;
 
                ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex );
-               ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, bytes );
+               ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes );
                ldap_pvt_mp_add_ulong( slap_counters.sc_entries, 1 );
                ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 );
                ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex );
@@ -1365,7 +1369,7 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
        ber_free_buf( ber );
 
        ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex );
-       ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, bytes );
+       ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes );
        ldap_pvt_mp_add_ulong( slap_counters.sc_refs, 1 );
        ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 );
        ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex );
@@ -1506,7 +1510,7 @@ int slap_read_controls(
                *ctrl = (LDAPControl *) slap_sl_calloc( 1, sizeof(LDAPControl), NULL );
        } else {
                /* retry: free previous try */
-               slap_sl_free( (*ctrl)->ldctl_value.bv_val, &op->o_tmpmemctx );
+               slap_sl_free( (*ctrl)->ldctl_value.bv_val, op->o_tmpmemctx );
        }
 
        **ctrl = c;