ITS#7790 - Rename config.h

Rename slapd/config.h to slap-config.h and update accordingly
Rename lloadd/config.h to lload-config.h and update accordingly

diff --git a/servers/lloadd/config.c b/servers/lloadd/config.c
index b77ee246fd9fde1e0685d43d14d73fcc90c48f48..ba827bfe2bec000005de9a2347c200cb13426930 100644 (file)
--- a/servers/lloadd/config.c
+++ b/servers/lloadd/config.c
@@ -45,7 +45,7 @@
 #include "lload.h"
 #include "lutil.h"
 #include "lutil_ldap.h"
-#include "config.h"
+#include "lload-config.h"
 
 #ifdef _WIN32
 #define LUTIL_ATOULX lutil_atoullx

diff --git a/servers/lloadd/config.h b/servers/lloadd/lload-config.h
similarity index 92%
rename from servers/lloadd/config.h
rename to servers/lloadd/lload-config.h
index b9d4d944359c14e75e6c960947758149bbcf3c4c..f8d677692aa37202639e12cdbaeb521fa8ae4d05 100644 (file)
--- a/servers/lloadd/config.h
+++ b/servers/lloadd/lload-config.h
@@ -1,4 +1,4 @@
-/* config.h - configuration abstraction structure */
+/* lload-config.h - configuration abstraction structure */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
@@ -18,7 +18,7 @@
 #define LLOAD_CONFIG_H
 
 #include <ac/string.h>
-#include "../slapd/config.h"
+#include "../slapd/slap-config.h"
 
 LDAP_BEGIN_DECL
 

diff --git a/servers/lloadd/module_init.c b/servers/lloadd/module_init.c
index 4bfdf4275735e766c3996cce4778d0ae3000a6ff..0a30d18827ab5bfa45afed2d003b031d9359ee3c 100644 (file)
--- a/servers/lloadd/module_init.c
+++ b/servers/lloadd/module_init.c
@@ -33,7 +33,7 @@
 #include <ac/time.h>
 
 #include "../servers/slapd/slap.h"
-#include "../servers/slapd/config.h"
+#include "../servers/slapd/slap-config.h"
 
 #include "lload.h"
 #include "lber_pvt.h"

diff --git a/servers/lloadd/monitor.c b/servers/lloadd/monitor.c
index 6422cdb36857f303b18b17ca418fae1f20d8072a..a9ee85bdee894b63cb8fc04adcc44210c042cafd 100644 (file)
--- a/servers/lloadd/monitor.c
+++ b/servers/lloadd/monitor.c
@@ -36,7 +36,7 @@
 #include "lber_pvt.h"
 
 #include "ldap_rq.h"
-#include "config.h"
+#include "lload-config.h"
 #include "../slapd/back-monitor/back-monitor.h"
 
 #define LLOAD_MONITOR_BALANCER_NAME "Load Balancer"

diff --git a/servers/slapd/back-asyncmeta/config.c b/servers/slapd/back-asyncmeta/config.c
index 7264bdf34627c74036f2ba1fde87bd74a8e76b87..0a695664dcd930d89cf39a7dc87c64b6c4cfc891 100644 (file)
--- a/servers/slapd/back-asyncmeta/config.c
+++ b/servers/slapd/back-asyncmeta/config.c
@@ -29,7 +29,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 #include "ldif.h"
 #include "../back-ldap/back-ldap.h"

diff --git a/servers/slapd/back-asyncmeta/init.c b/servers/slapd/back-asyncmeta/init.c
index 7ae784f67c5488429e50a710810be88549fa7494..1a2accf7319a15e01bce8ab269a34a1164e03109 100644 (file)
--- a/servers/slapd/back-asyncmeta/init.c
+++ b/servers/slapd/back-asyncmeta/init.c
@@ -28,7 +28,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "../back-ldap/back-ldap.h"
 #include "back-asyncmeta.h"
 

diff --git a/servers/slapd/back-dnssrv/init.c b/servers/slapd/back-dnssrv/init.c
index e9d4dc72d1facd77707c007ce14fea41b1644dda..c28db31268604528eb3788be2490a626d8aee66a 100644 (file)
--- a/servers/slapd/back-dnssrv/init.c
+++ b/servers/slapd/back-dnssrv/init.c
@@ -28,7 +28,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "proto-dnssrv.h"
 
 int

diff --git a/servers/slapd/back-ldap/chain.c b/servers/slapd/back-ldap/chain.c
index a7a90bee80407e6d4c1ba94d869a308ee646effb..8901bf3e50a8b7bb6e0a1547514f7f99b2ad9e14 100644 (file)
--- a/servers/slapd/back-ldap/chain.c
+++ b/servers/slapd/back-ldap/chain.c
@@ -30,7 +30,7 @@
 #include "lutil.h"
 #include "slap.h"
 #include "back-ldap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
 #define SLAP_CHAINING_DEFAULT                          LDAP_CHAINING_PREFERRED

diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index 44233ef662e9733bd955f0fa56c71986c5471057..1f83635566f7265e3829d123ab699113c6e08a91 100644 (file)
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -30,7 +30,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "back-ldap.h"
 #include "lutil.h"
 #include "ldif.h"

diff --git a/servers/slapd/back-ldap/distproc.c b/servers/slapd/back-ldap/distproc.c
index 06f381e363e5837487ad61056db8251836bcf34a..ed7b6dab9e623a33415157fec87dab40cdb61fe4 100644 (file)
--- a/servers/slapd/back-ldap/distproc.c
+++ b/servers/slapd/back-ldap/distproc.c
@@ -33,7 +33,7 @@
 
 #include "back-ldap.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 /*
  * From <draft-sermersheim-ldap-distproc>

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 8acb73ca5d1dae2b6d270a3c150bbb80635553b4..394fffb2f5c2d3ebb2c53768d6ba30f143c4fc4d 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -29,7 +29,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "back-ldap.h"
 
 static const ldap_extra_t ldap_extra = {

diff --git a/servers/slapd/back-ldap/monitor.c b/servers/slapd/back-ldap/monitor.c
index 129b4a004d9766b5b7e3c596ab6fb4521af48514..e96dbeff069d92569ca7eb70d3b269d8090f0f3b 100644 (file)
--- a/servers/slapd/back-ldap/monitor.c
+++ b/servers/slapd/back-ldap/monitor.c
@@ -32,7 +32,7 @@
 #include "lutil.h"
 #include "back-ldap.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 static ObjectClass             *oc_olmLDAPDatabase;
 static ObjectClass             *oc_olmLDAPConnection;

diff --git a/servers/slapd/back-ldap/pbind.c b/servers/slapd/back-ldap/pbind.c
index 8fbc024935bafbb9a900c70a7bbd345aede5511d..0476b692d043b34ece0713b45550bcdecdfa4766 100644 (file)
--- a/servers/slapd/back-ldap/pbind.c
+++ b/servers/slapd/back-ldap/pbind.c
@@ -29,7 +29,7 @@
 #include "lutil.h"
 #include "slap.h"
 #include "back-ldap.h"
-#include "config.h"
+#include "slap-config.h"
 
 static BackendInfo     *lback;
 

diff --git a/servers/slapd/back-ldif/ldif.c b/servers/slapd/back-ldif/ldif.c
index 5b57892d6cc5ad81cdf5044b6f6fcf8221eb79b2..0def1980e73bb8c1fb6b3a6f8736b9e38b365cac 100644 (file)
--- a/servers/slapd/back-ldif/ldif.c
+++ b/servers/slapd/back-ldif/ldif.c
@@ -29,7 +29,7 @@
 #include <ac/unistd.h>
 #include "slap.h"
 #include "lutil.h"
-#include "config.h"
+#include "slap-config.h"
 
 struct ldif_tool {
        Entry   **entries;                      /* collected by bi_tool_entry_first() */

diff --git a/servers/slapd/back-mdb/attr.c b/servers/slapd/back-mdb/attr.c
index 48ce3d909f1eeff8fa97733a9e08636f85d27c53..446b9a4b05c21b8006ea6718955154cb45346ae4 100644 (file)
--- a/servers/slapd/back-mdb/attr.c
+++ b/servers/slapd/back-mdb/attr.c
@@ -23,7 +23,7 @@
 
 #include "slap.h"
 #include "back-mdb.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 
 /* Find the ad, return -1 if not found,

diff --git a/servers/slapd/back-mdb/config.c b/servers/slapd/back-mdb/config.c
index 669944d04027589a0404dd8a5a39eb2d6aa5c233..54fed1383ff93c42860fd99a0f373f8e4284b27f 100644 (file)
--- a/servers/slapd/back-mdb/config.c
+++ b/servers/slapd/back-mdb/config.c
@@ -24,7 +24,7 @@
 #include "back-mdb.h"
 #include "idl.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 #include "lutil.h"
 #include "ldap_rq.h"

diff --git a/servers/slapd/back-mdb/init.c b/servers/slapd/back-mdb/init.c
index 7bee68e10afb50a1cf31f34b66e0d0af200996a6..867559a9db587d08a21ea5b1393c6f26ad68d6cf 100644 (file)
--- a/servers/slapd/back-mdb/init.c
+++ b/servers/slapd/back-mdb/init.c
@@ -25,7 +25,7 @@
 #include "back-mdb.h"
 #include <lutil.h>
 #include <ldap_rq.h>
-#include "config.h"
+#include "slap-config.h"
 
 static const struct berval mdmi_databases[] = {
        BER_BVC("ad2i"),

diff --git a/servers/slapd/back-mdb/monitor.c b/servers/slapd/back-mdb/monitor.c
index aeea4963ce5a0e0699f3462aeece79cc161964d9..5121256c9739dcd1478587e9c57de29f8ae99b98 100644 (file)
--- a/servers/slapd/back-mdb/monitor.c
+++ b/servers/slapd/back-mdb/monitor.c
@@ -27,7 +27,7 @@
 
 #include "../back-monitor/back-monitor.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 static ObjectClass             *oc_olmMDBDatabase;
 

diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index 66f47614c371b41db7bd0349981692005582445c..626c93674862f7997798f4e5244da9d247788ec8 100644 (file)
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -29,7 +29,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 #include "ldif.h"
 #include "../back-ldap/back-ldap.h"

diff --git a/servers/slapd/back-meta/init.c b/servers/slapd/back-meta/init.c
index fa46bcaf99b969c55b95b8e024196384e0c9243b..63481dfc724738f7a4f7b14e704a105a0bf13b62 100644 (file)
--- a/servers/slapd/back-meta/init.c
+++ b/servers/slapd/back-meta/init.c
@@ -23,7 +23,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "../back-ldap/back-ldap.h"
 #include "back-meta.h"
 

diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c
index edb201e58dfb7d8fd44030286445349b48a9fbae..e7a9b903d245b2756385b0e6557dca10382566ff 100644 (file)
--- a/servers/slapd/back-monitor/init.c
+++ b/servers/slapd/back-monitor/init.c
@@ -26,11 +26,11 @@
 
 #include <lutil.h>
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lber_pvt.h"
 #include "back-monitor.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 #undef INTEGRATE_CORE_SCHEMA
 

diff --git a/servers/slapd/back-ndb/config.cpp b/servers/slapd/back-ndb/config.cpp
index 9c0dd235490ca6042b1fbaaeb7697ad67bb4217a..14ff8311e6b371e96b7de99e51dd1329c3fba586 100644 (file)
--- a/servers/slapd/back-ndb/config.cpp
+++ b/servers/slapd/back-ndb/config.cpp
@@ -23,7 +23,7 @@
 
 #include "back-ndb.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 extern "C" {
        static ConfigDriver ndb_cf_gen;

diff --git a/servers/slapd/back-ndb/init.cpp b/servers/slapd/back-ndb/init.cpp
index bd9392a1dc02bf70af8c71ad1c2100cdd6e6bff9..9435950f8a63a69ebbbae9a634165ea7bf29be72 100644 (file)
--- a/servers/slapd/back-ndb/init.cpp
+++ b/servers/slapd/back-ndb/init.cpp
@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 #include "back-ndb.h"
 #include <lutil.h>
-#include "config.h"
+#include "slap-config.h"
 
 extern "C" {
        static BI_db_init ndb_db_init;

diff --git a/servers/slapd/back-null/null.c b/servers/slapd/back-null/null.c
index a45888f577636385deb471dc16b0d791b644cfe5..41149a6653697d21018736ce7814af883c33b3c7 100644 (file)
--- a/servers/slapd/back-null/null.c
+++ b/servers/slapd/back-null/null.c
@@ -24,7 +24,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 typedef struct null_info {
        int     ni_bind_allowed;

diff --git a/servers/slapd/back-passwd/config.c b/servers/slapd/back-passwd/config.c
index 3a72d373cba3f6b44b6765e3104d4b8d085301f4..a4d8b9563e24b421629220d3bf0bb3d40aa79f85 100644 (file)
--- a/servers/slapd/back-passwd/config.c
+++ b/servers/slapd/back-passwd/config.c
@@ -38,7 +38,7 @@
 
 #include "slap.h"
 #include "back-passwd.h"
-#include "config.h"
+#include "slap-config.h"
 
 static ConfigTable passwdcfg[] = {
        { "file", "filename", 2, 2, 0,

diff --git a/servers/slapd/back-perl/close.c b/servers/slapd/back-perl/close.c
index 6a645239e6811f137a5003bb57e7a4a48d492606..c0ae4828ee73323aa6b49c1dd62ec2d14a581677 100644 (file)
--- a/servers/slapd/back-perl/close.c
+++ b/servers/slapd/back-perl/close.c
@@ -16,7 +16,7 @@
  */
 
 #include "perl_back.h"
-#include "../config.h"
+#include "../slap-config.h"
 /**********************************************************
  *
  * Close

diff --git a/servers/slapd/back-perl/config.c b/servers/slapd/back-perl/config.c
index 646d9a96fb7204aaf519dba5b08ba198dfd3dbb4..0ea1baefdb5c85cdc6bbe2ab8fa651b36f0e2903 100644 (file)
--- a/servers/slapd/back-perl/config.c
+++ b/servers/slapd/back-perl/config.c
@@ -16,7 +16,7 @@
  */
 
 #include "perl_back.h"
-#include "../config.h"
+#include "../slap-config.h"
 
 static ConfigDriver perl_cf;
 

diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index f33420d48c3e586b67a7e90cdd19893f3cbe38e8..963a2bea39ee9c57313e3224b7be345516c69c67 100644 (file)
--- a/servers/slapd/back-perl/init.c
+++ b/servers/slapd/back-perl/init.c
@@ -16,7 +16,7 @@
  */
 
 #include "perl_back.h"
-#include "../config.h"
+#include "../slap-config.h"
 
 #ifdef PERL_SYS_INIT3
 #include <ac/unistd.h>         /* maybe get environ */

diff --git a/servers/slapd/back-relay/init.c b/servers/slapd/back-relay/init.c
index 282fc3ed05f1d8e60ddb5f63dfec948c2b93ad12..c2434f5d153369200d6e6ef9b0e094ddee4f8d32 100644 (file)
--- a/servers/slapd/back-relay/init.c
+++ b/servers/slapd/back-relay/init.c
@@ -25,7 +25,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "back-relay.h"
 
 static ConfigDriver relay_back_cf;

diff --git a/servers/slapd/back-shell/config.c b/servers/slapd/back-shell/config.c
index 3b99e359cac7b1066c828764529c0629028e317b..44dc3f2f86bb7e59a767223f9574116a37c53e5c 100644 (file)
--- a/servers/slapd/back-shell/config.c
+++ b/servers/slapd/back-shell/config.c
@@ -37,7 +37,7 @@
 
 #include "slap.h"
 #include "shell.h"
-#include "config.h"
+#include "slap-config.h"
 
 static ConfigDriver shell_cf;
 

diff --git a/servers/slapd/back-shell/init.c b/servers/slapd/back-shell/init.c
index e60cd6e85a04338dc4471ebcde237fb11855f641..e97554985212fad2a987c217fec63aad49b353ca 100644 (file)
--- a/servers/slapd/back-shell/init.c
+++ b/servers/slapd/back-shell/init.c
@@ -36,7 +36,7 @@
 
 #include "slap.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 #include "shell.h"
 

diff --git a/servers/slapd/back-sock/config.c b/servers/slapd/back-sock/config.c
index a3402396307112a733a1ea3fd5acd1781191d014..15caaddc9a682a0ce4c35e97ea5defa1424ed3b6 100644 (file)
--- a/servers/slapd/back-sock/config.c
+++ b/servers/slapd/back-sock/config.c
@@ -26,7 +26,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "back-sock.h"
 
 static ConfigDriver bs_cf_gen;

diff --git a/servers/slapd/back-sql/config.c b/servers/slapd/back-sql/config.c
index 56baafb071354616f4531b3bc42de2eec064867f..52171ea6c2367ffc83c684e204af8dbe8f3a13e1 100644 (file)
--- a/servers/slapd/back-sql/config.c
+++ b/servers/slapd/back-sql/config.c
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "ldif.h"
 #include "lutil.h"
 #include "proto-sql.h"

diff --git a/servers/slapd/back-sql/init.c b/servers/slapd/back-sql/init.c
index 140e28ee724e564083d2181edb2b62e8e50062dc..120fe75c615a2a96ac6a18c08b84e6a8b67162ba 100644 (file)
--- a/servers/slapd/back-sql/init.c
+++ b/servers/slapd/back-sql/init.c
@@ -27,7 +27,7 @@
 #include "ac/string.h"
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "proto-sql.h"
 
 int

diff --git a/servers/slapd/back-wt/add.c b/servers/slapd/back-wt/add.c
index 639415d53e78d2fb0cc5dacff6b6e273e374cefb..5b9e83da3ea4e8d47e9e5120623218b897a1f10f 100644 (file)
--- a/servers/slapd/back-wt/add.c
+++ b/servers/slapd/back-wt/add.c
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 int
 wt_add( Operation *op, SlapReply *rs )

diff --git a/servers/slapd/back-wt/attr.c b/servers/slapd/back-wt/attr.c
index bdebea0d57e9348c9ba9415e2fc848782a378dcc..3aac12ff5e7d1723f905accdb9870e38d275978d 100644 (file)
--- a/servers/slapd/back-wt/attr.c
+++ b/servers/slapd/back-wt/attr.c
@@ -20,7 +20,7 @@
  */
 
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 /* Find the ad, return -1 if not found,
  * set point for insertion if ins is non-NULL

diff --git a/servers/slapd/back-wt/bind.c b/servers/slapd/back-wt/bind.c
index 18b4407cf14401e8e48ea33fc2236ec20b207ee4..c3908a161c5fd0badc9d2dbc6d79b3e2c8a3d96d 100644 (file)
--- a/servers/slapd/back-wt/bind.c
+++ b/servers/slapd/back-wt/bind.c
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 int
 wt_bind( Operation *op, SlapReply *rs )

diff --git a/servers/slapd/back-wt/compare.c b/servers/slapd/back-wt/compare.c
index 7d233d896386be64b1382e11a2974db97bf5080a..1d13af7406d5036cf54f5e89e4112725b55c030f 100644 (file)
--- a/servers/slapd/back-wt/compare.c
+++ b/servers/slapd/back-wt/compare.c
@@ -25,7 +25,7 @@
 #include <ac/string.h>
 
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 int
 wt_compare( Operation *op, SlapReply *rs )

diff --git a/servers/slapd/back-wt/config.c b/servers/slapd/back-wt/config.c
index 158344b7377e5d50ca3566bffb36c878b5cd29a3..ed8ef395c00d590a241015d9df5c2b71eb6cda6c 100644 (file)
--- a/servers/slapd/back-wt/config.c
+++ b/servers/slapd/back-wt/config.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <ac/string.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 #include "lutil.h"
 #include "ldap_rq.h"

diff --git a/servers/slapd/back-wt/ctx.c b/servers/slapd/back-wt/ctx.c
index 765e48cd30944e91b0f1a6deae24c78f208a29a7..6f09801d1e55b23773e432e3e1786dea9b45ba18 100644 (file)
--- a/servers/slapd/back-wt/ctx.c
+++ b/servers/slapd/back-wt/ctx.c
@@ -20,7 +20,7 @@
  */
 
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 wt_ctx *
 wt_ctx_init(struct wt_info *wi)

diff --git a/servers/slapd/back-wt/delete.c b/servers/slapd/back-wt/delete.c
index fe918cf4a3d5d8e381b62337870be05a952ad66e..20f06b2f1543c5b111f420b8a39137f05518174d 100644 (file)
--- a/servers/slapd/back-wt/delete.c
+++ b/servers/slapd/back-wt/delete.c
@@ -25,7 +25,7 @@
 #include <ac/string.h>
 
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 int
 wt_delete( Operation *op, SlapReply *rs )

diff --git a/servers/slapd/back-wt/dn2entry.c b/servers/slapd/back-wt/dn2entry.c
index f6e06e2d6a6b4cd24afbadd99aeb77857b633584..c180e44596947f923d36d00537d457556f84adb9 100644 (file)
--- a/servers/slapd/back-wt/dn2entry.c
+++ b/servers/slapd/back-wt/dn2entry.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <ac/string.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 /*
  * dn2entry - look up dn in the db and return the corresponding entry.

diff --git a/servers/slapd/back-wt/dn2id.c b/servers/slapd/back-wt/dn2id.c
index 5134fcc55df42fb5905cf12100753c783893a570..5251203a0ce2c61966114d75b79240c507a405ef 100644 (file)
--- a/servers/slapd/back-wt/dn2id.c
+++ b/servers/slapd/back-wt/dn2id.c
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 #include "idl.h"
 
 char *

diff --git a/servers/slapd/back-wt/id2entry.c b/servers/slapd/back-wt/id2entry.c
index 89970bfca8a6cd84fa22ea2f53d1f6db01e9d329..4240ac90a9337a049b9dfb97b1febf2e081bc30d 100644 (file)
--- a/servers/slapd/back-wt/id2entry.c
+++ b/servers/slapd/back-wt/id2entry.c
@@ -20,7 +20,7 @@
  */
 
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 static int wt_id2entry_put(
        Operation *op,

diff --git a/servers/slapd/back-wt/index.c b/servers/slapd/back-wt/index.c
index 39cc20254ba23ff7428ac194f48f86aa5558847f..06624591d3cf51b1c8ad39b5a06484fd38bff007 100644 (file)
--- a/servers/slapd/back-wt/index.c
+++ b/servers/slapd/back-wt/index.c
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 static char presence_keyval[] = {0,0};
 static struct berval presence_key = BER_BVC(presence_keyval);

diff --git a/servers/slapd/back-wt/init.c b/servers/slapd/back-wt/init.c
index a273b23bac7e4e16a36d8782d6e2e5dcdffebe45..015d8566a97683e18113ed48a84900f33199d9c5 100644 (file)
--- a/servers/slapd/back-wt/init.c
+++ b/servers/slapd/back-wt/init.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <ac/string.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 static int
 wt_db_init( BackendDB *be, ConfigReply *cr )

diff --git a/servers/slapd/back-wt/key.c b/servers/slapd/back-wt/key.c
index 58f95479ea806500cdb4ba10b0483eb3b04cd32c..4b5fd8d1845900e16040322d6ca68cf6a0c056b9 100644 (file)
--- a/servers/slapd/back-wt/key.c
+++ b/servers/slapd/back-wt/key.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <ac/string.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 #include "idl.h"
 
 /* read a key */

diff --git a/servers/slapd/back-wt/modify.c b/servers/slapd/back-wt/modify.c
index a2ad65830216292dada4a7a4bd7ca26bd5db4b33..3fa687a4732fb26ab15cdcf70754a6bf466e1f25 100644 (file)
--- a/servers/slapd/back-wt/modify.c
+++ b/servers/slapd/back-wt/modify.c
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 static struct berval scbva[] = {
        BER_BVC("glue"),

diff --git a/servers/slapd/back-wt/nextid.c b/servers/slapd/back-wt/nextid.c
index d40d245c5cde2fa6753794bbfecbb6843e1c4356..e2ae082654aee4212c70a8d35a7dc094121aba51 100644 (file)
--- a/servers/slapd/back-wt/nextid.c
+++ b/servers/slapd/back-wt/nextid.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <ac/string.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 int wt_next_id(BackendDB *be, ID *out){
     struct wt_info *wi = (struct wt_info *) be->be_private;

diff --git a/servers/slapd/back-wt/operational.c b/servers/slapd/back-wt/operational.c
index e85b2763a7656ae88dd6acc52e3ed060979d2b55..c5e843847185cdb5f60996b4ba45e227a54b7797 100644 (file)
--- a/servers/slapd/back-wt/operational.c
+++ b/servers/slapd/back-wt/operational.c
@@ -25,7 +25,7 @@
 #include <ac/string.h>
 
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 int
 wt_hasSubordinates(

diff --git a/servers/slapd/back-wt/tools.c b/servers/slapd/back-wt/tools.c
index bd5f2d7526936bef9c9b6a00288f77c32a040bd5..846edc091ae4ad90a55d2a89048df7a272433ad3 100644 (file)
--- a/servers/slapd/back-wt/tools.c
+++ b/servers/slapd/back-wt/tools.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <ac/string.h>
 #include "back-wt.h"
-#include "config.h"
+#include "slap-config.h"
 
 typedef struct dn_id {
     ID id;

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 2e2e5ea8a9fb12fd0631436020e6e3e0dfc06e47..324e0e44f073a35737a0341c06d19f131b39d17e 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 #include "lber_pvt.h"
 

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 1bd418022ffaf3bdf6fc23d746562d924c896bb6..64ba9e0797a2815549387ac3a05897f23b78061b 100644 (file)
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -36,7 +36,7 @@
 #define SLAPD_TOOLS
 #include "slap.h"
 #include "lutil.h"
-#include "config.h"
+#include "slap-config.h"
 
 typedef struct gluenode {
        BackendDB *gn_be;

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index 446babc25bb6e3723e1ba4416fda444a32327e70..100327a7ec4e7f30410df2db97fa199bd0309e57 100644 (file)
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -25,7 +25,7 @@
 
 #define SLAPD_TOOLS
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 static slap_overinst *overlays;
 

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 8f8cc484d650a24ca6d279498e3a531444cdceb2..d1974cce84d4a04e21443cbca0fe3b1c6b946d71 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -36,7 +36,7 @@
 #include <ldif.h>
 #include <lutil.h>
 
-#include "config.h"
+#include "slap-config.h"
 
 #define        CONFIG_RDN      "cn=config"
 #define        SCHEMA_RDN      "cn=schema"

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index cc5dd458f386020020a2431dc85048791d3ca362..f081de89dea8626f4eb60b469cb767523a5e68e1 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -49,7 +49,7 @@
 #include "lutil.h"
 #include "lutil_ldap.h"
 #include "ldif.h"
-#include "config.h"
+#include "slap-config.h"
 
 #ifdef _WIN32
 #define        LUTIL_ATOULX    lutil_atoullx

diff --git a/servers/slapd/oidm.c b/servers/slapd/oidm.c
index 3861b27ea30cdaeddc89d445482be7f7d058e052..c38ea9c1145d9f3be81b994a90b4a52d8db800d7 100644 (file)
--- a/servers/slapd/oidm.c
+++ b/servers/slapd/oidm.c
@@ -24,7 +24,7 @@
 
 #include "slap.h"
 #include "lutil.h"
-#include "config.h"
+#include "slap-config.h"
 
 static LDAP_STAILQ_HEAD(OidMacroList, OidMacro) om_list
        = LDAP_STAILQ_HEAD_INITIALIZER(om_list);

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index 3aa2979f9a43c0b90d601e7e8dde368e41877d48..2ef09ab5dbbe91135f9a68d89d1689182a0cf5e1 100644 (file)
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -29,7 +29,7 @@
 #include <ac/ctype.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 #include "ldap_rq.h"
 

diff --git a/servers/slapd/overlays/auditlog.c b/servers/slapd/overlays/auditlog.c
index aae7d913d933556da593c007da979e38e6167776..189229c84e0e805159bd4215a02e40079d2faba7 100644 (file)
--- a/servers/slapd/overlays/auditlog.c
+++ b/servers/slapd/overlays/auditlog.c
@@ -29,7 +29,7 @@
 #include <ac/ctype.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "ldif.h"
 
 typedef struct auditlog_data {

diff --git a/servers/slapd/overlays/autoca.c b/servers/slapd/overlays/autoca.c
index 4532d402be1b5daab33b2dc4acd11faf6c2a491b..1ab6ab07c12cadad1ae851573fd90fce823d77d7 100644 (file)
--- a/servers/slapd/overlays/autoca.c
+++ b/servers/slapd/overlays/autoca.c
@@ -30,7 +30,7 @@
 
 #include "lutil.h"
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>

diff --git a/servers/slapd/overlays/collect.c b/servers/slapd/overlays/collect.c
index 2de430afcc3553cd4177d78ee5e727b506d672f8..189c88c4ed4a47ccf5e21ffdf0b772cc31bb8b2d 100644 (file)
--- a/servers/slapd/overlays/collect.c
+++ b/servers/slapd/overlays/collect.c
@@ -29,7 +29,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #include "lutil.h"
 

diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c
index 4260b15b813b2a20d9e2fd5f82a318b1ca464b8d..d52372c4152b18f0eb77af0b4e722cf86995224b 100644 (file)
--- a/servers/slapd/overlays/constraint.c
+++ b/servers/slapd/overlays/constraint.c
@@ -29,7 +29,7 @@
 
 #include "lutil.h"
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 /*
  * This overlay limits the values which can be placed into an

diff --git a/servers/slapd/overlays/dds.c b/servers/slapd/overlays/dds.c
index 59f16ecee68f97405d52ba12e660e4537bafc1f5..4081813d42c5dea6b07b9ba5fee151be3178e8b6 100644 (file)
--- a/servers/slapd/overlays/dds.c
+++ b/servers/slapd/overlays/dds.c
@@ -31,7 +31,7 @@
 #include "lutil.h"
 #include "ldap_rq.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 #define        DDS_RF2589_MAX_TTL              (31557600)      /* 1 year + 6 hours */
 #define        DDS_RF2589_DEFAULT_TTL          (86400)         /* 1 day */

diff --git a/servers/slapd/overlays/deref.c b/servers/slapd/overlays/deref.c
index 2cbbe5228c635dd36feadb8383e937bb7040f590..4ee4822cf0923c04663772ac52141ab7fad667b3 100644 (file)
--- a/servers/slapd/overlays/deref.c
+++ b/servers/slapd/overlays/deref.c
@@ -29,7 +29,7 @@
 #include "ac/socket.h"
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #include "lutil.h"
 

diff --git a/servers/slapd/overlays/dyngroup.c b/servers/slapd/overlays/dyngroup.c
index 2562e93fa8017004cecc659b908486a2d8833136..2501bd258d384bf5910de9f0956e45cd6e979b5e 100644 (file)
--- a/servers/slapd/overlays/dyngroup.c
+++ b/servers/slapd/overlays/dyngroup.c
@@ -30,7 +30,7 @@
 
 #include "lutil.h"
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 /* This overlay extends the Compare operation to detect members of a
  * dynamic group. It has no effect on any other operations. It must

diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index 33278a3e7f667dd4275b70d2ef96701d69850248..4222f33bf64a216e353147f35a6d5899d3a9df23 100644 (file)
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -33,7 +33,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 
 static AttributeDescription *ad_dgIdentity, *ad_dgAuthz;

diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c
index 8e159bc2f3c3d3f55ac44927107829576e3e66ea..95c1d8d9bbc8e28e7c039dc079ce6139e452d13e 100644 (file)
--- a/servers/slapd/overlays/memberof.c
+++ b/servers/slapd/overlays/memberof.c
@@ -28,7 +28,7 @@
 #include "ac/socket.h"
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 
 /*

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 3566fe7702ebd2906ac4f111fbc90b0745fb7a2b..ca0feb0f983dbc6cd0c5867119abba7fef8fc33e 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -35,7 +35,7 @@
 
 #include "../back-monitor/back-monitor.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 /*
  * Control that allows to access the private DB

diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index dfa8b0dc1770ffbdd3eaace46ddcd75ed1cc297c..468b20583c55ca22ff116074cdad69b21a54f1b5 100644 (file)
--- a/servers/slapd/overlays/ppolicy.c
+++ b/servers/slapd/overlays/ppolicy.c
@@ -39,7 +39,7 @@
 #include <ac/time.h>
 #include <ac/string.h>
 #include <ac/ctype.h>
-#include "config.h"
+#include "slap-config.h"
 
 #ifndef MODULE_NAME_SZ
 #define MODULE_NAME_SZ 256

diff --git a/servers/slapd/overlays/refint.c b/servers/slapd/overlays/refint.c
index 5cd4799c45cd42723aba9765ce328eb83c5ec97a..838147432cb2f1799e297cd3ad6fce35db70583b 100644 (file)
--- a/servers/slapd/overlays/refint.c
+++ b/servers/slapd/overlays/refint.c
@@ -38,7 +38,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "ldap_rq.h"
 
 static slap_overinst refint;

diff --git a/servers/slapd/overlays/retcode.c b/servers/slapd/overlays/retcode.c
index 6512be3a10c61449129b4574ad3aee1de85f9d40..488aefd43e577f1595d93d4c7fd780c95ba91d46 100644 (file)
--- a/servers/slapd/overlays/retcode.c
+++ b/servers/slapd/overlays/retcode.c
@@ -31,7 +31,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 #include "ldif.h"
 

diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index 3749feaffa6034de52fac710400575aedae68502..00ff2606c7b599d6eb9ae49e319577418af0ac48 100644 (file)
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -24,7 +24,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 #include "rwm.h"
 

diff --git a/servers/slapd/overlays/seqmod.c b/servers/slapd/overlays/seqmod.c
index 1a0418fabd9bb932d417262a4712b541c2488e82..a24879b2daa57866c18d94793fbbc0b352b93c60 100644 (file)
--- a/servers/slapd/overlays/seqmod.c
+++ b/servers/slapd/overlays/seqmod.c
@@ -22,7 +22,7 @@
 #ifdef SLAPD_OVER_SEQMOD
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 /* This overlay serializes concurrent attempts to modify a single entry */
 

diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c
index 07d6bbfd4251f394ec5f099a91a411672a163520..a06d22039013ad1be6b5733f7ff09fc01fa8b3ff 100644 (file)
--- a/servers/slapd/overlays/sssvlv.c
+++ b/servers/slapd/overlays/sssvlv.c
@@ -33,7 +33,7 @@
 
 #include "slap.h"
 #include "lutil.h"
-#include "config.h"
+#include "slap-config.h"
 
 #include "../../../libraries/liblber/lber-int.h"       /* ber_rewind */
 

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 0935e6e3ba5cc6af1f15f2640df80ca737c1e853..328bafaa8274bd4a502c29c6872c33d074567204 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -25,7 +25,7 @@
 #include <ac/string.h>
 #include "lutil.h"
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "ldap_rq.h"
 
 #ifdef LDAP_DEVEL

diff --git a/servers/slapd/overlays/translucent.c b/servers/slapd/overlays/translucent.c
index 60fa091bfaa37f03ae31e08ccc2e83a81893074b..e7481fa1e6a6c9129bbddd033b4b3ab5dc2ede7b 100644 (file)
--- a/servers/slapd/overlays/translucent.c
+++ b/servers/slapd/overlays/translucent.c
@@ -31,7 +31,7 @@
 #include "slap.h"
 #include "lutil.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 /* config block */
 typedef struct translucent_info {

diff --git a/servers/slapd/overlays/unique.c b/servers/slapd/overlays/unique.c
index 12442c7aaa3b103f2c36047cb87b3b28a802b930..e8efb9fc8f6b06ab63727d06b77f07a3931b2b70 100644 (file)
--- a/servers/slapd/overlays/unique.c
+++ b/servers/slapd/overlays/unique.c
@@ -31,7 +31,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #define UNIQUE_DEFAULT_URI ("ldap:///??sub")
 

diff --git a/servers/slapd/overlays/valsort.c b/servers/slapd/overlays/valsort.c
index b4f6fdb2e0ef15fd3ce4b680ef7519f856b95b5c..e47eec10a9bf4fd66077219dba863bae4487f8d7 100644 (file)
--- a/servers/slapd/overlays/valsort.c
+++ b/servers/slapd/overlays/valsort.c
@@ -33,7 +33,7 @@
 #include <ac/ctype.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 
 #define        VALSORT_ASCEND  0

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 998ae4a5d1f0379fea8f278a4f8d1f110d8a9100..7df070b7410c973653fccbb45f59a29053d3813b 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -31,8 +31,8 @@
 
 LDAP_BEGIN_DECL
 
-struct config_args_s;  /* config.h */
-struct config_reply_s; /* config.h */
+struct config_args_s;  /* slap-config.h */
+struct config_reply_s; /* slap-config.h */
 
 /*
  * aci.c

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 2a926d589db5725cbfdbd97c7f1095b7039b41a9..e66b4787f6f5773f61f61713ea9a26dea52ae8b9 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -28,7 +28,7 @@
 #include "slap.h"
 
 #include "lutil.h"
-#include "config.h"
+#include "slap-config.h"
 
 #define SASLREGEX_REPLACE 10
 

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 0b604f4e7e8198a1b0749134a3a0cc3e5514728e..3ac759cf4c668163e87a796890e66adddc922c9d 100644 (file)
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -24,7 +24,7 @@
 
 #include "slap.h"
 #include "ldap_schema.h"
-#include "config.h"
+#include "slap-config.h"
 
 static void            oc_usage(void); 
 static void            at_usage(void);

diff --git a/servers/slapd/config.h b/servers/slapd/slap-config.h
similarity index 99%
rename from servers/slapd/config.h
rename to servers/slapd/slap-config.h
index 01ea824bb8279f99c99fe50b22a2aa561d349ac1..a42a21f599245d579e59e1f8a2b0de389bdaa496 100644 (file)
--- a/servers/slapd/config.h
+++ b/servers/slapd/slap-config.h
@@ -1,4 +1,4 @@
-/* config.h - configuration abstraction structure */
+/* slap-config.h - configuration abstraction structure */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 90109f81917415f1a580f8317245bd800e6f49ad..41b400889320f6f452ee407838208c4fe5f42ce2 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1786,7 +1786,7 @@ LDAP_TAILQ_HEAD( be_pcl, slap_csn_entry );
 #define        SLAP_MAX_CIDS   32      /* Maximum number of supported controls */
 #endif
 
-struct ConfigOCs;      /* config.h */
+struct ConfigOCs;      /* slap-config.h */
 
 struct BackendDB {
        BackendInfo     *bd_info;       /* pointer to shared backend info */
@@ -2007,7 +2007,7 @@ typedef int (BI_config) LDAP_P((BackendInfo *bi,
        const char *fname, int lineno,
        int argc, char **argv));
 
-typedef struct config_reply_s ConfigReply; /* config.h */
+typedef struct config_reply_s ConfigReply; /* slap-config.h */
 typedef int (BI_db_func) LDAP_P((Backend *bd, ConfigReply *cr));
 typedef BI_db_func BI_db_init;
 typedef BI_db_func BI_db_open;

diff --git a/servers/slapd/slapi/plugin.c b/servers/slapd/slapi/plugin.c
index 65055516a0c97c002f0e13cb462c06789e4ecef2..a0cb5fdb116986d984630e8aa5636b66896ae93f 100644 (file)
--- a/servers/slapd/slapi/plugin.c
+++ b/servers/slapd/slapi/plugin.c
@@ -23,7 +23,7 @@
 #include "portable.h"
 #include "ldap_pvt_thread.h"
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "slapi.h"
 #include "lutil.h"
 

diff --git a/servers/slapd/slapi/slapi_overlay.c b/servers/slapd/slapi/slapi_overlay.c
index 1b124b67f4e44dc29e33417f3e561c7b9e5c15bf..02c6b274694af1bfe2c865d8b527b6f653c49fbc 100644 (file)
--- a/servers/slapd/slapi/slapi_overlay.c
+++ b/servers/slapd/slapi/slapi_overlay.c
@@ -27,7 +27,7 @@
 
 #include "slap.h"
 #include "slapi.h"
-#include "config.h"
+#include "slap-config.h"
 
 #ifdef LDAP_SLAPI
 

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 4ee32038903a61901a0ea081b9e0bde198bf244a..129a14d24d16ca620c7e15326c6041b2020dde51 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -27,7 +27,7 @@
 #include "slap.h"
 #include "lutil_ldap.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 #include "ldap_rq.h"