[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-191-gdaca6ae

[X2Go dev team]

The branch, master has been updated
       via  daca6ae5e260aef889cef8bc707ae89819b67c01 (commit)
      from  7d200b91029590cd77d6f011c9f04dddde64ea52 (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 daca6ae5e260aef889cef8bc707ae89819b67c01
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jun 22 14:57:06 2013 +0200

    Make x2goumount-session tolerant towards usernames that contain spaces (Fixes: #202).

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

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 cef9d99..48a874b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,14 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 07 Jun 2013 23:07:40 +0200
 
+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 at 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 9112b5e..da2ddb9 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -38,7 +38,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";
@@ -136,15 +136,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).