The branch, release/4.0.0.x has been updated via 08a2780f1448da0fd00e68f11177b1ca1672da04 (commit) from 80162a9e02734a9c9e1770b03445478d30860f28 (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 ----------------------------------------------------------------- commit 08a2780f1448da0fd00e68f11177b1ca1672da04 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Dec 7 23:19:24 2013 +0100 Improve parsing of the NX session.log file where unexpected extra logging takes place during session suspension/resumption. Thanks to Gerald Richter for finding this!!! (Fixes: #356). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 +++++++--- x2goserver/sbin/x2gocleansessions | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b39bfac..932b33c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low - * Use mktemp instead of tempfile (because Fedora does not have the tempfile - binary). (Fixes: #347). - * Replace makepasswd by pwgen (because Fedora does not have makepasswd). + * New upstream version (4.0.0.8): + - Use mktemp instead of tempfile (because Fedora does not have the tempfile + binary). (Fixes: #347). + - Replace makepasswd by pwgen (because Fedora does not have makepasswd). + - Improve parsing of the NX session.log file where unexpected extra logging + takes place during session suspension/resumption. Thanks to Gerald Richter + for finding this!!! (Fixes: #356). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 28 Nov 2013 16:14:32 +0100 diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 26ffb13..b935a98 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -56,7 +56,7 @@ sub check_stat my $sess=shift; my $user=shift; my $log="/tmp/.x2go-${user}/session-C-${sess}.log"; - my $text=`tail -1 $log 2>/dev/null`; + my $text=`grep Session: $log 2>/dev/null|tail -1`; if ($text =~ m/Session suspended/) { return 0; 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).