This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from cf4ce1f Fix cross-user X2Go Desktop Sharing after being broken by implementing clipboard mode feature (and probably other code changes). new f896085 Document session startup / resumption failures (and their reasons) in server-side log output. new e355c9e fix for cf4ce1f62 new d5beefb wrap too-long-line in changelog new 9429bf2 be more precise with error message for unset X2GO_CLIENT env var The 4 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 | 10 ++++++---- x2goserver/bin/x2goresume-session | 14 ++++++++++---- x2goserver/bin/x2gostartagent | 24 ++++++++++++++++-------- 3 files changed, 32 insertions(+), 16 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 release/4.0.1.x in repository x2goserver. commit f896085a9eb456da79b70a5619bbbf732e807fcf 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. --- debian/changelog | 2 ++ x2goserver/bin/x2goresume-session | 14 ++++++++++---- x2goserver/bin/x2gostartagent | 25 +++++++++++++++++++------ 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index e6edd03..6b59bad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,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 8783dad..5f19176 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -20,10 +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 SESSION_NAME="$1" @@ -35,7 +38,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 +58,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 +96,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 dde18cf..3964eb2 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -29,19 +29,29 @@ 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 "$SSH_CLIENT" ]; then - echo "The \$SSH_CLIENT environment variable is not set. Aborting session startup." + msg="The \$SSH_CLIENT environment variable is not set. Aborting session startup." + echo "$msg" + $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg" exit -3 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 @@ -68,7 +78,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 @@ -149,6 +161,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 release/4.0.1.x in repository x2goserver. commit e355c9ec7d1427db57caa9a9ee29d3e3428599fa Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 17 10:27:30 2014 +0100 fix for cf4ce1f62 --- x2goserver/bin/x2gostartagent | 5 ----- 1 file changed, 5 deletions(-) diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 3964eb2..612ed71 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -38,11 +38,6 @@ elif [ -z "$USER" ]; then echo "$msg" $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg" exit -2 -elif [ -z "$SSH_CLIENT" ]; then - msg="The \$SSH_CLIENT environment variable is not set. Aborting session startup." - echo "$msg" - $X2GO_LIB_PATH/x2gosyslog "$0" "error" "$msg" - exit -3 elif [ -z "$HOME" ]; then msg="The \$HOME environment variable is not set. Aborting session startup." echo "$msg" -- 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 release/4.0.1.x in repository x2goserver. commit d5beefb372e8124f7f0592b8fcd04eda2a1a163a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 17 10:28:30 2014 +0100 wrap too-long-line in changelog --- debian/changelog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6b59bad..b05584d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,8 +34,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium /tmp dirs. These files are not accessible for that x2golistsessions script and should simply be ignored. (Fixes: #638). - 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). + - 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. - Make sure that all "su"-to-user-contexts use /bin/sh for wrapping around the executed command (in x2gocleansessions and x2golistsessions_root). @@ -43,8 +43,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium - README.i18n: Add file that explains the translation workflow for this package. Thanks to Mark Pedersen-Cook for drafting this file. - Make SSH agent forwarding work after having reconnected via SSH and - having resumed a session. (Fixes: #672). Thanks to Robert Siemer for coming - up with that idea. + having resumed a session. (Fixes: #672). Thanks to Robert Siemer for + coming 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 -- 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 release/4.0.1.x in repository x2goserver. commit 9429bf24d6923c8932ffcb5debd43655a888931c 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 612ed71..b108652 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -73,7 +73,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
-
git-admin＠x2go.org