[X2Go-Commits] [x2goclient] 01/01: Don't use ancient Debianism's for ssh options (ProtocolKeepAlives). (Fixes: #434).

git-admin at x2go.org git-admin at x2go.org
Thu Feb 20 14:09:01 CET 2014


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

x2go pushed a commit to branch master
in repository x2goclient.

commit 55f9b71e5d4d957235f041df86364d9e9f38767f
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Feb 20 14:08:16 2014 +0100

    Don't use ancient Debianism's for ssh options (ProtocolKeepAlives). (Fixes: #434).
---
 debian/changelog |    2 ++
 sshprocess.cpp   |    4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 430b0e9..8fb3bab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ x2goclient (4.0.1.4-0x2go1) UNRELEASED; urgency=low
   [ Orion Poplawski ]
   * New upstream version (4.0.1.4):
     - Fix password connection with libssh 0.6.0
+    - Don't use ancient Debianism's for ssh options (ProtocolKeepAlives).
+      (Fixes: #434).
 
   [ Martti Pitkanen ]
   * New upstream version (4.0.1.4):
diff --git a/sshprocess.cpp b/sshprocess.cpp
index 07c009f..3e47755 100755
--- a/sshprocess.cpp
+++ b/sshprocess.cpp
@@ -31,11 +31,7 @@
 #undef DEBUG
 // #define DEBUG
 
-#ifdef Q_OS_DARWIN
 #define KEEPALIVE_OPTION " -o ServerAliveInterval=60 "
-#else
-#define KEEPALIVE_OPTION " -o ProtocolKeepAlives=60 "
-#endif
 
 SshProcess::SshProcess(SshMasterConnection* master, int pid): QObject(0)
 {

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git



More information about the x2go-commits mailing list