From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 10 Feb 2003 20:22:46 +0000 (+0000)
Subject: Align with HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_1_13~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0118aeb8d55b72d07eab3efcba78e09cdb65942;p=thirdparty%2Fopenldap.git

Align with HEAD
---

diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index 22d61e5c76..9620419652 100644
--- a/servers/slapd/back-monitor/database.c
+++ b/servers/slapd/back-monitor/database.c
@@ -36,12 +36,10 @@
 #include <stdio.h>
 
 #include "slap.h"
-#ifdef LDAP_SLAPI
-#include "slapi.h"
-#endif
 #include "back-monitor.h"
 
 #if defined(LDAP_SLAPI)
+#include "slapi.h"
 static int monitor_back_add_plugin( Backend *be, Entry *e );
 #endif /* defined(LDAP_SLAPI) */
 
diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index d324815388..6586e3020f 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -15,11 +15,12 @@
 #include <sys/stat.h>
 
 #include "slap.h"
+#include "lutil.h"
+#include "lber_pvt.h"
+
 #ifdef LDAP_SLAPI
 #include "slapi.h"
 #endif
-#include "lutil.h"
-#include "lber_pvt.h"
 
 /*
  * If a module is configured as dynamic, its header should not
diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index baf178d2f0..89d3a8d49f 100644
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -24,6 +24,7 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
+
 #ifdef LDAP_SLAPI
 #include "slapi.h"
 #endif
diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index a7c10ef304..e4ae486342 100644
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -33,10 +33,11 @@
 #include <ac/string.h>
 
 #include "slap.h"
+#include "lber_pvt.h"
+
 #ifdef LDAP_SLAPI
 #include "slapi.h"
 #endif
-#include "lber_pvt.h"
 
 #define UNSUPPORTED_EXTENDEDOP "unsupported extended operation"
 
diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 70d4b95e03..10ab52ae2c 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -17,11 +17,12 @@
 #include "ldap_pvt.h"
 
 #include "slap.h"
+#include "lutil.h"
+#include "ldif.h"
+
 #ifdef LDAP_SLAPI
 #include "slapi.h"
 #endif
-#include "lutil.h"
-#include "ldif.h"
 
 #ifdef LDAP_SIGCHLD
 static RETSIGTYPE wait4child( int sig );
diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index ae7594ce86..2a8da886da 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -13,6 +13,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
+
 #ifdef LDAP_SLAPI
 #include "slapi.h"
 #endif
diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index e6c1762d10..bfda458460 100644
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -17,6 +17,7 @@
 #include <ac/unistd.h>
 
 #include "slap.h"
+
 #ifdef LDAP_SLAPI
 #include "slapi.h"
 #endif
diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index efe9c19ee9..f61a36c362 100644
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -17,11 +17,12 @@
 #include <ac/string.h>
 
 #include "slap.h"
+#include <ldif.h>
+#include "lber_pvt.h"
+
 #ifdef LDAP_SLAPI
 #include "slapi.h"
 #endif
-#include <ldif.h>
-#include "lber_pvt.h"
 
 static struct berval supportedFeatures[] = {
 	BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* all Operational Attributes ("+") */