[X2Go-Commits] [x2goclient] 04/06: When sharing a client-side folder, do not write the SSH pub key to client-side authorized_keys file if the folder-to-be-shared does not exist on the client. (Partially solves #405).

git-admin at x2go.org git-admin at x2go.org
Thu Jan 8 13:12:26 CET 2015


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

x2go pushed a commit to branch master
in repository x2goclient.

commit 88898003912ecb146c4020132b1913722f99b8fd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jan 8 09:39:17 2015 +0100

    When sharing a client-side folder, do not write the SSH pub key to client-side authorized_keys file if the folder-to-be-shared does not exist on the client. (Partially solves #405).
---
 debian/changelog |    3 +++
 onmainwindow.cpp |    7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 205fe17..c04197f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
     - Enable debugging in sshprocess.cpp and sshmasterconnection.cpp if
       --debug is given.
     - sshmasterconnection.cpp: Fix several grammar issues in error messages.
+    - When sharing a client-side folder, do not write the SSH pub key to
+      client-side authorized_keys file if the folder-to-be-shared does not
+      exist on the client. (Partially solves #405).
 
   [ Jason Alavaliant ]
   * New upstream verson (4.0.3.2):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 1064680..9bde5b2 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -9077,14 +9077,15 @@ void ONMainWindow::startX2goMount()
         return;
 
     }
-    QTextStream out ( &file1 );
-    out<<line;
-    file1.close();
     directory* dir=getExpDir ( fsExportKey );
     bool rem=dir->isRemovable;
     if ( !dir )
         return;
 
+    QTextStream out ( &file1 );
+    out<<line;
+    file1.close();
+
     QString passwd=getCurrentPass();
     QString user=getCurrentUname();
     QString host=resumingSession.server;

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


More information about the x2go-commits mailing list