[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99-2-241-g008dc9b

[X2Go dev team]

The branch, build-main has been updated
       via  008dc9bd85ba96ffa5debf05a0ccaa70c91971a3 (commit)
      from  ed73eb94ef82101ea74e1a4772d44b8ffbd231e5 (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             |    1 +
 x2goserver/bin/x2gomountdirs |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index dba9904..5abbf38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
     package. This has to be done by the scripts that use x2godbwrapper.pm.
   * Add info loglevel messages for x2goserver-extensions scripts.
   * Add debug messages to x2gomountdirs script.
+  * Use usermapping for SSHFS mount points.
 
   [ Martin Oehler ]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 7dadf29..01de053 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -243,8 +243,10 @@ 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)
+		$msg = "inserted,\nsshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port";
+		syslog('debug', "$msg");
+		print "$msg\n";
+		if (system("sshfs  $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,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";
 			syslog('notice', "successfully mounted $user\@$host:$port at dirs[$i] to $mntpath");


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).