This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 1a9983e Fix cross-user X2Go Desktop Sharing after being broken by implementing clipboard mode feature (and probably other code changes). new cef8838 improvement for last commit The 1 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: x2goserver/bin/x2gostartagent | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) -- 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 cef8838bd136f7172e96f5a998e43db2dd8270ce Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 17 09:45:01 2014 +0100 improvement for last commit --- x2goserver/bin/x2gostartagent | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 86f08d6..38b0ab7 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -64,6 +64,18 @@ if [ -z "$X2GO_CLIENT" ] && [ -n "$SSH_CLIENT" ]; then elif [ -z "$X2GO_CLIENT" ] && [ -n "$SSH_CONNECTION" ]; then X2GO_CLIENT=`echo $SSH_CONNECTION | awk '{print $1}'` fi + +# shadow sessions (via x2godesktopsharing) set the X2GO_CLIENT var in the process environment +# so either it is already set or we obtain it from SSH_CLIENT/SSH_CONNECTION +if [ -z "$X2GO_CLIENT" ] && [ -n "$SSH_CLIENT" ]; then + X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'` +elif [ -z "$X2GO_CLIENT" ] && [ -n "$SSH_CONNECTION" ]; then + X2GO_CLIENT=`echo $SSH_CONNECTION | awk '{print $1}'` +fi +if [ -z "$X2GO_CLIENT" ]; then + echo "The \$X2GO_CLIENT environment variable is not set (due to neither \$SSH_CLIENT nor \$SSH_CONNECTION variable being set). Aborting session startup." + exit -3 +fi $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "client announced itself as ,,$X2GO_CLIENT''" X2GO_GEOMETRY="$1"; shift @@ -134,13 +146,6 @@ if [ "$X2GO_STYPE" == "S" ]; then exit 0 fi else - - # only check the SSH_CLIENT variable for non-shadow sessions - if [ -z "$SSH_CLIENT" ]; then - echo "The \$SSH_CLIENT environment variable is not set. Aborting session startup." - exit -3 - fi - X2GO_CLIPBOARD="$1"; shift fi -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org