[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.1-6-gc9e29f6
X2Go dev team
git-admin at x2go.org
Tue Jun 26 14:20:32 CEST 2012
The branch, master has been updated
via c9e29f65b5f2d176db850832d0f801576279f711 (commit)
from 197c283ddac5dad3d438b28bdb8404aea610d3b8 (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 c9e29f65b5f2d176db850832d0f801576279f711
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Jun 26 14:20:30 2012 +0200
Fix crashes of x2gocleansessions due to faulty syslog calls.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2goserver/sbin/x2gocleansessions | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7a9694b..d5139c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x2goserver (3.1.1.2-0~x2go1) UNRELEASED; urgency=low
Make sure all tmp folders get removed if not used any more. Drop
symlink ~/media if no client-side folders are mounted into a
session.
+ - Fix crashes of x2gocleansessions due to faulty syslog calls.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 26 Jun 2012 09:32:31 +0200
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index 9263d61..dce1f02 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -119,8 +119,8 @@ elsif ($pid == 0 )
if (!check_stat(@sinfo[1], at sinfo[11]))
{
system("su @sinfo[11] -c \"$x2go_lib_path/x2gochangestatus 'S' @sinfo[1] \" > /dev/null");
- syslog("@sinfo[1] is suspended, changing status from @sinfo[4] to S");
- syslog("@sinfo[1]: unmounting all shares");
+ syslog('debug', "@sinfo[1] is suspended, changing status from @sinfo[4] to S");
+ syslog('debug', "@sinfo[1]: unmounting all shares");
system( "su @sinfo[11] -c \"export HOSTNAME && x2goumount-session @sinfo[1]\" 2> /dev/null");
}
}
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