ITS#9675 - Allow overriding default location paths

To the ldapi socket, config file, config directory,
and database directory.

diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h
index 834c0014766291c2d0f95a8b163067fc1117e26b..c8632d7dcecbea48fc7c78b5045285f4a215cf2c 100644 (file)
--- a/include/ldap_defaults.h
+++ b/include/ldap_defaults.h
@@ -39,17 +39,24 @@
 #define LDAP_ENV_PREFIX "LDAP"
 
 /* default ldapi:// socket */
+#ifndef LDAPI_SOCK
 #define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
+#endif
 
 /*
  * SLAPD DEFINITIONS
  */
        /* location of the default slapd config file */
+#ifndef SLAPD_DEFAULT_CONFIGFILE
 #define SLAPD_DEFAULT_CONFIGFILE       LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
+#endif
+#ifndef SLAPD_DEFAULT_CONFIGDIR
 #define SLAPD_DEFAULT_CONFIGDIR                LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d"
+#endif
+#ifndef SLAPD_DEFAULT_DB_DIR
 #define SLAPD_DEFAULT_DB_DIR           LDAP_RUNDIR LDAP_DIRSEP "openldap-data"
+#endif
 #define SLAPD_DEFAULT_DB_MODE          0600
-#define SLAPD_DEFAULT_UCDATA           LDAP_DATADIR LDAP_DIRSEP "ucdata"
        /* default max deref depth for aliases */
 #define SLAPD_DEFAULT_MAXDEREFDEPTH    15
        /* default sizelimit on number of entries from a search */