Sync with HEAD

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index ed81984c8be3b00408b3da15daf62a1f77292cfa..65afac2dc8c37eb242c6ecde4560a1b989a7dd0c 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -15,6 +15,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
+#include "ldif.h"
 
 static unsigned char   *ebuf;  /* buf returned by entry2str             */
 static unsigned char   *ecur;  /* pointer to end of currently used ebuf */

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 1d01179062fb1da6b40e962c8e7f5f2dfb8fdadf..b20432db18fa43a99138e07c95e398add5015689 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -17,6 +17,7 @@
 
 #include "slap.h"
 #include "lutil.h"
+#include "ldif.h"
 
 #ifdef LDAP_SIGCHLD
 static RETSIGTYPE wait4child( int sig );

diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index e5eddcfb8b05d437f77c5588572800578acfa5c8..58a271601d296b00de881a616628b3da924205c5 100644 (file)
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -18,6 +18,7 @@
 #endif
 
 #include "slap.h"
+#include "ldif.h"
 
 int
 add_replica_info(

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 9789351261293622b525551476c44ea6b54978a3..07d0ee02a9cb70ebfbf76005bd4b663140733f9c 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -32,7 +32,6 @@
 #include <ldap_schema.h>
 
 #include "ldap_pvt_thread.h"
-#include "ldif.h"
 
 LDAP_BEGIN_DECL