This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 8d1fc7ffc7dd6e863be76a978947b93301357bc5
Author: Mihai Moldovan <io...@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 2d79b59..8d92432 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -444,6 +444,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 1cd99cb..496ea20 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10426,7 +10426,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
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
