This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 944dadf src/sshmasterconnection.cpp: add SecurID prompt to challenge auth code prompts. new a518050 Fix SSHFS on Windows client. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 +++ src/onmainwindow.cpp | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit a518050607b432429cd5b6e697a04cd6a54fade9 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Dec 8 16:06:45 2016 +0100 Fix SSHFS on Windows client. --- debian/changelog | 3 +++ src/onmainwindow.cpp | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 101b6bb..fbaaa36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,9 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium - src/{onmainwindow.{cpp,h},help.cpp}: modify autostart option to support multiple autostart apps at the same time. Fixes: #1024. + [ Oleksandr Shneyder ] + * Fix SSHFS on Windows client. + -- X2Go Release Manager <git-admin@x2go.org> Mon, 19 Sep 2016 09:07:07 +0200 x2goclient (4.0.5.2-0x2go1) unstable; urgency=medium diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index be271d2..4cb9c56 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -8074,7 +8074,7 @@ QString ONMainWindow::createRSAKey() #ifdef Q_OS_WIN rsa.setFileName ( wapiShortFileName ( - homeDir+"\\.x2go\\etc\\ssh_host_dsa_key.pub" ) ); + homeDir+"\\.x2go\\etc\\ssh_host_rsa_key.pub" ) ); #else if ( userSshd ) rsa.setFileName ( homeDir+"/.x2go/etc/ssh_host_dsa_key.pub" ); @@ -10330,6 +10330,8 @@ void ONMainWindow::generateEtcFiles() #ifdef Q_OS_WIN QString authKeyPath=cygwinPath ( homeDir+"/.x2go/.ssh/authorized_keys" ); authKeyPath.replace(wapiGetUserName(),"%u"); + varDir=cygwinPath (varDir); + x2goDebug<<varDir<<" cygwin var path"; #endif QTextStream out ( &file ); out<<"StrictModes no\n"<< @@ -10442,7 +10444,7 @@ bool ONMainWindow::startSshd() std::string clientdir=wapiShortFileName ( appDir ).toStdString(); std::stringstream strm; std::string config="\""+cygwinPath(etcDir+"/sshd_config").toStdString()+"\""; - std::string key="\""+cygwinPath(etcDir+"/ssh_host_dsa_key").toStdString()+"\""; + std::string key="\""+cygwinPath(etcDir+"/ssh_host_rsa_key").toStdString()+"\""; // generate a unique sshLog filepath, and create its directory if (debugging) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org