From 61de99937fad9621c7ab1802d6b483d631ea035f Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 25 Sep 2001 00:03:24 +0000
Subject: [PATCH] ldif.h include cleanup

---
 servers/slapd/entry.c     | 1 +
 servers/slapd/main.c      | 1 +
 servers/slapd/repl.c      | 1 +
 servers/slapd/sasl.c      | 6 +++---
 servers/slapd/saslauthz.c | 9 ++-------
 servers/slapd/slap.h      | 1 -
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index bf59a51f1e..8d04e949e8 100644
--- 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 8801d79c59..66e90f79c6 100644
--- 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 7b0b9a3f99..2dc8344f8e 100644
--- 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 04bb8b0d95..e41c28d2bf 100644
--- 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 e7c7a78742..fcc6c05ce9 100644
--- 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 40e6580b36..36071a11d8 100644
--- 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
 
-- 
2.39.5