1 files changed, 0 insertions, 74 deletions

diff --git a/recipes-support/openldap/openldap-2.4.39/wrong-database-location.patch b/recipes-support/openldap/openldap-2.4.39/wrong-database-location.patch
deleted file mode 100644
index 25d96cb..0000000
--- a/recipes-support/openldap/openldap-2.4.39/wrong-database-location.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Move the default slapd database location to /var/lib/ldap instead of
-/var/openldap-data.
-
-Debian-specific.
-
---- a/doc/man/man5/slapd-bdb.5
-+++ b/doc/man/man5/slapd-bdb.5
-@@ -131,7 +131,7 @@ Specify the directory where the BDB file
- 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.
---- a/doc/man/man5/slapd.conf.5
-+++ b/doc/man/man5/slapd.conf.5
-@@ -2007,7 +2007,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
---- 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 */
---- 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
- 
---- a/doc/man/man5/slapd-config.5
-+++ b/doc/man/man5/slapd-config.5
-@@ -2051,7 +2051,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
---- a/doc/man/man5/slapd-mdb.5
-+++ b/doc/man/man5/slapd-mdb.5
-@@ -52,7 +52,7 @@ Specify the directory where the LMDB fil
- 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.