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

git-admin at x2go.org git-admin at x2go.org
Wed Jan 18 12:26:13 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 7826b3d52bb493d3c1faf15f9cdad775a93b4a97
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 b39d666..9182006 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -468,6 +468,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 bfedac0..ba1adc0 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10462,7 +10462,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


More information about the x2go-commits mailing list