Move `#include "ldap_defaults.h"' into slap.h, which #ifdefs on it.

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index c541da91e5521d2d9c8a911cd29c8fe52bec8702..4492028a07d51202d65deca662ee81f5bacdc8b1 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -23,7 +23,6 @@
 #endif
 
 #include "ldap_pvt.h"
-#include "ldap_defaults.h"
 #include "slap.h"
 
 #ifdef LDAP_DEBUG

diff --git a/servers/slapd/back-bdb2/dbcache.c b/servers/slapd/back-bdb2/dbcache.c
index d77e1e772e78e0fe044ae238d5feec61e42e089a..68ec349d37c17baadb0f2a8cf4718bf38b36892b 100644 (file)
--- a/servers/slapd/back-bdb2/dbcache.c
+++ b/servers/slapd/back-bdb2/dbcache.c
@@ -15,7 +15,6 @@
 #include <sys/param.h>
 #endif
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-bdb2.h"
 

diff --git a/servers/slapd/back-bdb2/idl.c b/servers/slapd/back-bdb2/idl.c
index 1d8f41e29d511e5c274871232ad61501683c5499..299ee1cc740f70097afd18ceaa3fff5cb40f5c2b 100644 (file)
--- a/servers/slapd/back-bdb2/idl.c
+++ b/servers/slapd/back-bdb2/idl.c
@@ -7,7 +7,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-bdb2.h"
 

diff --git a/servers/slapd/back-bdb2/startup.c b/servers/slapd/back-bdb2/startup.c
index 3857ab681248236b7910ffe883fc312bf4a51e18..1eff94317d8483ae89cb823cce2aba2525a1ac04 100644 (file)
--- a/servers/slapd/back-bdb2/startup.c
+++ b/servers/slapd/back-bdb2/startup.c
@@ -15,7 +15,6 @@
 #include <direct.h>
 #endif
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-bdb2.h"
 

diff --git a/servers/slapd/back-bdb2/txn.h b/servers/slapd/back-bdb2/txn.h
index 93a43ebc2116874978a13c3a8110f1cf64df67c1..4ff604eb8e9f782d58bea7b38dac2033b7e101ef 100644 (file)
--- a/servers/slapd/back-bdb2/txn.h
+++ b/servers/slapd/back-bdb2/txn.h
@@ -16,7 +16,6 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-bdb2.h"
 

diff --git a/servers/slapd/back-ldbm/dbcache.c b/servers/slapd/back-ldbm/dbcache.c
index 3bec93a5296192b6c3c17b435d6d1a9a2688863c..0aa9090e9ee5f55ea5c01951e9ec53bf97204e11 100644 (file)
--- a/servers/slapd/back-ldbm/dbcache.c
+++ b/servers/slapd/back-ldbm/dbcache.c
@@ -19,7 +19,6 @@
 #include <sys/param.h>
 #endif
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-ldbm.h"
 

diff --git a/servers/slapd/back-ldbm/idl.c b/servers/slapd/back-ldbm/idl.c
index e47c8cfa5b38ceacb41a89d79ae6f5092c19c90a..91499f04fa8bee38be1c760b6c54c44a868da832 100644 (file)
--- a/servers/slapd/back-ldbm/idl.c
+++ b/servers/slapd/back-ldbm/idl.c
@@ -11,7 +11,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-ldbm.h"
 

diff --git a/servers/slapd/back-ldbm/startup.c b/servers/slapd/back-ldbm/startup.c
index ec4c9faf1b608555042046abc043ffd1ff0a8bfa..0a329f96f197d8acb5c4dfb252c6ef40c95d32a3 100644 (file)
--- a/servers/slapd/back-ldbm/startup.c
+++ b/servers/slapd/back-ldbm/startup.c
@@ -12,7 +12,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "back-ldbm.h"
 

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 872d08776aba6a90ced62c43b92f470469bc33c2..0790b62164f9476e069d1387164f05d10ae14d09 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -17,8 +17,6 @@
 #include "slap.h"
 #include "lutil.h"
 
-#include "ldap_defaults.h"
-
 #ifdef SLAPD_LDAP
 #include "back-ldap/external.h"
 #endif

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 2da09086e6e9624853e805bb2b4a0cfeaa28e052..61edb51e2ae1c40545a935bdd0f9881c3e2baa71 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -16,7 +16,6 @@
 #include <ac/socket.h>
 
 #include "ldap_pvt.h"
-#include "ldap_defaults.h"
 #include "slap.h"
 
 #define MAXARGS        100

diff --git a/servers/slapd/configinfo.c b/servers/slapd/configinfo.c
index 9a70a9abdcf281ea8368d781eed85fb9bd5018dd..0b3acf089b072a024c5d3f0faddb8e1ec67e350e 100644 (file)
--- a/servers/slapd/configinfo.c
+++ b/servers/slapd/configinfo.c
@@ -21,7 +21,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 #if defined( SLAPD_CONFIG_DN )

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 06dd261b899df755222feecb86d78d3e80bf5242..ac105cd15669f7a6c8c09db189b9ebcdafdaae13 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -16,7 +16,6 @@
 #include <ac/unistd.h>
 
 #include "ldap_pvt.h"
-#include "ldap_defaults.h"
 #include "lutil.h"
 #include "slap.h"
 

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 5be95f88d8acb9c3c0109791aa9103d5dcbbdef1..8a537546b3e426a1074fc76d5a3dd1180aea7fd9 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -15,7 +15,6 @@
 #include <ac/signal.h>
 #include <ac/errno.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 #include "lutil.h"
 

diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c
index 9cc63754ef8d5703588e6e3906461d0972804ec0..19f86a7b9652b8206fbb10982ddf27bab909c322 100644 (file)
--- a/servers/slapd/monitor.c
+++ b/servers/slapd/monitor.c
@@ -22,7 +22,6 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 #if defined( SLAPD_MONITOR_DN )

diff --git a/servers/slapd/nt_svc.c b/servers/slapd/nt_svc.c
index 42fe2f034851e29f78392ff97182abd13110ebe2..6981ab8359642358371096c0af03787e9ef1ff2a 100644 (file)
--- a/servers/slapd/nt_svc.c
+++ b/servers/slapd/nt_svc.c
@@ -4,7 +4,6 @@
 
 #include <ac/string.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 ldap_pvt_thread_cond_t started_event,          stopped_event;

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index a5acd57f2044701893f343c14a0139fb56815ef0..6b8c9122d0c680b9332795a0754553d3aefd8185 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -12,7 +12,6 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 /* we need LBER internals */

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 98b4511bd9dce6d691b53565dcf3ccc3bc165378..162891a913c3aa2ac8a658427915476c23588275 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -15,7 +15,6 @@
 
 #include <ac/string.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 void

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 7ee54a2e641a518cc4990b43e5a2812364c9aa41..655b6228800ff3aa2f750949e9af192c9ab9e9dc 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -12,7 +12,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 static char *  oc_check_required(Entry *e, char *ocname);

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index c20c28035ec5643abe92564f3d252dcb18800d30..0ef53d14ff8fdf9dc3a85e2dba244d37994df993 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -17,7 +17,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_defaults.h"
 #include "slap.h"
 
 

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 3fbf4b4b1186efc97f2b6afaa6f8dd6e329e5bb5..c1401d09fce962d530dff5f660cb45ef480b516a 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -7,6 +7,8 @@
 #ifndef _SLDAPD_H_
 #define _SLDAPD_H_
 
+#include "ldap_defaults.h"
+
 #include <ac/stdlib.h>
 
 #include <sys/types.h>

diff --git a/servers/slapd/tools/ldbmtest.c b/servers/slapd/tools/ldbmtest.c
index ad666a9ddb8b6299c9dca208e1a0949d4cf7aa1d..662bb57ad4d75735c0061409a3ba9669ea28dfd2 100644 (file)
--- a/servers/slapd/tools/ldbmtest.c
+++ b/servers/slapd/tools/ldbmtest.c
@@ -31,7 +31,6 @@
 #include <io.h>
 #endif
 
-#include "ldap_defaults.h"
 #include "../slap.h"
 #include "../back-ldbm/back-ldbm.h"
 

diff --git a/servers/slapd/tools/slapcommon.h b/servers/slapd/tools/slapcommon.h
index ffa400786121ea67f92698b0b93933a4309678db..1d92502943bbdfa5aaf14dfdc4c3e07a64e8b99e 100644 (file)
--- a/servers/slapd/tools/slapcommon.h
+++ b/servers/slapd/tools/slapcommon.h
@@ -8,7 +8,6 @@
 #define SLAPCOMMON_H_ 1
 
 #define SLAPD_TOOLS 1
-#include "ldap_defaults.h"
 #include "../slap.h"
 
 enum slaptool {