The branch, release/4.0.1.x has been updated via cc0d73077ae178488672ae919e7225a8ac5415b1 (commit) from 1f4efc0c05a04ed91fe59d0cdf823a80cae7d003 (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/x2goterminate-session | 1 - x2goserver/sbin/x2gocleansessions | 10 ++++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4012bda..9754354 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low - Make x2gomountdirs / x2goumount-session UNC path aware. - Add support to x2gocleansessions to suspend session via state changes in the session DB. + - Add support for terminating sessions via the session DB. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 9819498..f8b3881 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -60,4 +60,3 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && { } - diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 0be7cee..d9f26a9 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -160,6 +160,16 @@ elsif ($pid == 0 ) syslog('debug', "@sinfo[1] was found running and has now been suspended"); } } + if (@sinfo[4]eq 'T') + { + if (!has_terminated(@sinfo[1],@sinfo[11])) + { + syslog('debug', "@sinfo[1]: unmounting all shares"); + system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null"); + system("su @sinfo[11] -c \"x2goterminate-session @sinfo[1] \" > /dev/null"); + syslog('debug', "@sinfo[1] has been requested for termination via the session DB"); + } + } } } } 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).