This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 1dafed6 Add to BR: findutils. new 0efd3d8 Accept more verbose "DENY" output from x2godesktopsharing. new b003d37 improve last commit The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + x2goserver/bin/x2gostartagent | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 0efd3d806758827306d1ec68531a29e22e975970 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 1 01:08:17 2014 +0100 Accept more verbose "DENY" output from x2godesktopsharing. --- debian/changelog | 1 + x2goserver/bin/x2gostartagent | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 24b41c8..3530e88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -167,6 +167,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium - Provide pam_namespace support for has_agent_state_file() function. - 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. * debian/control: + Add D (x2goserver): libfile-which-perl. * x2goserver.spec: diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 910eaa6..7067a9d 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -105,9 +105,10 @@ if [ "$X2GO_STYPE" == "S" ]; then 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" == "DENY" ]; then + if [ "${OUTPUT:0:4}" == "DENY" ]; then echo "ACCESS DENIED" 1>&2 $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: user $SHADOW_USER denied desktop sharing session" + $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: reason: for desktop sharing denial ${OUTPUT:4}" exit -1 fi X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'` -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit b003d37f3ac5962ae169d18717e1a0c1c06a3d97 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 1 02:21:15 2014 +0100 improve last commit --- x2goserver/bin/x2gostartagent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 7067a9d..cf2c373 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -108,7 +108,7 @@ if [ "$X2GO_STYPE" == "S" ]; then if [ "${OUTPUT:0:4}" == "DENY" ]; then echo "ACCESS DENIED" 1>&2 $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: user $SHADOW_USER denied desktop sharing session" - $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: reason: for desktop sharing denial ${OUTPUT:4}" + $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: reason: for desktop sharing denial ${OUTPUT:5}" exit -1 fi X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'` -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org