This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 31c9a39d19d36002b2d6cd91e8dcc9371c18ffb3 Author: Mihai Moldovan <ionic@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 8980031..60f1823 100644 --- a/debian/changelog +++ b/debian/changelog @@ -450,6 +450,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 93b4d82..4940b23 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -9977,8 +9977,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 ..."; @@ -9994,7 +9995,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 f09d6c3..f9a9e4b 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -1011,7 +1011,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