Use ldapconfig.h instead of hardcoded paths.

diff --git a/servers/slapd/tools/ldif2id2children.c b/servers/slapd/tools/ldif2id2children.c
index 3267c211f90263719e9aa259a7dbe821c5915a7f..0bb8e5ec6d0ebd0d8c38d2815024df37f3131bbf 100644 (file)
--- 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 be25c22644ba00590506c9e5c5b773ee0374ab46..ec2bf272797d167a761c8d55c874086dc0d49ced 100644 (file)
--- 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 31d5701ac9f4672b0b7779a37ed78304fd12195b..dd03f3dc7821cec1ff481bd98eabce04a860d85a 100644 (file)
--- a/servers/slapd/tools/ldif2index.c
+++ b/servers/slapd/tools/ldif2index.c
@@ -4,7 +4,8 @@
 #include <sys/socket.h>
 #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 ) {