wrong-database-location

Move the default slapd database location to /var/lib/ldap instead of
/var/openldap-data.

Debian-specific.

Gbp-Pq: Name wrong-database-location

diff --git a/doc/man/man5/slapd-bdb.5 b/doc/man/man5/slapd-bdb.5
index 3c8ad9c4ea5f9c15ee39538cfd82934110768f93..dbb21d2c7bd36ea62b34875f82fa228d559cc8f5 100644 (file)
--- a/doc/man/man5/slapd-bdb.5
+++ b/doc/man/man5/slapd-bdb.5
@@ -135,7 +135,7 @@ Specify the directory where the BDB files containing this database and
 associated indexes live.
 A separate directory must be specified for each database.
 The default is
-.BR LOCALSTATEDIR/openldap\-data .
+.BR LOCALSTATEDIR/lib/ldap .
 .TP
 .B dirtyread
 Allow reads of modified but not yet committed data.

diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
index 184fa17d0a741c3d7149e9cc95b7567a83768ee1..5a04841273853bde0e8d5f7877bb9439e398012f 100644 (file)
--- a/doc/man/man5/slapd-config.5
+++ b/doc/man/man5/slapd-config.5
@@ -2071,7 +2071,7 @@ olcSuffix: "dc=our\-domain,dc=com"
 # The database directory MUST exist prior to
 # running slapd AND should only be accessible
 # by the slapd/tools. Mode 0700 recommended.
-olcDbDirectory: LOCALSTATEDIR/openldap\-data
+olcDbDirectory: LOCALSTATEDIR/lib/ldap
 # Indices to maintain
 olcDbIndex:     objectClass  eq
 olcDbIndex:     cn,sn,mail   pres,eq,approx,sub

diff --git a/doc/man/man5/slapd-mdb.5 b/doc/man/man5/slapd-mdb.5
index 62146b088ac8647ab6669d14768f1257cf4aca87..db2f37accdcf9ddca2adacad00c4da6ad48a3d03 100644 (file)
--- a/doc/man/man5/slapd-mdb.5
+++ b/doc/man/man5/slapd-mdb.5
@@ -53,7 +53,7 @@ Specify the directory where the LMDB files containing this database and
 associated indexes live.
 A separate directory must be specified for each database.
 The default is
-.BR LOCALSTATEDIR/openldap\-data .
+.BR LOCALSTATEDIR/lib/ldap .
 .TP
 \fBenvflags \fR{\fBnosync\fR,\fBnometasync\fR,\fBwritemap\fR,\fBmapasync\fR,\fBnordahead\fR}
 Specify flags for finer-grained control of the LMDB library's operation.

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 38e6b2c24156997fa43ab7d6259616de167e808b..c53525fb73d76c36289d8798ef013155fbb551eb 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -2041,7 +2041,7 @@ suffix    "dc=our\-domain,dc=com"
 # The database directory MUST exist prior to
 # running slapd AND should only be accessible
 # by the slapd/tools. Mode 0700 recommended.
-directory LOCALSTATEDIR/openldap\-data
+directory LOCALSTATEDIR/lib/ldap
 # Indices to maintain
 index     objectClass  eq
 index     cn,sn,mail   pres,eq,approx,sub

diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h
index e083392d811fb74d80df4d432694af7a1b88c289..fca8d3a8789a1ab2dcb33f515167c9c48bd936d5 100644 (file)
--- a/include/ldap_defaults.h
+++ b/include/ldap_defaults.h
@@ -47,7 +47,7 @@
        /* location of the default slapd config file */
 #define SLAPD_DEFAULT_CONFIGFILE       LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
 #define SLAPD_DEFAULT_CONFIGDIR                LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d"
-#define SLAPD_DEFAULT_DB_DIR           LDAP_RUNDIR LDAP_DIRSEP "openldap-data"
+#define SLAPD_DEFAULT_DB_DIR           LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "ldap"
 #define SLAPD_DEFAULT_DB_MODE          0600
 #define SLAPD_DEFAULT_UCDATA           LDAP_DATADIR LDAP_DIRSEP "ucdata"
        /* default max deref depth for aliases */

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index b20564d60b8623746a0c831f2b6ae274e52fb1d5..a4efa0af939f8423a39bcbae0676162e8bd5a82d 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -445,9 +445,9 @@ install-conf: FORCE
 
 install-db-config: FORCE
        @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
-       @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
+       @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/ldap
        $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
-               $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
+               $(DESTDIR)$(localstatedir)/lib/ldap/DB_CONFIG.example
        $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
                $(DESTDIR)$(sysconfdir)/DB_CONFIG.example