Add HAVE_EPOLL fix

diff --git a/CHANGES b/CHANGES
index 3da76514fac99f83c05f1e0628a902e6731d4f4f..cbe7e0648f1262a1b5aa14bb7bda0a08942f1983 100644 (file)
--- 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 54bc83d0713dbe53165ca464f71c2aab0d51adf7..1a9c9000ac1c7a853d17d5b713693f00d3c7a819 100644 (file)
--- 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 0bdea4dd9e9a3bbe5a9d50d6e372aae9edd03704..814024df74e49cb9f6ec1139ce498090e9c5fc9e 100644 (file)
--- 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