You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
92 lines
3.3 KiB
92 lines
3.3 KiB
Index: include/ac/fdset.h |
|
--- include/ac/fdset.h.orig 2024-05-21 19:19:11.000000000 +0200 |
|
+++ include/ac/fdset.h 2025-01-02 13:29:05.939731000 +0100 |
|
@@ -22,6 +22,13 @@ |
|
#ifndef _AC_FDSET_H |
|
#define _AC_FDSET_H |
|
|
|
+#if defined(HAVE_SYS_TYPES_H) |
|
+#include <sys/types.h> |
|
+#endif |
|
+#if defined(HAVE_SYS_SELECT_H) |
|
+#include <sys/select.h> |
|
+#endif |
|
+ |
|
#if !defined( OPENLDAP_FD_SETSIZE ) && !defined( FD_SETSIZE ) |
|
# define OPENLDAP_FD_SETSIZE 4096 |
|
#endif |
|
Index: include/ldap_defaults.h |
|
--- include/ldap_defaults.h.orig 2024-05-21 19:19:11.000000000 +0200 |
|
+++ include/ldap_defaults.h 2025-01-02 13:29:05.939807000 +0100 |
|
@@ -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 "data" |
|
#endif |
|
#define SLAPD_DEFAULT_DB_MODE 0600 |
|
/* default max deref depth for aliases */ |
|
Index: include/ldap_int_thread.h |
|
--- include/ldap_int_thread.h.orig 2024-05-21 19:19:11.000000000 +0200 |
|
+++ include/ldap_int_thread.h 2025-01-02 13:29:05.939882000 +0100 |
|
@@ -82,6 +82,7 @@ |
|
* * |
|
***********************************/ |
|
|
|
+#define _POSIX_PTHREAD_SEMANTICS |
|
#define PTH_SYSCALL_SOFT 1 |
|
#include <pth.h> |
|
|
|
Index: servers/slapd/Makefile.in |
|
--- servers/slapd/Makefile.in.orig 2024-05-21 19:19:11.000000000 +0200 |
|
+++ servers/slapd/Makefile.in 2025-01-02 13:33:50.390155000 +0100 |
|
@@ -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)/data |
|
$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ |
|
- $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example |
|
+ $(DESTDIR)$(localstatedir)/data/DB_CONFIG.example |
|
$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ |
|
$(DESTDIR)$(sysconfdir)/DB_CONFIG.example |
|
|
|
Index: servers/slapd/back-perl/config.c |
|
--- servers/slapd/back-perl/config.c.orig 2024-05-21 19:19:11.000000000 +0200 |
|
+++ servers/slapd/back-perl/config.c 2025-01-02 13:29:05.940056000 +0100 |
|
@@ -175,6 +175,9 @@ |
|
PERL_SET_CONTEXT( PERL_INTERPRETER ); |
|
switch( c->type ) { |
|
case PERL_MODULE: |
|
+ if (c->argc > 2) |
|
+ snprintf( eval_str, EVAL_BUF_SIZE, "require \"%s\";", c->argv[2] ); |
|
+ else |
|
snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", c->argv[1] ); |
|
eval_pv( eval_str, 0 ); |
|
|
|
Index: servers/slapd/slapd.conf |
|
--- servers/slapd/slapd.conf.orig 2024-05-21 19:19:11.000000000 +0200 |
|
+++ servers/slapd/slapd.conf 2025-01-02 13:29:05.940120000 +0100 |
|
@@ -69,7 +69,7 @@ |
|
# The database directory MUST exist prior to running slapd AND |
|
# should only be accessible by the slapd and slap tools. |
|
# Mode 700 recommended. |
|
-directory %LOCALSTATEDIR%/openldap-data |
|
+directory %LOCALSTATEDIR%/data |
|
# Indices to maintain |
|
index objectClass eq |
|
|
|
Index: servers/slapd/slapd.ldif |
|
--- servers/slapd/slapd.ldif.orig 2024-05-21 19:19:11.000000000 +0200 |
|
+++ servers/slapd/slapd.ldif 2025-01-02 13:29:05.940179000 +0100 |
|
@@ -88,7 +88,7 @@ |
|
# The database directory MUST exist prior to running slapd AND |
|
# should only be accessible by the slapd and slap tools. |
|
# Mode 700 recommended. |
|
-olcDbDirectory: %LOCALSTATEDIR%/openldap-data |
|
+olcDbDirectory: %LOCALSTATEDIR%/data |
|
# Indices to maintain |
|
olcDbIndex: objectClass eq |
|
|
|
|