[X2Go-Commits] x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.3-1-g74f823a
X2Go dev team
git-admin at x2go.org
Sat Jun 22 14:58:38 CEST 2013
The branch, release/4.0.1.x has been updated
via 74f823a903ad9d83b9ed9ea49d8125c4dff45d1c (commit)
from 5e95a3c5c1462eb10f226505ebcc26c8197df306 (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 74f823a903ad9d83b9ed9ea49d8125c4dff45d1c
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 df7c8f2..97ab7b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,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 35d5642..a502090 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";
@@ -160,15 +160,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).
More information about the x2go-commits
mailing list