[X2Go-Commits] [x2goclient] 248/267: src/onmainwindow.cpp: pass key_type parameter to startSshd () in createKeyBundle ().

[git-admin at x2go.org]

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

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

commit 6e391ff54b5bdd8af32b6bc1984c89fa949c708d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Oct 26 19:14:20 2016 +0200

    src/onmainwindow.cpp: pass key_type parameter to startSshd () in createKeyBundle ().
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 567730b..e2f8d1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -446,6 +446,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - src/onmainwindow.{cpp,h}: add SSH key type parameter to startSshd ().
     - src/onmainwindow.cpp: pass new ssh_key_type_ member to startSshd () call
       in WinServerStarter::run ().
+    - src/onmainwindow.cpp: pass key_type parameter to startSshd () in
+      createKeyBundle ().
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 5fa7424..93b4d82 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10428,7 +10428,7 @@ QString ONMainWindow::createKeyBundle (key_types key_type) {
 #endif
   }
 
-  if (!(startSshd ())) {
+  if (!(startSshd (key_type))) {
     x2goDebug << "Failed to start OpenSSH Server pro-actively.";
     return (QString::null);
   }

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