From 3a12800d4a290c754d43b8cc741696954036dafe Mon Sep 17 00:00:00 2001 From: Debian OpenLDAP Maintainers Date: Mon, 23 May 2022 18:14:53 +0100 Subject: [PATCH] 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 --- doc/man/man5/slapd-config.5 | 2 +- doc/man/man5/slapd-mdb.5 | 2 +- doc/man/man5/slapd.conf.5 | 2 +- include/ldap_defaults.h | 2 +- servers/slapd/Makefile.in | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5 index d4023401..8a9dfbae 100644 --- a/doc/man/man5/slapd-config.5 +++ b/doc/man/man5/slapd-config.5 @@ -2205,7 +2205,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 a6bb77ce..ed7df5d5 100644 --- a/doc/man/man5/slapd-mdb.5 +++ b/doc/man/man5/slapd-mdb.5 @@ -63,7 +63,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 6ec19c51..e28d9992 100644 --- a/doc/man/man5/slapd.conf.5 +++ b/doc/man/man5/slapd.conf.5 @@ -2095,7 +2095,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 868e46dc..3822c548 100644 --- 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 2fc46dda..404b2e2b 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -452,9 +452,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 -- 2.30.2