[X2Go-Commits] [x2goclient] 246/280: src/onmainwindow.{cpp, h}: add SSH key type parameter to startSshd ().
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 da7833be0960767d2e1d85f0ec7dd2ea701c42d7
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Oct 26 19:09:42 2016 +0200
src/onmainwindow.{cpp,h}: add SSH key type parameter to startSshd ().
---
debian/changelog | 1 +
src/onmainwindow.cpp | 2 +-
src/onmainwindow.h | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fe96d58..3caa469 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -465,6 +465,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
keep it public, as only class-internal functions are using it.
- src/onmainwindow.{cpp,h}: add ssh_key_type_ member variable and getter
and setter to WinServerStarter class.
+ - src/onmainwindow.{cpp,h}: add SSH key type parameter to startSshd ().
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index f8b8507..2567b33 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10496,7 +10496,7 @@ QString ONMainWindow::createKeyBundle (key_types key_type) {
return (user_key);
}
-bool ONMainWindow::startSshd()
+bool ONMainWindow::startSshd(ONMainWindow::key_types key_type)
{
if ( embedMode && config.confFS && !config.useFs )
{
diff --git a/src/onmainwindow.h b/src/onmainwindow.h
index 2e2da7f..c6c785b 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -1223,7 +1223,7 @@ private:
std::size_t default_size_for_key_type (key_types key_type);
QString generateKey (key_types key_type, bool host_key = false);
QString createKeyBundle (key_types key_type = RSA_KEY_TYPE);
- bool startSshd();
+ bool startSshd (key_types key_type = RSA_KEY_TYPE);
////////////////plugin stuff////////////////////
#ifdef CFGPLUGIN
--
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