ITS#6342

diff --git a/CHANGES b/CHANGES
index d4da101c951432eeae7ca583109115165c762de8..d355e2f381feced0dcc0ffbc96a13631e3fb69da 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.20 Engineering
        Fixed libldap uninitialized return value (ITS#6355)
+       Fixed slapd inclusion of ac/unistd.h (ITS#6342)
        Fixed slapd debug handling of LDAP_DEBUG_ANY (ITS#6324)
        Fixed slapd termination for one level dns (ITS#6338)
        Fixed slapd-bdb cache corruption (ITS#6341)
@@ -9,6 +10,8 @@ OpenLDAP 2.4.20 Engineering
        Fixed slapd-relay bind segfault (ITS#6337)
        Fixed slapo-memberof operational attr updates (ITS#6329)
        Fixed slapo-syncprov deadlock (ITS#6335)
+       Build Environment
+               Fixed slapd MAXPATHLEN handling (ITS#6342)
        Documentation
                ldap_get_dn(3) typos (ITS#5366)
 

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index e02d90e89bc962c89dfe12d0a42d2d0c9589ba97..e1feb5624972bb044a727e112ef10704e62aae71 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -25,6 +25,7 @@
 #include <ac/ctype.h>
 #include <ac/errno.h>
 #include <sys/stat.h>
+#include <ac/unistd.h>
 
 #include "slap.h"
 

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index b90ae1ec756fe1d74fc26682732269dc4a591417..22e1e982aa26c851912cabc1422cab5a85a39ed2 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -33,6 +33,7 @@
 #include <ac/signal.h>
 #include <ac/socket.h>
 #include <ac/errno.h>
+#include <ac/unistd.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -41,10 +42,6 @@
 #define        S_ISREG(m)      (((m) & _S_IFMT) == _S_IFREG)
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "slap.h"
 #ifdef LDAP_SLAPI
 #include "slapi/slapi.h"