This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.5.1-mswin in repository x2goclient. commit 7cb1f0712000dccc0f1741a422f278de43e99ee2 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Mar 29 02:37:41 2016 +0200 debian/changelog: add changelog entry for sshd logging change. --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 995b6dd..1abf5b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +x2goclient (4.0.5.1-2016.05.18) UNRELEASED; urgency=medium + + [ Mike DePaulo ] + * New upstream release (4.0.5.2): + - Windows: add sshd logging when using the --debug flag. + + -- Mike DePaulo <mikedep333@gmail.com> Wed, 18 May 2016 15:09:33 -0400 + x2goclient (4.0.5.1-0x2go1) unstable; urgency=low [ Mihai Moldovan ] -- 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 release/4.0.5.1-mswin in repository x2goclient. commit ebca7a4da374c9eed596a321c3dcbb49b1b22878 Author: Mike DePaulo <mikedep333@gmail.com> Date: Wed May 18 14:00:06 2016 -0400 Cygwin bundle 20160121-1 -> 20160121-2 --- copy-deps-win32.bat | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/copy-deps-win32.bat b/copy-deps-win32.bat index dfdb19e..f4a2f9e 100755 --- a/copy-deps-win32.bat +++ b/copy-deps-win32.bat @@ -2,7 +2,7 @@ if "%~3"=="" ( echo "Usage: copy-deps-win32.bat path-to-x2goclient-contrib path-to-OpenSSL-Win32 destination" goto :a ) -xcopy /E /Y %1\cygwin\20160121-1_bin %3\ || exit /b %errorlevel% +xcopy /E /Y %1\cygwin\20160121-2_bin %3\ || exit /b %errorlevel% del %3\nxproxy.exe.unstripped %3\libXcomp.a %3\libXcomp.dll.a || exit /b %errorlevel% xcopy /E /Y %1\libssh\0.7.0-x2go1-mingw482_bin\bin\libssh.dll %3\ || exit /b %errorlevel% xcopy /E /Y %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libgcc_s_dw2-1.dll %3\ || exit /b %errorlevel% diff --git a/debian/changelog b/debian/changelog index 1abf5b6..e89a77a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ x2goclient (4.0.5.1-2016.05.18) UNRELEASED; urgency=medium [ Mike DePaulo ] * New upstream release (4.0.5.2): - Windows: add sshd logging when using the --debug flag. + - Windows: Revert back to Cygwin components that have not been + "rebased" -- Mike DePaulo <mikedep333@gmail.com> Wed, 18 May 2016 15:09:33 -0400 -- 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 release/4.0.5.1-mswin in repository x2goclient. commit 8648bbe12f12f5e5ef71dacd01ce3b15488c11eb Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Mar 26 11:14:40 2016 -0400 Add cygwin sshd logging --- src/help.cpp | 3 ++- src/onmainwindow.cpp | 20 ++++++++++++++++++++ src/onmainwindow.h | 3 +++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/help.cpp b/src/help.cpp index 20df01e..ce5e071 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -107,7 +107,8 @@ help::params_t help::build_params () { } ADD_OPT ("--help-pack", "Shows available pack methods."); - ADD_OPT ("--debug", "Enables extensive debug output to the console. On Windows also enables PulseAudio logging to a file in the \".x2go/pulse\" in the USERPROFILE directory." NEWLINE + ADD_OPT ("--debug", "Enables extensive debug output to the console." NEWLINE + "On Windows, also enables PulseAudio logging to a file under \".x2go/pulse\" & cygwin sshd logging to a file under \".x2go/sshLogs\" directory, both under the USERPROFILE directory." NEWLINE "The logs are not deleted when X2Go Client terminates."); ADD_OPT ("--no-menu", "Hides menu bar."); ADD_OPT ("--no-session-edit", "Disables session editing."); diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index be4de32..cf9b7fe 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -10299,7 +10299,27 @@ bool ONMainWindow::startSshd() std::string config="\""+cygwinPath(etcDir+"/sshd_config").toStdString()+"\""; std::string key="\""+cygwinPath(etcDir+"/ssh_host_dsa_key").toStdString()+"\""; + // generate a unique sshLog filepath, and create its directory + if (debugging) + { + QDir* sshLogsDir= new QDir( homeDir+"/.x2go/sshLogs" ); + if (!sshLogsDir->exists()) + sshLogsDir->mkpath("."); + + QTemporaryFile* sshLogTemp=new QTemporaryFile ( sshLogsDir->absolutePath()+"/XXXXXX.log" ); + sshLogTemp->open(); + sshLog=sshLogTemp->fileName(); + sshLogTemp->close(); + + delete sshLogsDir; + delete sshLogTemp; + x2goDebug<<"Logging cygwin sshd to: "<<sshLog; + } + strm<<clientdir<<"\\sshd.exe -D -p "<<clientSshPort.toInt()<<" -f "<< config <<" -h "<<key; + if (debugging){ + strm<<" -E "<<sshLog.toStdString(); + } STARTUPINFOA si; std::string desktopName="x2go_"; diff --git a/src/onmainwindow.h b/src/onmainwindow.h index 23d97f3..809fe5f 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -634,6 +634,9 @@ private: QString sshPort; QString clientSshPort; QString defaultSshPort; +#ifdef Q_OS_WIN + QString sshLog; +#endif QVBoxLayout* selectSesDlgLayout; SshMasterConnection* sshConnection; QList<SshMasterConnection*> serverSshConnections; -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git