aboutsummaryrefslogtreecommitdiffstats
path: root/net/x2goclient/files/patch-src_sshmasterconnection.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'net/x2goclient/files/patch-src_sshmasterconnection.cpp')
-rw-r--r--net/x2goclient/files/patch-src_sshmasterconnection.cpp16
1 files changed, 2 insertions, 14 deletions
diff --git a/net/x2goclient/files/patch-src_sshmasterconnection.cpp b/net/x2goclient/files/patch-src_sshmasterconnection.cpp
index eeb7604f01cf..c744670c39c0 100644
--- a/net/x2goclient/files/patch-src_sshmasterconnection.cpp
+++ b/net/x2goclient/files/patch-src_sshmasterconnection.cpp
@@ -1,6 +1,6 @@
---- src/sshmasterconnection.cpp.orig 2016-03-24 20:39:27 UTC
+--- src/sshmasterconnection.cpp.orig 2018-06-25 20:21:49 UTC
+++ src/sshmasterconnection.cpp
-@@ -28,6 +28,9 @@
+@@ -29,6 +29,9 @@
#include <QDir>
#include <QTemporaryFile>
#ifndef Q_OS_WIN
@@ -10,15 +10,3 @@
#include <arpa/inet.h>
#endif
#include <math.h>
-@@ -277,7 +280,11 @@ void SshMasterConnection::addReverseTunn
- if(!reverseTunnelRequest[i].listen)
- {
- reverseTunnelRequest[i].listen=true;
-+#if LIBSSH_VERSION_MAJOR == 0 && LIBSSH_VERSION_MINOR <= 6
- int rc=ssh_forward_listen(my_ssh_session, NULL, reverseTunnelRequest[i].forwardPort, NULL);
-+#else
-+ int rc=ssh_channel_listen_forward(my_ssh_session, NULL, reverseTunnelRequest[i].forwardPort, NULL);
-+#endif
- if(rc==SSH_OK)
- {
- emit reverseTunnelOk(reverseTunnelRequest[i].creator);