[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-302-gf0c85ab
X2Go dev team
git-admin at x2go.org
Fri Jan 3 18:04:25 CET 2014
The branch, build-baikal has been updated
via f0c85abd21ffd6354044fee40a4ecc6e0a3fdec9 (commit)
from 79768a516c661c7c8c4607bd4fda1290b19ddd28 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2goserver/bin/x2gostartagent | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ab03327..8890f61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
* Move x2goversion into x2goserver core package.
* Makefile update for including x2gofeature scripts into installation, minor fixes
to x2goserver core package Makefile.
+ * Add debug output around shadow session startup (in x2gostartagent).
[ Ivan Kabaivanov ]
* Makefile fix around man page installation in x2goserver-compat package.
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 699688b..765268a 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -47,23 +47,29 @@ if [ "$X2GO_STYPE" == "S" ]; then
SHADOW_MODE=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[1]}'`
SHADOW_USER=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[2]}'`
SHADOW_DESKTOP=`echo "$X2GO_CMD"|awk '{split($0,a,"XSHAD"); print a[3]}'`
+ $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "shadow session requested: mode $SHADOW_MODE, user: $SHADOW_USER, desktop: $SHADOW_DESKTOP"
echo "suser $SHADOW_USER user $USER " >> /tmp/uagent
if [ "$SHADOW_USER" != "$USER" ]; then
+ $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "user $USER requests desktop sharing from user $SHADOW_USER on display $SHADOW_DISPLAY"
+ $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $@"
OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $@`
+ $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command result is: $OUTPUT"
if [ "$OUTPUT" == "DENY" ]; then
echo "ACCESS DENIED" 1>&2
+ $X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: user $SHADOW_USER denied desktop sharing session"
exit -1
fi
X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'`
X2GO_PORT=`echo $OUTPUT | awk '{print $1}'`
+ $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "received shadow session information: cookie: $X2GO_COOKIE, port: $X2GO_PORT"
xauth add ${HOSTNAME}/unix:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE}
xauth add ${HOSTNAME}:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE}
echo $X2GO_PORT
- echo $X2GO_COOKIE
+ echo $X2GO_COOKIE
echo $OUTPUT | awk '{print $3}'
echo $OUTPUT | awk '{print $4}'
echo $OUTPUT | awk '{print $5}'
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).
More information about the x2go-commits
mailing list