[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-241-g008dc9b

[X2go dev team]

The branch, master has been updated
       via  008dc9bd85ba96ffa5debf05a0ccaa70c91971a3 (commit)
       via  ed73eb94ef82101ea74e1a4772d44b8ffbd231e5 (commit)
      from  68e65827c07f34df6cf0dc5f782e941c237134f0 (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 008dc9bd85ba96ffa5debf05a0ccaa70c91971a3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Sep 10 00:07:14 2011 +0200

    Use usermapping for SSHFS mount points.

commit ed73eb94ef82101ea74e1a4772d44b8ffbd231e5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Sep 9 23:44:57 2011 +0200

    add port in x2gomountdirs log message

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

Summary of changes:
 debian/changelog             |    1 +
 x2goserver/bin/x2gomountdirs |    8 +++++---
 2 files changed, 6 insertions(+), 3 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 d304a71..01de053 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -243,11 +243,13 @@ 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:@dirs[$i] to $mntpath");
+			syslog('notice', "successfully mounted $user\@$host:$port at dirs[$i] to $mntpath");
 			# check if kde4 plasmoid running
 			my $useplasmoid=0;
 			if ( -e $plasmstamp )


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