[X2Go-Commits] [x2goserver] 04/04: follow-up for #626 bugfix

git-admin at x2go.org git-admin at x2go.org
Fri Oct 3 14:41:16 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 24219c03330b891deb40d7784aba92a7619a73dd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 3 14:39:20 2014 +0200

    follow-up for #626 bugfix
---
 debian/control                    |    1 -
 x2goserver.spec                   |    1 -
 x2goserver/sbin/x2gocleansessions |   18 ++++++++----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 6735b05..a713dd6 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,6 @@ Depends:
  x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~),
  ${misc:Depends},
  libfile-basedir-perl,
- libfile-remove-perl,
  libtry-tiny-perl,
  libswitch-perl,
  libx2go-server-perl (>= ${source:Version}), libx2go-server-perl (<< ${source:Version}.1~),
diff --git a/x2goserver.spec b/x2goserver.spec
index 96c6a1f..121f0ed 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -49,7 +49,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 54fee76..eb1bd3f 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -26,7 +26,6 @@ $ENV{'PATH'} = "/bin:/sbin:/usr/bin:/usr/sbin";
 
 use Sys::Hostname;
 use Sys::Syslog qw( :standard :macros );
-use File::Remove;
 use POSIX;
 
 use X2Go::Config qw( get_config );
@@ -164,27 +163,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)
-						syslog('warning', "@sinfo[1], pid @sinfo[0] cleaning up stale X11 socket file: /tmp/.X11-unix/X$display");
-						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], at sinfo[1], at 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)
 					syslog('warning', "@sinfo[1], pid @sinfo[0] cleaning up stale X11 socket file: /tmp/.X11-unix/X$display");
-					File::Remove::remove("/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


More information about the x2go-commits mailing list