X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/ec4de7f8c59e136f02451f4adfbe87b6d7ef36af..ea91ab45621499ae7949178297d9da6d37b0e4e0:/util.c?ds=inline

diff --git a/util.c b/util.c
index 79f52a4..dee81f5 100644
--- a/util.c
+++ b/util.c
@@ -1,6 +1,6 @@
 /* Misc util functions */
 
-char const *cvs_id_util = "$Id: util.c,v 1.11 2005/06/04 15:42:36 bodea Exp $";
+char const *cvs_id_util = "$Id: util.c,v 1.13 2005/09/19 00:29:12 bodea Exp $";
 
 #include <unistd.h>
 #include <errno.h>
@@ -40,7 +40,7 @@ void *shared_malloc(unsigned int size)
 }
 
 extern int forked;
-extern int udpfd, controlfd, tunfd, snoopfd, ifrfd, ifr6fd, rand_fd, cluster_sockfd;
+extern int cluster_sockfd, tunfd, udpfd, controlfd, daefd, snoopfd, ifrfd, ifr6fd, rand_fd;
 extern int *radfds;
 
 pid_t fork_and_close()
@@ -69,19 +69,19 @@ pid_t fork_and_close()
 	signal(SIGUSR1, SIG_DFL);
 	signal(SIGQUIT, SIG_DFL);
 	signal(SIGKILL, SIG_DFL);
-	signal(SIGALRM, SIG_DFL);
 	signal(SIGTERM, SIG_DFL);
 
 	// Close sockets
+	if (clifd != -1)          close(clifd);
+	if (cluster_sockfd != -1) close(cluster_sockfd);
 	if (tunfd != -1)          close(tunfd);
 	if (udpfd != -1)          close(udpfd);
 	if (controlfd != -1)      close(controlfd);
+	if (daefd != -1)          close(daefd);
 	if (snoopfd != -1)        close(snoopfd);
 	if (ifrfd != -1)          close(ifrfd);
 	if (ifr6fd != -1)         close(ifr6fd);
 	if (rand_fd != -1)        close(rand_fd);
-	if (cluster_sockfd != -1) close(cluster_sockfd);
-	if (clifd != -1)          close(clifd);
 	if (epollfd != -1)        close(epollfd);
 
 	for (i = 0; radfds && i < RADIUS_FDS; i++)