From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 31 Aug 2006 13:51:25 +0000 (+0000)
Subject: destroy socket set (man page for epoll_create(2) states that close(2) must be called... 
X-Git-Tag: OPENLDAP_REL_ENG_2_3_MP~232
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=417ad405967e269bcb9cf8c5b340b39d857194aa;p=openldap

destroy socket set (man page for epoll_create(2) states that close(2) must be called on the returned filedes)
---

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index fecc892846..31596c4846 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -235,6 +235,16 @@ static struct slap_daemon {
 	for (i=0; i<dtblsize; i++) slap_daemon.sd_index[i] = -1; \
 } while (0)
 
+#define SLAP_SOCK_SET_DESTROY do { \
+	if ( slap_daemon.sd_epolls != NULL ) { \
+		ch_free( slap_daemon.sd_epolls ); \
+		slap_daemon.sd_epolls = NULL; \
+		ch_free( slap_daemon.sd_index ); \
+		slap_daemon.sd_index = NULL; \
+		close( slap_daemon.sd_epfd ); \
+	} \
+} while ( 0 )
+
 # define SLAP_EVENT_DECL struct epoll_event *revents
 
 # define SLAP_EVENT_INIT do { \
@@ -275,6 +285,8 @@ static struct slap_daemon {
 	FD_ZERO(&slap_daemon.sd_writers); \
 } while (0)
 
+#define		SLAP_SOCK_SET_DESTROY
+
 # define SLAP_SOCK_IS_ACTIVE(fd)	FD_ISSET((fd), &slap_daemon.sd_actives)
 # define SLAP_SOCK_IS_READ(fd)		FD_ISSET((fd), &slap_daemon.sd_readers)
 # define SLAP_SOCK_IS_WRITE(fd)		FD_ISSET((fd), &slap_daemon.sd_writers)
@@ -2319,6 +2331,8 @@ static int sockdestroy(void)
 #if defined( HAVE_WINSOCK2 ) || defined( HAVE_WINSOCK )
 	WSACleanup();
 #endif
+	SLAP_SOCK_SET_DESTROY;
+
 	return 0;
 }