Align with HEAD

diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index 22d61e5c76eadf7f8bed41af2f2459bc34c293ef..96204196527bfc2b00c1bb13ef1913dbeac243a6 100644 (file)
--- 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 d324815388f5741c098c269f0b11ca5cf184b451..6586e3020fa8f342eb7fbaedd1c13f2343c51465 100644 (file)
--- 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 baf178d2f040acb121c460a40f079eacacce56a1..89d3a8d49f4616740a5fbf3c6e573bffd81cdf6a 100644 (file)
--- 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 a7c10ef304e1b5940ad665ee99f69da9fcdfcb28..e4ae48634215fc07da6aa9925d7d57f17e2941b6 100644 (file)
--- 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 70d4b95e03caab56028f1076b3005920115caf67..10ab52ae2c9117e27d9d7afdffe0079647580952 100644 (file)
--- 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 ae7594ce86273c02c767e31cd61eba6b232c36a9..2a8da886da336e1b588d7941c8da1bfba0274b6d 100644 (file)
--- 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 e6c1762d103a3437e48220af5cce5eb3324dbb32..bfda458460b6ea98e7be681b8e6ba56dbe5b2253 100644 (file)
--- 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 efe9c19ee92d82767a72ef1e75f7e9bf85e193d4..f61a36c362cc16cef8ba837dfe03bda53a4f12f2 100644 (file)
--- 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 ("+") */