[X2Go-Commits] [x2goclient] 249/281: src/onmainwindow.cpp: add and use key_types parameter to startWinServers ().

git-admin at x2go.org git-admin at x2go.org
Thu Jan 19 13:06:12 CET 2017


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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 543bfa7f873971298329238cc57d98489da846f6
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Oct 26 19:18:07 2016 +0200

    src/onmainwindow.cpp: add and use key_types parameter to startWinServers ().
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |    6 ++++--
 src/onmainwindow.h   |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9dd4ac9..79ef160 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -471,6 +471,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       in WinServerStarter::run ().
     - src/onmainwindow.cpp: pass key_type parameter to startSshd () in
       createKeyBundle ().
+    - src/onmainwindow.cpp: add and use key_types parameter to
+      startWinServers ().
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index c0c289f..2d61342 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10010,8 +10010,9 @@ ONMainWindow::key_types WinServerStarter::get_ssh_key_type () {
 }
 
 
-void ONMainWindow::startWinServers()
+void ONMainWindow::startWinServers(ONMainWindow::key_types key_type)
 {
+    key_type = check_key_type (key_type);
 
     x2goDebug<<"Starting helper servers for Windows ...";
 
@@ -10027,7 +10028,8 @@ void ONMainWindow::startWinServers()
     {
 
         dr.mkpath ( etcDir );
-        UNUSED (generateKey (RSA_KEY_TYPE, true));
+        UNUSED (generateKey (key_type, true));
+        sshStarter->set_ssh_key_type (key_type);
         generateEtcFiles();
         sshStarter->start();
     }
diff --git a/src/onmainwindow.h b/src/onmainwindow.h
index c6c785b..14240e5 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -1012,7 +1012,7 @@ protected:
 #else
 private slots:
     void slotSetWinServersReady();
-    void startWinServers();
+    void startWinServers(key_types key_type = RSA_KEY_TYPE);
     void slotCheckXOrgLog();
     void slotCheckXOrgConnection();
     void slotStartParec ();

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


More information about the x2go-commits mailing list