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

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

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
 

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"

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"

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"

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"
 

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

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

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"

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>

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 = {

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;

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;
 

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() */

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,

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"

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"),

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;
 

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"

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"
 

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
 

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;

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;

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;

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,

servers/slapd/back-perl/close.c

@@ -16,7 +16,7 @@
  */
 
 #include "perl_back.h"
-#include "../config.h"
+#include "../slap-config.h"
 /**********************************************************
  *
  * Close

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;
 

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 */

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;

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;
 

servers/slapd/back-shell/init.c

@@ -36,7 +36,7 @@
 
 #include "slap.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 #include "shell.h"
 

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;

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"

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

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 )

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

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 )

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 )

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"

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)

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 )

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.

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 *

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,

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);

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 )

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 */

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"),

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;

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(

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;

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"
 

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;

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;
 

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"

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

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);

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"
 

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 {

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>

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"
 

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

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 */

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"
 

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

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;

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"
 
 /*

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

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

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;

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"
 

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"
 

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 */
 

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 */
 

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

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 {

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")
 

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

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

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
 

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);

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/>.
  *

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;

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"
 

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
 

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"