summaryrefslogtreecommitdiffstats
path: root/debian/patches/wrong-database-location
blob: 3900a0e290eb932150553b15d6339280b7cd9bb4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
Move the default slapd database location to /var/lib/ldap instead of
/var/openldap-data.

Debian-specific.

Index: openldap/doc/man/man5/slapd.conf.5
===================================================================
--- openldap.orig/doc/man/man5/slapd.conf.5	2022-05-20 17:36:10.817244990 -0400
+++ openldap/doc/man/man5/slapd.conf.5	2022-05-20 17:36:10.813244986 -0400
@@ -2122,7 +2122,7 @@
 # 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
Index: openldap/include/ldap_defaults.h
===================================================================
--- openldap.orig/include/ldap_defaults.h	2022-05-20 17:36:10.817244990 -0400
+++ openldap/include/ldap_defaults.h	2022-05-20 17:36:10.813244986 -0400
@@ -54,7 +54,7 @@
 #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"
+#define SLAPD_DEFAULT_DB_DIR		LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "ldap"
 #endif
 #define SLAPD_DEFAULT_DB_MODE		0600
 	/* default max deref depth for aliases */
Index: openldap/servers/slapd/Makefile.in
===================================================================
--- openldap.orig/servers/slapd/Makefile.in	2022-05-20 17:36:10.817244990 -0400
+++ openldap/servers/slapd/Makefile.in	2022-05-20 17:36:10.813244986 -0400
@@ -452,9 +452,9 @@
 
 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
 
Index: openldap/doc/man/man5/slapd-config.5
===================================================================
--- openldap.orig/doc/man/man5/slapd-config.5	2022-05-20 17:36:10.817244990 -0400
+++ openldap/doc/man/man5/slapd-config.5	2022-05-20 17:36:10.813244986 -0400
@@ -2233,7 +2233,7 @@
 # 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
Index: openldap/doc/man/man5/slapd-mdb.5
===================================================================
--- openldap.orig/doc/man/man5/slapd-mdb.5	2022-05-20 17:36:10.817244990 -0400
+++ openldap/doc/man/man5/slapd-mdb.5	2022-05-20 17:36:10.813244986 -0400
@@ -63,7 +63,7 @@
 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.