This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit f96e8d01a6b4b28de7aa25c9760d24dbf80d234a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 25 12:20:27 2014 +0200 Correctly use diversions from stderr to stdout in shell commands. (Fixes: #520). Conflicts (resolved by Mike Gabriel): x2goserver/bin/x2gomountdirs --- debian/changelog | 2 ++ x2goserver-xsession/etc/Xsession | 4 ++-- x2goserver/bin/x2gomountdirs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7265247..2f9906f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -159,6 +159,8 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low kernel namespace sockets. - Add logcheck rules for X2Go Server. Thanks to Frank Werner for sending them in. + - Correctly use diversions from stderr to stdout in shell commands. + (Fixes: #520). * debian/control, x2goserver.spec: + Update versioned D: x2goagent (>= 3.5.0.25). This assures that X2Go works with poly-instantiated /tmp directories. diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 9d901a4..2b4a14d 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -17,7 +17,7 @@ message () { # is available and $DISPLAY is set MESSAGE="$PROGNAME: $*" echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2 - if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then + if [ -n "$DISPLAY" ] && which xmessage 1> /dev/null 2>&1; then echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file - fi } @@ -27,7 +27,7 @@ message_nonl () { # xmessage if it is available and $DISPLAY is set MESSAGE="$PROGNAME: $*" echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2; - if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then + if [ -n "$DISPLAY" ] && which xmessage 1> /dev/null 2>&1; then echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file - fi } diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index d5bf97a..2a7d0e6 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -279,7 +279,7 @@ for (my $i=0;$i<@dirs;$i++) print "inserted, $msg\n"; # FIXME: this system call should be converted to a multi-argument system call while pertaining the redirect of stderr to the mounts.log file - if (system("sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>&1 1>>$sessiondir/sshfs-mounts.log")==0) + if (system("sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 1>>$sessiondir/sshfs-mounts.log 2>&1")==0) { print "mount @dirs[$i] ok\n"; syslog('notice', "successfully mounted $user\@$host:$port@dirs[$i] to $mntpath"); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git