[X2Go-Commits] [x2goserver] 01/01: Revert "follow-up commit for a01baa88f8616f305525012b88af14c60ba4bb65"

git-admin at x2go.org git-admin at x2go.org
Sat Mar 8 22:57:18 CET 2014


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

x2go pushed a commit to branch master
in repository x2goserver.

commit a1a9c4550c4de57502e7fda91e1f788382b602e2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Mar 8 14:15:19 2014 +0100

    Revert "follow-up commit for a01baa88f8616f305525012b88af14c60ba4bb65"
    
    This reverts commit 29686161789927a7ad0cc2feaea1d42f62045c40.
---
 x2goserver/sbin/x2gocleansessions |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index cbb7adb..cff334f 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -24,8 +24,6 @@ use strict;
 
 $ENV{'PATH'} = "/bin:/sbin:/usr/bin:/usr/sbin";
 
-use IO::Handle;
-
 use Sys::Hostname;
 use Sys::Syslog qw( :standard :macros );
 
@@ -69,11 +67,7 @@ sub catch_term
 
 my $uname;
 my $serv = hostname;
-
-STDERR->autoflush(1);
-STDOUT->autoflush(1);
 my $pid = fork();
-
 if (not defined $pid) 
 {
 	print "resources not avilable.\n";
@@ -98,6 +92,9 @@ elsif ($pid == 0 )
 	my $superenice_idle=$Config->param("superenicer.idle-nice-level");
 	my $superenice_ignoredusers=$Config->param("superenicer.ignored-users");
 
+	# close any open file descriptor left open by our parent before the fork
+	for (glob "/proc/$$/fd/*") { POSIX::close($_) if m{/(\d+)$}; }
+
 	$SIG{TERM}=\&catch_term;
 	$SIG{CHLD} = sub { wait };
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git



More information about the x2go-commits mailing list