[X2Go-Commits] [x2goclient] 01/01: Auto accept RSA Keys for SSH Broker with --add-to-known-hosts option.

[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 c5c357027bae649cfad5ed8b20a50407568de8b3
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Wed Mar 2 16:49:39 2016 +0100

    Auto accept RSA Keys for SSH Broker with --add-to-known-hosts option.
---
 debian/changelog         |    1 +
 src/httpbrokerclient.cpp |    2 +-
 src/onmainwindow.h       |    5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dfa18d5..c4fc559 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,6 +76,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
     - Central settings for Linux, Mac and Windows.
     - Fix VCXSRV parameter to disable PRIMARY clipboard in X2Go Client for Windows. Fixes: #927.
     - Fix reading settings for direct RDP connections in broker mode.
+    - Auto accept RSA Keys for SSH Broker with --add-to-known-hosts option.
 
   [ Mike Gabriel ]
   * New upstream release (4.0.5.1):
diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp
index 856c5e6..2a1c43c 100644
--- a/src/httpbrokerclient.cpp
+++ b/src/httpbrokerclient.cpp
@@ -85,7 +85,7 @@ HttpBrokerClient::~HttpBrokerClient()
 void HttpBrokerClient::createSshConnection()
 {
     QUrl lurl ( config->brokerurl );
-    sshConnection=new SshMasterConnection (this, lurl.host(), lurl.port(22),false,
+    sshConnection=new SshMasterConnection (this, lurl.host(), lurl.port(22),mainWindow->getAcceptRSA(),
                                            config->brokerUser, config->brokerPass,config->brokerSshKey,config->brokerAutologin,
                                            config->brokerKrbLogin, false);
 
diff --git a/src/onmainwindow.h b/src/onmainwindow.h
index 3c65197..23d97f3 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -518,6 +518,11 @@ public:
         return miniMode;
     }
 
+    bool getAcceptRSA()
+    {
+        return acceptRsa;
+    }
+
     QScrollArea* getUsersArea()
     {
         return users;

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