ITS#6303

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 3ce9e29bd9820b2b3f5fc1c6c68b7a9bc3dd0361..353edc99820600722153d2dfef30324d94f3fab9 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",