This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 707af71d93e3c35855acdfe5665d3a10a5319ca4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 12 05:59:12 2014 +0100 Revert "Move X2Go Desktop Sharing options around. Make sure all desktop sharing relevant options are provided at the beginning when evoking the "x2godesktopsharing client" command." This reverts commit cfb21bede0d00de54cfe89259fcebab79a06563a. --- debian/changelog | 3 --- x2goserver/bin/x2gostartagent | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7077f0d..3940a51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -174,9 +174,6 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium - Fix missing session list output if state file does not exist on the machine that runs x2golistsessions(_root). - Accept more verbose "DENY" output from x2godesktopsharing. - - Move X2Go Desktop Sharing options around. Make sure all desktop sharing - relevant options are provided at the beginning when evoking the - "x2godesktopsharing client" command. - Make sure that all "su"-to-user-contexts use /bin/sh for wrapping around the executed command (in x2gocleansessions and x2golistsessions_root). - Also enforce /bin/sh as shell in su command in x2goprint. diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index b021b31..cf2c373 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -101,8 +101,8 @@ if [ "$X2GO_STYPE" == "S" ]; then if [ "$SHADOW_USER" != "$USER" ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "user ,,$USER'' requests desktop sharing from user ,,$SHADOW_USER'' for desktop ,,$SHADOW_DESKTOP''" - $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $USER $X2GO_CLIENT $X2GO_GEOMETRY $X2GO_LINK $X2GO_PACK $X2GO_TYPE $X2GO_KBD_LAYOUT $X2GO_KBD_TYPE $X2GO_SET_KBD $X2GO_STYPE $X2GO_CMD" - OUTPUT=`x2godesktopsharing client "$USER" "$X2GO_CLIENT" "$X2GO_GEOMETRY" "$X2GO_LINK" "$X2GO_PACK" "$X2GO_TYPE" "$X2GO_KBD_LAYOUT" "$X2GO_KBD_TYPE" "$X2GO_SET_KBD" "$X2GO_STYPE" "$X2GO_CMD"` + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $X2GO_GEOMETRY $X2GO_LINK $X2GO_PACK $X2GO_TYPE $X2GO_KBD_LAYOUT $X2GO_KBD_TYPE $X2GO_SET_KBD $X2GO_STYPE $X2GO_CMD $USER" + OUTPUT=`x2godesktopsharing client "$X2GO_CLIENT" "$X2GO_GEOMETRY" "$X2GO_LINK" "$X2GO_PACK" "$X2GO_TYPE" "$X2GO_KBD_LAYOUT" "$X2GO_KBD_TYPE" "$X2GO_SET_KBD" "$X2GO_STYPE" "$X2GO_CMD" "$USER"` OUTPUT=`echo $OUTPUT | sed -e 's/#012/ /g'` $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command result is: $OUTPUT" if [ "${OUTPUT:0:4}" == "DENY" ]; then -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git