This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 0982f8ff7f757a8b2ea2a8054082f348db2466c7
Author: Melroy van den Berg <mel...@melroy.org>
Date: Wed May 20 09:26:55 2020 +0200
src/sshmasterconnection: correct retval check.
---
debian/changelog | 1 +
src/sshmasterconnection.cpp | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fe0109d..067358b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium
channel/session closes.
- src/sshmasterconnection: fix 'when not' password auth. Avoids double
error messages.
+ - src/sshmasterconnection: correct retval check.
-- X2Go Release Manager <git-ad...@x2go.org> Thu, 13 Feb 2020 12:31:20 +0100
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 932c7d5..9a4fd6f 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1988,8 +1988,7 @@ void SshMasterConnection::channelLoop()
delete [] read_chan;
delete [] out_chan;
- if ( retval == -1 )
- {
+ if (SSH_OK != retval) {
x2goDebug<<"select() error.";
continue;
}
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
