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 90dc33f464e9bd3c093140032dd176574438a46e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 3 14:39:20 2014 +0200 follow-up for #626 bugfix Conflicts (resolved by Mike Gabriel): debian/control x2goserver/sbin/x2gocleansessions --- debian/control | 1 - x2goserver.spec | 1 - x2goserver/sbin/x2gocleansessions | 18 +++++++++--------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/debian/control b/debian/control index 4debd42..f531e7f 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,6 @@ Depends: libdbd-pg-perl, libdbd-sqlite3-perl, libfile-basedir-perl, - libfile-remove-perl, libcapture-tiny-perl, adduser, xauth, diff --git a/x2goserver.spec b/x2goserver.spec index 14c5725..e142d0c 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -48,7 +48,6 @@ Requires: sudo Requires: x2goagent >= 3.5.0.25 Requires: xorg-x11-fonts-misc Requires: xorg-x11-xauth -Requires: perl(Files::Remove) Requires(pre): shadow-utils Requires(post): grep Requires(post): perl(DBD::SQLite) diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index c689802..59afe91 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -23,7 +23,6 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use File::Remove; use POSIX; @@ -199,25 +198,26 @@ elsif ($pid == 0 ) # send SIGKILL to dangling X-server processes syslog('warning', "@sinfo[1]: found stale X-server process (@sinfo[0]), sending SIGKILL"); system("kill", "-9", "@sinfo[0]"); - my $display = @sinfo[3]; - if (-S "/tmp/.X11-unix/X$display") { - # remove the NX-X11 socket file (as the agent will not have managed after a kill -9) - File::Remove::remove("/tmp/.X11-unix/X$display"); - } delete $remembered_sessions_since{@sinfo[1]}; } + my $display = @sinfo[2]; + if (-S "/tmp/.X11-unix/X$display") { + # remove the NX-X11 socket file (as the agent will not have managed after a kill -9) + syslog('warning', "@sinfo[1], pid @sinfo[0] cleaning up stale X11 socket file: /tmp/.X11-unix/X$display"); + unlink("/tmp/.X11-unix/X$display"); + } syslog('debug', "@sinfo[1]: unmounting all shares"); system( "su", "@sinfo[11]", "-c", "export HOSTNAME && x2goumount-session @sinfo[1]"); } - elsif (! check_pid (@sinfo[0],@sinfo[1],@sinfo[12])) { system("su", "@sinfo[11]", "-c", "$x2go_lib_path/x2gochangestatus 'F' @sinfo[1]"); - my $display = @sinfo[3]; + my $display = @sinfo[2]; if (-S "/tmp/.X11-unix/X$display") { # remove the NX-X11 socket file (we don't know how the agent disappeared, # someone might have shot it with kill -9) - File::Remove::remove("/tmp/.X11-unix/X$display"); + syslog('warning', "@sinfo[1], pid @sinfo[0] cleaning up stale X11 socket file: /tmp/.X11-unix/X$display"); + unlink("/tmp/.X11-unix/X$display"); } syslog('debug', "@sinfo[1], pid @sinfo[0] does not exist, changing status from @sinfo[4] to F"); syslog('debug', "@sinfo[1]: unmounting all shares"); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git