Move include <slapi.h> behind #ifdef

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 2e11d8036092e1fa61b5cf9f22af11cdc2c8ea07..d0b393d3646b46bafc5c1efb3bc9a3da9b69f83e 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -24,9 +24,9 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
-#include "slapi.h"
 
 #ifdef LDAP_SLAPI
+#include "slapi.h"
 static Slapi_PBlock *initAddPlugin( Backend *be, Connection *conn, Operation *op,
        struct berval *dn, Entry *e, int manageDSAit );
 static int doPreAddPluginFNs( Backend *be, Slapi_PBlock *pb );

diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index ac2d4fccf355ba8418ea890044281f90fdd5731e..96204196527bfc2b00c1bb13ef1913dbeac243a6 100644 (file)
--- a/servers/slapd/back-monitor/database.c
+++ b/servers/slapd/back-monitor/database.c
@@ -36,10 +36,10 @@
 #include <stdio.h>
 
 #include "slap.h"
-#include "slapi.h"
 #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 679fceba7ed7b976ec41a6b003d83930d1637f1f..6586e3020fa8f342eb7fbaedd1c13f2343c51465 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -15,10 +15,13 @@
 #include <sys/stat.h>
 
 #include "slap.h"
-#include "slapi.h"
 #include "lutil.h"
 #include "lber_pvt.h"
 
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
 /*
  * If a module is configured as dynamic, its header should not
  * get included into slapd. While this is a general rule and does

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 34e18e58e8f2d2b543327951273fe57137fb77c5..f27b35503e135b40d45613a808370a76b9a6b26f 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -26,7 +26,9 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 
 int

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index b9c88d8d29c3085faf8a63f1b388f7cb95a9699c..67651aa87792551a012faff9a55288bc61a60d2d 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -22,7 +22,9 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 static int compare_entry(
        Connection *conn,

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index c83f13148a75203b902a68ead92381e1773e07ea..ac10f94a89844d4b5502d963c717739bee08bb58 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -18,7 +18,9 @@
 #include "lutil.h"
 #include "ldap_pvt.h"
 #include "slap.h"
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 #define ARGS_STEP      512
 

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 02d37bd4228b1808a967d0f38302799afbd21699..89d3a8d49f4616740a5fbf3c6e573bffd81cdf6a 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -24,7 +24,10 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
+
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 int
 do_delete(

diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 8801a55984eba244df19f7dedb62599acc8fe2ec..e4ae48634215fc07da6aa9925d7d57f17e2941b6 100644 (file)
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -33,9 +33,12 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "slapi.h"
 #include "lber_pvt.h"
 
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
 #define UNSUPPORTED_EXTENDEDOP "unsupported extended operation"
 
 static struct extop_list {

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 412d12438b9683e71579ac7505e07c112509f3ef..10ab52ae2c9117e27d9d7afdffe0079647580952 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -17,10 +17,13 @@
 #include "ldap_pvt.h"
 
 #include "slap.h"
-#include "slapi.h"
 #include "lutil.h"
 #include "ldif.h"
 
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
 #ifdef LDAP_SIGCHLD
 static RETSIGTYPE wait4child( int sig );
 #endif

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index d57a9b7ca12301871cc5766008cfb8bc2bc364a8..44c9da2be8d937290961a30fc67c8f11d4fdf852 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -27,7 +27,9 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 int
 do_modify(

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index f496b92a35b60159ac465fddbbaa48d24ff4381a..d2c11b96b1c3a7e92acca4f0f0e5f7bbd998c3c4 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -37,7 +37,9 @@
 
 #include "ldap_pvt.h"
 #include "slap.h"
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 int
 do_modrdn(

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 42f52b2c71dc619c01d2a6d7fa5e45893d484541..2a8da886da336e1b588d7941c8da1bfba0274b6d 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -13,7 +13,10 @@
 #include <ac/socket.h>
 
 #include "slap.h"
+
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 
 void

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 77ab2c0607887cb0a92406b35fd57b66ccbbc861..bfda458460b6ea98e7be681b8e6ba56dbe5b2253 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -17,7 +17,10 @@
 #include <ac/unistd.h>
 
 #include "slap.h"
+
+#ifdef LDAP_SLAPI
 #include "slapi.h"
+#endif
 
 static char *v2ref( BerVarray ref, const char *text )
 {

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index b9c7f35e8029208703aa7e90bc503c3ee41e49c3..f61a36c362cc16cef8ba837dfe03bda53a4f12f2 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -17,10 +17,13 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "slapi.h"
 #include <ldif.h>
 #include "lber_pvt.h"
 
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
 static struct berval supportedFeatures[] = {
        BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* all Operational Attributes ("+") */
        BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attributes List */

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index fcac37b3cc8f5830d0b19c70a38ca6e7b5d55632..fd7ea25a024b3c9f55137add6170074dec872b2f 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -25,9 +25,9 @@
 #include "ldap_pvt.h"
 #include "lutil.h"
 #include "slap.h"
-#include "slapi.h"
 
 #ifdef LDAP_SLAPI
+#include "slapi.h"
 static char **anlist2charray( AttributeName *an );
 static Slapi_PBlock *initSearchPlugin( Backend *be, Connection *conn, Operation *op,
        struct berval *base, int scope, int deref, int sizelimit, int timelimit,