This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 400f19a49820e137baadb0bdacb7965f6542eb35 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 17 10:24:00 2014 +0100 Document session startup / resumption failures (and their reasons) in server-side log output. Conflicts (by Mike Gabrie): x2goserver/bin/x2goresume-session x2goserver/bin/x2gostartagent --- debian/changelog | 2 ++ x2goserver/bin/x2goresume-session | 15 +++++++++++---- x2goserver/bin/x2gostartagent | 21 ++++++++++++++++----- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1d9c6bd..35af871 100644 --- a/debian/changelog +++ b/debian/changelog @@ -188,6 +188,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium up with that idea. - Fix cross-user X2Go Desktop Sharing after being broken by implementing clipboard mode feature (and probably other code changes). + - Document session startup / resumption failures (and their reasons) in + server-side log output. * debian/control: + Add D (x2goserver): libfile-which-perl. * debian/x2goserver.docs: diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index dd83bcb..7c6d605 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -20,9 +20,13 @@ # Copyright (C) 2007-2014 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Copyright (C) 2007-2014 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> +X2GO_LIB_PATH="$(x2gopath libexec)"; + if [ $# -lt 7 ] then - echo "not enough arguments" + msg="not enough command line arguments" + echo "$msg" + $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg" exit -1 fi @@ -35,7 +39,6 @@ X2GO_KBD_TYPE="$6" X2GO_SET_KBD="$7" X2GO_CLIPBOARD="$8" -X2GO_LIB_PATH="$(x2gopath libexec)"; X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"` X2GO_ROOT="${HOME}/.x2go" @@ -56,7 +59,9 @@ STATE=`$X2GO_LIB_PATH/x2gogetagentstate "$SESSION_NAME"` # exit if session terminated if [ "$STATE" == "TERMINATED" ] || [ "$STATE" == "TERMINATING" ] then - echo "Session terminated" + msg="session $SESSION_NAME terminated" + echo "$msg" + $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg" exit -1 fi @@ -92,7 +97,9 @@ do i=$(($i+1)) if [ $i -gt 45 ] then - echo "Error: taking too long to suspend session. It is possible that the session is damaged." + msg="it is taking too long to suspend the session-to-be-resumed; it is possible that the session is in a damaged state" + echo "$msg" + $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg" exit -1; fi STATE=`$X2GO_LIB_PATH/x2gogetagentstate "$SESSION_NAME"` diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 38b0ab7..9eeab89 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -29,16 +29,24 @@ SSH_PORT=30000 #First ssh port 30001 # some sanity checks before session startup... if egrep "^backend[ ]*=[ ]*postgres" /etc/x2go/x2gosql/sql 1>/dev/null 2>/dev/null && [ "x$USER" = "xroot" ]; then - echo "The super-user \"root\" is not allowed to launch X2Go sessions." + msg="The super-user \"root\" is not allowed to launch X2Go sessions." + echo "$msg" + $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg" exit -1 elif [ -z "$USER" ]; then - echo "The \$USER environment variable is not set. Aborting session startup." + msg="The \$USER environment variable is not set. Aborting session startup." + echo "$msg" + $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg" exit -2 elif [ -z "$HOME" ]; then - echo "The \$HOME environment variable is not set. Aborting session startup." + msg="The \$HOME environment variable is not set. Aborting session startup." + echo "$msg" + $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg" exit -4 elif ! echo $HOME | iconv -f ASCII -t ASCII 1>/dev/null 2>/dev/null; then - echo "Your home directory path contains non-ASCII characters. Aborting session startup." + msg="Your home directory path contains non-ASCII characters. Aborting session startup." + echo "$msg" + $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg" exit -5 fi @@ -73,7 +81,9 @@ 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." + msg="The \$X2GO_CLIENT environment variable is not set (due to neither \$SSH_CLIENT nor \$SSH_CONNECTION variable being set). Aborting session startup." + echo "$msg" + $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg" exit -3 fi $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "client announced itself as ,,$X2GO_CLIENT''" @@ -154,6 +164,7 @@ LWORD=`echo $LIMIT | awk '{print $1}'` if [ "$LWORD" == "LIMIT" ]; then echo $LIMIT 1>&2 + $X2GO_LIB_PATH/x2gosyslog "$0" "error" "session limit has been reached for user ,,$USER'', cannot start new session" exit -1 fi -- 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 392bbb8928287aa478e1b8d39c7eb26c9e2a1dbe Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 17 10:29:34 2014 +0100 Revert "wrap too-long-line in changelog" This reverts commit 6cfb8c799b5580fa043cf06b60822daed56c20da. --- debian/changelog | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 315b4ac..72d9dcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (4.1.0.0-0x2go1.1~0) UNRELEASED; urgency=low +x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low [ Mike Gabriel ] * Bump development upstream version to 4.1.0.0. @@ -48,19 +48,15 @@ x2goserver (4.1.0.0-0x2go1.1~0) UNRELEASED; urgency=low - Only use teki_* fields with PostgreSQL DB backend if TeKi is enabled. - Provide --updatedb feature in x2godbadmin if DB backend is PostgreSQL. - Execute post-start.d extension scripts _after_ the session information has - been submitted to the session DB. This allows execution of - x2golistsessions and other X2Go commands in post-start.d extension - scripts. + been submitted to the session DB. This allows execution of x2golistsessions + and other X2Go commands in post-start.d extension scripts. - Re-arrange parameter order of x2gocreatesession and related DB functions. Make sure the session ID comes first and we have only optional parameters towards the end of the paramter array. - - Fix accessing ARGV in X2Go::Utils:check_x2go_sessionid sub. (Fixes: - #575). - - Fix TeKi storing Telekinesis ports in PgSQL-based session DB. Allow - negative + - Fix accessing ARGV in X2Go::Utils:check_x2go_sessionid sub. (Fixes: #575). + - Fix TeKi storing Telekinesis ports in PgSQL-based session DB. Allow negative port numbers for the case that Telekinesis is not installed. - - Fix db_insertmount (SQLite). Pathnames must not be enclosed by - parentheses. + - Fix db_insertmount (SQLite). Pathnames must not be enclosed by parentheses. * debian/control: + Package X2Go::Log in separate package: libx2go-log-perl. + Package X2Go::Server::DB in separate package: libx2go-server-db-perl. -- 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 14e0ea2fd7d1b9a5cf3a8d8244fcd42fc6135ae8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 17 10:32:26 2014 +0100 fix typo in changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 700fb9f..f5e4f19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,7 +53,7 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low scripts. - Re-arrange parameter order of x2gocreatesession and related DB functions. Make sure the session ID comes first and we have only optional parameters - towards the end of the paramter array. + towards the end of the parameter array. - Fix accessing ARGV in X2Go::Utils:check_x2go_sessionid sub. (Fixes: #575). - Fix TeKi storing Telekinesis ports in PgSQL-based session DB. Allow -- 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 111b3496843a18813ac43f2cbb3ef779e51bc8ed Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 17 10:43:05 2014 +0100 be more precise with error message for unset X2GO_CLIENT env var --- x2goserver/bin/x2gostartagent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 9eeab89..446fbcc 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -81,7 +81,7 @@ elif [ -z "$X2GO_CLIENT" ] && [ -n "$SSH_CONNECTION" ]; then X2GO_CLIENT=`echo $SSH_CONNECTION | awk '{print $1}'` fi if [ -z "$X2GO_CLIENT" ]; then - msg="The \$X2GO_CLIENT environment variable is not set (due to neither \$SSH_CLIENT nor \$SSH_CONNECTION variable being set). Aborting session startup." + msg="The \$X2GO_CLIENT environment variable is not set. Possible reasons: \$SSH_CLIENT not set or \$SSH_CONNECTION not set. Or \$X2GO_CLIENT not set by ,,X2Go Desktop Sharing'' applet. Aborting session startup." echo "$msg" $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg" exit -3 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git