[X2Go-Commits] [x2goclient] 03/04: src/sshmasterconnection.cpp: use info (protocol) log level with --libssh-debug and debug (packet) log level with --libssh-packetlog.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 03bedb71a31aeca9a987ced7fc92a4d77be95524
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu May 23 02:37:55 2019 +0200

    src/sshmasterconnection.cpp: use info (protocol) log level with --libssh-debug and debug (packet) log level with --libssh-packetlog.
---
 debian/changelog            |  2 ++
 src/sshmasterconnection.cpp | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dfbbaa8..08e7e1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,6 +69,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
       discovered through the EU-funded bug bounty programme. Not all are
       relevant to X2Go Client.
     - Windows: upgrade bundled VcXsrv to 1.20.1.4.
+    - src/sshmasterconnection.cpp: use info (protocol) log level with
+      --libssh-debug and debug (packet) log level with --libssh-packetlog.
   * debian/control:
     + Add build-depend on pkg-config.
   * x2goclient.spec:
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 6a1bc86..8909a06 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -531,11 +531,19 @@ void SshMasterConnection::run()
     int verbosity = SSH_LOG_NOLOG;
 
     if (ONMainWindow::libssh_debugging) {
-      verbosity = SSH_LOG_DEBUG;
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 6, 0)
+      verbosity = SSH_LOG_INFO;
+#else
+      verbosity = SSH_LOG_PROTOCOL;
+#endif
     }
 
     if (ONMainWindow::libssh_packetlog) {
+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 6, 0)
+      verbosity = SSH_LOG_DEBUG;
+#else
       verbosity = SSH_LOG_PACKET;
+#endif
     }
 
     long timeout = 60;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git