From d1288c2fa9f9ebda9acf23e67ad31135c488badd Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 17 Sep 1998 03:38:36 +0000 Subject: [PATCH] Use ldapconfig.h instead of hardcoded paths. --- servers/slapd/tools/ldif2id2children.c | 5 +++-- servers/slapd/tools/ldif2id2entry.c | 5 +++-- servers/slapd/tools/ldif2index.c | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/servers/slapd/tools/ldif2id2children.c b/servers/slapd/tools/ldif2id2children.c index 3267c211f9..0bb8e5ec6d 100644 --- a/servers/slapd/tools/ldif2id2children.c +++ b/servers/slapd/tools/ldif2id2children.c @@ -5,7 +5,8 @@ #include "../slap.h" #include "../back-ldbm/back-ldbm.h" -#define DEFAULT_CONFIGFILE "/usr/local/etc/slapd.conf" +#include "ldapconfig.h" + #define MAXARGS 100 extern struct dbcache *ldbm_cache_open(); @@ -69,7 +70,7 @@ main( int argc, char **argv ) Avlnode *avltypes = NULL; extern char *optarg; - tailorfile = DEFAULT_CONFIGFILE; + tailorfile = SLAPD_DEFAULT_CONFIGFILE; dbnum = -1; while ( (i = getopt( argc, argv, "d:f:i:n:" )) != EOF ) { switch ( i ) { diff --git a/servers/slapd/tools/ldif2id2entry.c b/servers/slapd/tools/ldif2id2entry.c index be25c22644..ec2bf27279 100644 --- a/servers/slapd/tools/ldif2id2entry.c +++ b/servers/slapd/tools/ldif2id2entry.c @@ -5,7 +5,8 @@ #include "../slap.h" #include "../back-ldbm/back-ldbm.h" -#define DEFAULT_CONFIGFILE "/usr/local/etc/slapd.conf" +#include "ldapconfig.h" + #define MAXARGS 100 extern struct dbcache *ldbm_cache_open(); @@ -65,7 +66,7 @@ main( int argc, char **argv ) FILE *fp; extern char *optarg; - tailorfile = DEFAULT_CONFIGFILE; + tailorfile = SLAPD_DEFAULT_CONFIGFILE; dbnum = -1; while ( (i = getopt( argc, argv, "d:f:i:n:" )) != EOF ) { switch ( i ) { diff --git a/servers/slapd/tools/ldif2index.c b/servers/slapd/tools/ldif2index.c index 31d5701ac9..dd03f3dc78 100644 --- a/servers/slapd/tools/ldif2index.c +++ b/servers/slapd/tools/ldif2index.c @@ -4,7 +4,8 @@ #include #include "../slap.h" -#define DEFAULT_CONFIGFILE "/usr/local/etc/slapd.conf" +#include "ldapconfig.h" + #define MAXARGS 100 extern void attr_index_config(); @@ -59,7 +60,7 @@ main( int argc, char **argv ) extern char *optarg; inputfile = NULL; - tailorfile = DEFAULT_CONFIGFILE; + tailorfile = SLAPD_DEFAULT_CONFIGFILE; dbnum = -1; while ( (i = getopt( argc, argv, "d:f:i:n:" )) != EOF ) { switch ( i ) { -- 2.39.5