Skip to content
Snippets Groups Projects
Commit d1288c2f authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Use ldapconfig.h instead of hardcoded paths.

parent c2462059
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
servers/slapd/tools/ldif2id2children.c
+ 3
− 2
View file @ d1288c2f
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
#include "../slap.h" #include "../slap.h"
#include "../back-ldbm/back-ldbm.h" #include "../back-ldbm/back-ldbm.h"
#define DEFAULT_CONFIGFILE "/usr/local/etc/slapd.conf" #include "ldapconfig.h"
#define MAXARGS 100 #define MAXARGS 100
extern struct dbcache *ldbm_cache_open(); extern struct dbcache *ldbm_cache_open();
...@@ -69,7 +70,7 @@ main( int argc, char **argv ) ...@@ -69,7 +70,7 @@ main( int argc, char **argv )
Avlnode *avltypes = NULL; Avlnode *avltypes = NULL;
extern char *optarg; extern char *optarg;
tailorfile = DEFAULT_CONFIGFILE; tailorfile = SLAPD_DEFAULT_CONFIGFILE;
dbnum = -1; dbnum = -1;
while ( (i = getopt( argc, argv, "d:f:i:n:" )) != EOF ) { while ( (i = getopt( argc, argv, "d:f:i:n:" )) != EOF ) {
switch ( i ) { switch ( i ) {
......
servers/slapd/tools/ldif2id2entry.c
+ 3
− 2
View file @ d1288c2f
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
#include "../slap.h" #include "../slap.h"
#include "../back-ldbm/back-ldbm.h" #include "../back-ldbm/back-ldbm.h"
#define DEFAULT_CONFIGFILE "/usr/local/etc/slapd.conf" #include "ldapconfig.h"
#define MAXARGS 100 #define MAXARGS 100
extern struct dbcache *ldbm_cache_open(); extern struct dbcache *ldbm_cache_open();
...@@ -65,7 +66,7 @@ main( int argc, char **argv ) ...@@ -65,7 +66,7 @@ main( int argc, char **argv )
FILE *fp; FILE *fp;
extern char *optarg; extern char *optarg;
tailorfile = DEFAULT_CONFIGFILE; tailorfile = SLAPD_DEFAULT_CONFIGFILE;
dbnum = -1; dbnum = -1;
while ( (i = getopt( argc, argv, "d:f:i:n:" )) != EOF ) { while ( (i = getopt( argc, argv, "d:f:i:n:" )) != EOF ) {
switch ( i ) { switch ( i ) {
......
servers/slapd/tools/ldif2index.c
+ 3
− 2
View file @ d1288c2f
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
#include <sys/socket.h> #include <sys/socket.h>
#include "../slap.h" #include "../slap.h"
#define DEFAULT_CONFIGFILE "/usr/local/etc/slapd.conf" #include "ldapconfig.h"
#define MAXARGS 100 #define MAXARGS 100
extern void attr_index_config(); extern void attr_index_config();
...@@ -59,7 +60,7 @@ main( int argc, char **argv ) ...@@ -59,7 +60,7 @@ main( int argc, char **argv )
extern char *optarg; extern char *optarg;
inputfile = NULL; inputfile = NULL;
tailorfile = DEFAULT_CONFIGFILE; tailorfile = SLAPD_DEFAULT_CONFIGFILE;
dbnum = -1; dbnum = -1;
while ( (i = getopt( argc, argv, "d:f:i:n:" )) != EOF ) { while ( (i = getopt( argc, argv, "d:f:i:n:" )) != EOF ) {
switch ( i ) { switch ( i ) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment