This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from ecd3708 res/i18n/x2goclient_nb_no.ts: fixup translation by respecting the original messages' format, typo fixes and other changes. new 4e2b04e Add cygwin sshd logging 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: src/help.cpp | 3 ++- src/onmainwindow.cpp | 20 ++++++++++++++++++++ src/onmainwindow.h | 3 +++ 3 files changed, 25 insertions(+), 1 deletion(-) -- 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 4e2b04e6630f959647aa850b84e5836f4ddb55c6 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
-
git-admin＠x2go.org