From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 1 Sep 2005 23:51:58 +0000 (+0000)
Subject: Add HAVE_EPOLL fix
X-Git-Tag: OPENLDAP_REL_ENG_2_3_8~21
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=77bba099d3256314e267840c931a16b032ac5b71;p=openldap

Add HAVE_EPOLL fix
---

diff --git a/CHANGES b/CHANGES
index 3da76514fa..cbe7e0648f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 OpenLDAP 2.3 Change Log
 
+OpenLDAP 2.3.8 Engineering
+	Fixed slapd undef HAVE_EPOLL issue
+
 OpenLDAP 2.3.7 Release
 	Updated slapd ManageDIT support
 	Updated slapd ACI syntax checking (ITS#3877)
@@ -38,7 +41,6 @@ OpenLDAP 2.3.7 Release
 		Fixed tests --disable-monitor support
 		Fixed tests veryclean-local testdata cleanup
 		Add subtree rename test (hdb only)
-	
 
 OpenLDAP 2.3.6 Release
 	Fixed slapd dnRelativeMatch return (ITS#3931)
diff --git a/build/version.var b/build/version.var
index 54bc83d071..1a9c9000ac 100644
--- a/build/version.var
+++ b/build/version.var
@@ -15,7 +15,7 @@
 ol_package=OpenLDAP
 ol_major=2
 ol_minor=3
-ol_patch=7
+ol_patch=X
 ol_api_inc=20307
 ol_api_current=1
 ol_api_revision=2
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 0bdea4dd9e..814024df74 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -40,8 +40,6 @@
 
 #include "ldap_rq.h"
 
-#undef HAVE_EPOLL
-
 #if defined(HAVE_SYS_EPOLL_H) && defined(HAVE_EPOLL)
 #include <sys/epoll.h>
 #endif