mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-20 22:59:34 -05:00
Use ldapconfig.h instead of hardcoded paths.
This commit is contained in:
parent
c246205958
commit
d1288c2fa9
3 changed files with 9 additions and 6 deletions
|
|
@ -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 )
|
||||||
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 ) {
|
||||||
|
|
|
||||||
|
|
@ -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 )
|
||||||
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 ) {
|
||||||
|
|
|
||||||
|
|
@ -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 )
|
||||||
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 ) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue