From: Zdeněk Salvet <salvet@ics.muni.cz>
Date: Fri, 27 Apr 2007 08:02:11 +0000 (+0000)
Subject: Make sure close of nonstandard file descriptors is performed
X-Git-Tag: merge_30_31_src5~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=f43f6049c60816f9414d24e758e9eb040fa859b2;p=jra1mw.git

Make sure close of nonstandard file descriptors is performed
before library routines can acquire one. Fixes bug #25932.
---

diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c
index 45e8be3..0ee0389 100644
--- a/org.glite.lb.server/src/bkserverd.c
+++ b/org.glite.lb.server/src/bkserverd.c
@@ -271,6 +271,7 @@ struct clnt_data_t {
 int main(int argc, char *argv[])
 {
 	int					fd, i;
+	int			dtablesize;
 	struct sockaddr_in	a;
 	char			   *mysubj = NULL;
 	int					opt;
@@ -288,6 +289,9 @@ int main(int argc, char *argv[])
 	struct timeval		to;
 
 
+	/* keep this at start of main() ! */
+	dtablesize = getdtablesize();
+	for (fd=3; fd < dtablesize ; fd++) close(fd);
 
 	name = strrchr(argv[0],'/');
 	if (name) name++; else name = argv[0];
@@ -405,8 +409,6 @@ int main(int argc, char *argv[])
 
 	semkey = ftok(pidfile,0);
 
-	if (!debug) for (fd=3; fd<OPEN_MAX; fd++) close(fd);
-
 	if (check_mkdir(dumpStorage)) exit(1);
 	if (check_mkdir(purgeStorage)) exit(1);
 	if ( jpreg ) {