From 57094428a472559d771dff77735fb5413217837f Mon Sep 17 00:00:00 2001 From: Norbert Pocs Date: Mon, 15 May 2023 14:55:09 +0200 Subject: [PATCH] Fix loglevel regression Related: rhbz#2182251, rhbz#2189742 Signed-off-by: Norbert Pocs --- libssh.spec | 6 +++++- null_dereference_rekey.patch | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libssh.spec b/libssh.spec index f0f0f49..28a04e2 100644 --- a/libssh.spec +++ b/libssh.spec @@ -1,6 +1,6 @@ Name: libssh Version: 0.9.6 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A library implementing the SSH protocol License: LGPLv2+ URL: http://www.libssh.org @@ -145,6 +145,10 @@ popd %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/libssh/libssh_server.config %changelog +* Mon May 15 2023 Norbert Pocs - 0.9.6-12 +- Fix loglevel regression +- Related: rhbz#2182251, rhbz#2189742 + * Thu May 04 2023 Norbert Pocs - 0.9.6-11 - .fmf/version is needed to run the tests - Related: rhbz#2182251, rhbz#2189742 diff --git a/null_dereference_rekey.patch b/null_dereference_rekey.patch index f4e984a..505240b 100644 --- a/null_dereference_rekey.patch +++ b/null_dereference_rekey.patch @@ -197,7 +197,7 @@ diff --color -ru ../libssh-0.9.6/src/client.c ./src/client.c + goto error; + } + set_status(session, 0.4f); -+ SSH_LOG(SSH_LOG_PROTOCOL, ++ SSH_LOG(SSH_LOG_DEBUG, + "SSH server banner: %s", session->serverbanner); + + /* Here we analyze the different protocols the server allows. */ @@ -1019,7 +1019,7 @@ diff --color -ru ../libssh-0.9.6/src/kex.c ./src/kex.c - SSH_LOG(SSH_LOG_DEBUG, "Negotiated %s,%s,%s,%s,%s,%s,%s,%s,%s,%s", + crypto->kex_type = kex_type; + -+ SSH_LOG(SSH_LOG_INFO, "Negotiated %s,%s,%s,%s,%s,%s,%s,%s,%s,%s", ++ SSH_LOG(SSH_LOG_DEBUG, "Negotiated %s,%s,%s,%s,%s,%s,%s,%s,%s,%s", session->next_crypto->kex_methods[SSH_KEX], session->next_crypto->kex_methods[SSH_HOSTKEYS], session->next_crypto->kex_methods[SSH_CRYPT_C_S], @@ -1373,7 +1373,7 @@ diff --color -ru ../libssh-0.9.6/src/server.c ./src/server.c + goto error; + } + set_status(session, 0.4f); -+ SSH_LOG(SSH_LOG_PROTOCOL, ++ SSH_LOG(SSH_LOG_DEBUG, + "SSH client banner: %s", session->clientbanner); + + /* Here we analyze the different protocols the server allows. */