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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 6a5994d8516ded94f237c974f8a8c66229dbf847
Author: Mihai Moldovan <io...@ionic.de>
Date:   Mon Jul 4 05:24:49 2016 +0200

    src/onmainwindow.cpp: short out code parts unconditionally checking for the 
userSshd variable.
    
    We don't need it on Windows (and don't define it on purpose) because
    using an user-mode SSH daemon is implied there (for now.)
---
 debian/changelog     |    4 ++++
 src/onmainwindow.cpp |   19 ++++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 89f80a1..1eb8b9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -334,6 +334,10 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       Windows for some reason.
     - src/pulsemanager.h: use windows_stdint.h header on Windows, cstdint
       otherwise.
+    - src/onmainwindow.cpp: short out code parts unconditionally checking for
+      the userSshd variable. We don't need it on Windows (and don't define it
+      on purpose) because using an user-mode SSH daemon is implied there (for
+      now.)
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 523fdeb..4f6e546 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -8260,8 +8260,13 @@ void ONMainWindow::slotRetExportDir ( bool 
result,QString output,
     /*
      * Do the user SSHD/global SSHD dance here and either use the
      * private .x2go/.ssh or the global .ssh dir.
+     *
+     * Note: Windows is implicitly always using an user-mode SSH server.
      */
-    if (userSshd) {
+#ifndef Q_OS_WIN
+    if (userSshd)
+#endif /* !defined (Q_OS_WIN) */
+    {
       authorized_keys_dir = QDir (authorized_keys_dir.absolutePath () + 
"/.x2go/");
     }
 
@@ -9538,15 +9543,23 @@ void ONMainWindow::startX2goMount()
     /*
      * Do the user SSHD/global SSHD dance here and either use the
      * private .x2go/.ssh or the global .ssh dir.
+     *
+     * Note: Windows is implicitly always using an user-mode SSH server.
      */
-    if (userSshd) {
+#ifndef Q_OS_WIN
+    if (userSshd)
+#endif /* !defined (Q_OS_WIN) */
+    {
       authorized_keys_dir = QDir (authorized_keys_dir.absolutePath () + 
"/.x2go/");
     }
 
     authorized_keys_dir = QDir (authorized_keys_dir.absolutePath () + 
"/.ssh/");
     QFile authorized_keys_file (authorized_keys_dir.absolutePath () + 
"/authorized_keys");
 
-    if (userSshd) {
+#ifndef Q_OS_WIN
+    if (userSshd)
+#endif /* !defined (Q_OS_WIN) */
+    {
       x2goDebug << "Creating dir " << authorized_keys_dir.absolutePath ();
       authorized_keys_dir.mkpath (authorized_keys_dir.absolutePath ());
     }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to