[X2go-Commits] x2goserver.git - backport-lenny (branch) updated: 3.0.99-2-71-gca1cf7f
X2go dev team
git-admin at x2go.org
Wed Jul 13 22:58:23 CEST 2011
The branch, backport-lenny has been updated
via ca1cf7fb4b7a0ce415998dbc768da382283d9556 (commit)
from 44a17ccb00a05cdcb5ea1986f58ad8227e05d39b (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 ca1cf7fb4b7a0ce415998dbc768da382283d9556
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Jul 13 22:58:43 2011 +0200
Fix for x2gomountdirs, now also usernames containing blanks can use local folder sharing.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
x2goserver/bin/x2gomountdirs | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8ace44c..5061f5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
x2goserver (3.0.99.5-0~x2go-bpo1) UNRELEASED; urgency=low
* Debian lenny backport.
+ * Fix for x2gomountdirs, now also usernames containing blanks can use local
+ folder sharing.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Mon, 04 Jul 2011 14:50:35 +0200
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index e84149d..f48fa6f 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -233,8 +233,8 @@ for(my $i=0;$i<@dirs;$i++)
{
$code_conv="-o $code_conv";
}
- print "inserted,\nsshfs $code_conv -o IdentityFile=$key,UserKnownHostsFile=$key.ident $user\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port\n";
- if(system("sshfs $code_conv -o ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident $user\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0)
+ print "inserted,\nsshfs $code_conv -o IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port\n";
+ if(system("sshfs $code_conv -o ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0)
{
print "mount @dirs[$i] ok\n";
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