[X2Go-Commits] [x2goclient] 01/01: Windows: increase sshd logging to debug1 level

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 0c064b7a69e3b54c52146583c3945dd7b3ebdb2c
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Mon May 30 09:07:46 2016 -0400

    Windows: increase sshd logging to debug1 level
---
 debian/changelog     |    2 +-
 src/onmainwindow.cpp |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7efe994..f318cd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,7 +33,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 
   [ Mike DePaulo ]
   * New upstream release (4.0.5.2):
-    - Windows: add sshd logging when using the --debug flag.
+    - Windows: add sshd debug1 logging when using the --debug flag.
     - Windows: Revert back to Cygwin components that have not been
       "rebased"
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index e004009..0efd908 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10286,12 +10286,19 @@ void ONMainWindow::generateEtcFiles()
 #ifdef Q_OS_WIN
          "Subsystem shell "<< wapiShortFileName ( appDir) +"/sh"+"\n"<<
          "Subsystem sftp "<< wapiShortFileName ( appDir) +"/sftp-server"+"\n"<<
-         "AuthorizedKeysFile \""<<authKeyPath<<"\"";
+         "AuthorizedKeysFile \""<<authKeyPath<<"\"\n";
 #else
          "Subsystem sftp "
     /* This may need some sanitization, i.e., appDir could potentially include whitespace. */
        <<appDir<<"/sftp-server\n";
 #endif
+
+    /* The log file in startSshd() is specific to Windows. */
+#ifdef Q_OS_WIN
+    if (debugging){
+        out<<"LogLevel DEBUG1\n";
+    }
+#endif
     file.close();
     x2goDebug<<etcDir +"/sshd_config created.";
 }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git