ITS#6270

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 3ce9e29bd9820b2b3f5fc1c6c68b7a9bc3dd0361..33a5ee1c5f844e415a6e9cb125063f20c9e1b13f 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -302,11 +302,11 @@ send_ldap_controls( Operation *o, BerElement *ber, LDAPControl **c )
 
                ber_printf( sber, "{e}", LDAP_UNWILLING_TO_PERFORM );
 
-               if( ber_flatten2( ber, &sorted.ldctl_value, 0 ) == -1 ) {
+               if( ber_flatten2( sber, &sorted.ldctl_value, 0 ) == -1 ) {
                        return -1;
                }
 
-               (void) ber_free_buf( ber );
+               (void) ber_free_buf( sber );
 
                rc = send_ldap_control( ber, &sorted );
                if( rc == -1 ) return rc;
@@ -616,6 +616,7 @@ send_ldap_disconnect( Operation     *op, SlapReply *rs )
        assert( LDAP_UNSOLICITED_ERROR( rs->sr_err ) );
 
        rs->sr_type = REP_EXTENDED;
+       rs->sr_rspdata = NULL;
 
        Debug( LDAP_DEBUG_TRACE,
                "send_ldap_disconnect %d:%s\n",
@@ -926,7 +927,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                        if( e_flags == NULL ) {
                        Debug( LDAP_DEBUG_ANY, 
                                        "send_search_entry: conn %lu slap_sl_calloc failed\n",
-                                       op->o_connid ? op->o_connid : 0, 0, 0 );
+                                       op->o_connid, 0, 0 );
                                ber_free( ber, 1 );
        
                                send_ldap_error( op, rs, LDAP_OTHER, "out of memory" );
@@ -944,7 +945,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                        if ( rc == -1 ) {
                                Debug( LDAP_DEBUG_ANY, "send_search_entry: "
                                        "conn %lu matched values filtering failed\n",
-                                       op->o_connid ? op->o_connid : 0, 0, 0 );
+                                       op->o_connid, 0, 0 );
                                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                send_ldap_error( op, rs, LDAP_OTHER,
                                        "matched values filtering error" );
@@ -1111,7 +1112,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                Debug( LDAP_DEBUG_ANY,
                                        "send_search_entry: conn %lu "
                                        "matched values filtering failed\n", 
-                                       op->o_connid ? op->o_connid : 0, 0, 0);
+                                       op->o_connid, 0, 0);
                                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                send_ldap_error( op, rs, LDAP_OTHER,
                                        "matched values filtering error" );