x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.4-1-g1c1bc4d - x2go-commits

22 Jun 2013

The branch, release/4.0.0.x has been updated
       via  1c1bc4d2fb367f6de135d37f1040f11c66ccf5d3 (commit)
      from  bc1f6e55a56ca81c64a1236690a05ae1ec2d6c64 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1c1bc4d2fb367f6de135d37f1040f11c66ccf5d3
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sat Jun 22 14:57:06 2013 +0200

    Make x2goumount-session tolerant towards usernames that contain spaces (Fixes: #202).
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    8 ++++++++
 x2goserver/bin/x2goumount-session |    8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index b2655c9..cd382e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+x2goserver (4.0.0.5-0~x2go1) UNRELEASED; urgency=low
+
+  * New upstream version (4.0.0.5):
+    - Make x2goumount-session tolerant towards usernames that contain spaces
+      (Fixes: #202).
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Thu, 13 Jun 2013 14:56:28 +0200
+
 x2goserver (4.0.0.4-0~x2go1) unstable; urgency=low
 
   [ Jan Engelhardt ]
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 2d10c26..65d841a 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -62,7 +62,7 @@ my $tmp_dir = '/tmp';
 
 my $session=shift;
 my $only_path=shift;
-my $uname=$ENV{'USER'};
+my $uname="$ENV{'USER'}";
 my $serv=hostname;
 
 my $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media";
@@ -154,15 +154,15 @@ for ($i=0;$i<@outp;$i++)
 break:
 	if ($found)
 	{
-		if (system( "cd $tmp_dir && fusermount -u @line[1] && cd - >/dev/null" ) == 0)
+		if (system( "cd $tmp_dir && fusermount -u \"@line[1]\" && cd - >/dev/null" ) == 0)
 		{
-			syslog('notice', "successfully unmounted @line[1]");
+			syslog('notice', "successfully unmounted \"@line[1]\"");
 			$found=0;
 		}
 		else
 		{
 			$ENV{'DISPLAY'}=":$display";
-			syslog('err', "ERROR: failed to unmount @line[1]");
+			syslog('err', "ERROR: failed to unmount \"@line[1]\"");
 			if ($use_zenity == 0)
 			{
 				system("which kdialog &>/dev/null && kdialog --error \"ERROR (X2Go): Failed to unmount @line[1]\"&");


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).

    