From: Hallvard Furuseth Date: Fri, 3 Sep 1999 23:10:05 +0000 (+0000) Subject: Move `#include "ldap_defaults.h"' into slap.h, which #ifdefs on it. X-Git-Tag: TWEB_OL_BASE~28 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1cde4812982a42ffb8b097dd49afa9be5919fe47;p=openldap 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 c541da91e5..4492028a07 100644 --- 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 d77e1e772e..68ec349d37 100644 --- a/servers/slapd/back-bdb2/dbcache.c +++ b/servers/slapd/back-bdb2/dbcache.c @@ -15,7 +15,6 @@ #include #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 1d8f41e29d..299ee1cc74 100644 --- a/servers/slapd/back-bdb2/idl.c +++ b/servers/slapd/back-bdb2/idl.c @@ -7,7 +7,6 @@ #include #include -#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 3857ab6812..1eff94317d 100644 --- a/servers/slapd/back-bdb2/startup.c +++ b/servers/slapd/back-bdb2/startup.c @@ -15,7 +15,6 @@ #include #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 93a43ebc21..4ff604eb8e 100644 --- a/servers/slapd/back-bdb2/txn.h +++ b/servers/slapd/back-bdb2/txn.h @@ -16,7 +16,6 @@ #include #include -#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 3bec93a529..0aa9090e9e 100644 --- a/servers/slapd/back-ldbm/dbcache.c +++ b/servers/slapd/back-ldbm/dbcache.c @@ -19,7 +19,6 @@ #include #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 e47c8cfa5b..91499f04fa 100644 --- a/servers/slapd/back-ldbm/idl.c +++ b/servers/slapd/back-ldbm/idl.c @@ -11,7 +11,6 @@ #include #include -#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 ec4c9faf1b..0a329f96f1 100644 --- a/servers/slapd/back-ldbm/startup.c +++ b/servers/slapd/back-ldbm/startup.c @@ -12,7 +12,6 @@ #include #include -#include "ldap_defaults.h" #include "slap.h" #include "back-ldbm.h" diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c index 872d08776a..0790b62164 100644 --- 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 2da09086e6..61edb51e2a 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -16,7 +16,6 @@ #include #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 9a70a9abdc..0b3acf089b 100644 --- a/servers/slapd/configinfo.c +++ b/servers/slapd/configinfo.c @@ -21,7 +21,6 @@ #include #include -#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 06dd261b89..ac105cd156 100644 --- a/servers/slapd/daemon.c +++ b/servers/slapd/daemon.c @@ -16,7 +16,6 @@ #include #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 5be95f88d8..8a537546b3 100644 --- a/servers/slapd/main.c +++ b/servers/slapd/main.c @@ -15,7 +15,6 @@ #include #include -#include "ldap_defaults.h" #include "slap.h" #include "lutil.h" diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c index 9cc63754ef..19f86a7b96 100644 --- a/servers/slapd/monitor.c +++ b/servers/slapd/monitor.c @@ -22,7 +22,6 @@ #include #include -#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 42fe2f0348..6981ab8359 100644 --- a/servers/slapd/nt_svc.c +++ b/servers/slapd/nt_svc.c @@ -4,7 +4,6 @@ #include -#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 a5acd57f20..6b8c9122d0 100644 --- a/servers/slapd/result.c +++ b/servers/slapd/result.c @@ -12,7 +12,6 @@ #include #include -#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 98b4511bd9..162891a913 100644 --- a/servers/slapd/root_dse.c +++ b/servers/slapd/root_dse.c @@ -15,7 +15,6 @@ #include -#include "ldap_defaults.h" #include "slap.h" void diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c index 7ee54a2e64..655b622880 100644 --- a/servers/slapd/schema.c +++ b/servers/slapd/schema.c @@ -12,7 +12,6 @@ #include #include -#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 c20c28035e..0ef53d14ff 100644 --- a/servers/slapd/search.c +++ b/servers/slapd/search.c @@ -17,7 +17,6 @@ #include #include -#include "ldap_defaults.h" #include "slap.h" diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 3fbf4b4b11..c1401d09fc 100644 --- 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 #include diff --git a/servers/slapd/tools/ldbmtest.c b/servers/slapd/tools/ldbmtest.c index ad666a9ddb..662bb57ad4 100644 --- a/servers/slapd/tools/ldbmtest.c +++ b/servers/slapd/tools/ldbmtest.c @@ -31,7 +31,6 @@ #include #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 ffa4007861..1d92502943 100644 --- 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 {