ldif.h include cleanup

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index bf59a51f1e4e37efa99fea69ea589dcb5f768e13..8d04e949e88224b8529b95426919627ea816a61c 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 8801d79c59c64effac91d586c6ca42fe3031f27a..66e90f79c660fad84871d89cfb8eed97023c34de 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 7b0b9a3f996b9c3b390d4535d93baf7c9fbf7261..2dc8344f8ef39468b8ae34473c2bc7444f75d6d6 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/sasl.c b/servers/slapd/sasl.c
index 04bb8b0d954522a99c444efa79badadda907c60c..e41c28d2bf33da106443d37c76e141f8d188518c 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -9,12 +9,11 @@
 #include <ac/stdlib.h>
 #include <stdio.h>
 
-#include "slap.h"
-#include "proto-slap.h"
-
 #include <lber.h>
 #include <ldap_log.h>
 
+#include "slap.h"
+
 #ifdef HAVE_CYRUS_SASL
 #include <limits.h>
 #include <sasl.h>
@@ -25,6 +24,7 @@
 #include <lutil.h>
 #endif
 
+
 static sasl_security_properties_t sasl_secprops;
 
 static int

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index e7c7a787429e0621b420e2ee7922daddac360b91..fcc6c05ce9940bfdeecede469c7453bdc4925e59 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -15,21 +15,16 @@
 #include <ac/stdlib.h>
 #include <stdio.h>
 
-#include "slap.h"
-#include "proto-slap.h"
-
 #include <ac/string.h>
 
+#include "slap.h"
+
 #ifdef HAVE_CYRUS_SASL
 #include <limits.h>
 #include <sasl.h>
 #include <ldap_pvt.h>
 #endif
 
-
-
-
-
 /* URI format: ldap://<host>/<base>[?[<attrs>][?[<scope>][?[<filter>]]]]   */
 
 int slap_parseURI( char *uri, char **searchbase, int *scope, Filter **filter )

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 40e6580b36647e834055cbd8be61e5652125acf2..36071a11d8ba3e15b58e570ecbfdc2ab32d5692d 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