[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-75-ga73fc63
X2Go dev team
git-admin at x2go.org
Wed Dec 4 06:21:17 CET 2013
The branch, build-baikal has been updated
via a73fc6308c8f9985698d3e9e5ddb76256469f81d (commit)
from bdbf47f40a422883e18b49f7fa87c098219fa133 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
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 77f3189..df33435 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
* Re-arranged script files in /bin and /lib directories, this is
still compensated by dh_install and dh_link and needs more work.
* Tab'ified all script files, proper indentation, coding style.
+ * Fix for x2gomountdirs, now also usernames containing blanks can use
+ local folder sharing.
[Martin Oehler]
* Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 7eb0442..f20806c 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -232,8 +232,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";
# check if kde4 plasmoid running
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