From 0e223d0593867b095b28c86da45639ef71fb4a20 Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Wed, 20 Jan 2021 14:05:01 +0100 Subject: [PATCH] Recover 2.6 version of the patch --- ldap/patchs/slapd.conf.patch | 44 ++++++++---------------------------- 1 file changed, 10 insertions(+), 34 deletions(-) diff --git a/ldap/patchs/slapd.conf.patch b/ldap/patchs/slapd.conf.patch index 7603410..8b50562 100644 --- a/ldap/patchs/slapd.conf.patch +++ b/ldap/patchs/slapd.conf.patch @@ -1,50 +1,26 @@ --- distrib/slapd.conf 2019-06-04 11:18:04.000000000 +0200 -+++ modif/slapd.conf 2021-01-12 11:06:19.496162295 +0100 -@@ -23,11 +23,19 @@ ++++ modif/slapd.conf 2020-03-24 09:10:44.724586266 +0100 +@@ -23,6 +23,7 @@ %elif %%ldap_schema == 'zephir' include /etc/ldap/schema/openldap.schema %end if +include /etc/ldap/schema/cadoles.schema - + ## Support du TLS -+%if %%cert_type == "manuel" -+TLSCertificateFile %%server_cert -+TLSCertificateKeyFile %%server_key -+TLSCACertificateFile %%server_pem -+%else TLSCertificateFile /etc/ldap/ssl/certs/openldap.crt - TLSCertificateKeyFile /etc/ldap/ssl/private/openldap.key - TLSCACertificateFile /etc/ssl/certs/ca.crt -+%end if -+ - TLSVerifyClient never - TLSCipherSuite SECURE256:+SIGN-ALL:-VERS-SSL3.0:!AES-128-CBC:!3DES-CBC:!DES-CBC:!ARCFOUR-128:!ARCFOUR-40:!RC2-40:!CAMELLIA-128-CBC:!NULL - -@@ -46,6 +54,7 @@ +@@ -46,6 +47,7 @@ %if %%ldap_replication == 'oui' or %%ldap_replication_client == 'oui' moduleload syncprov %end if +moduleload memberof - + # Sample security restrictions # Require integrity protection (prevent hijacking) -@@ -80,6 +89,7 @@ - - # compatibilite EAD1 et appli PHP - allow bind_v2 -+allow bind_anon_dn - - database bdb - # The base of your directory -@@ -216,6 +226,10 @@ - syncprov-sessionlog 100 - %end if - -+overlay memberof -+memberof-group-oc cadolesGroup -+memberof-member-ad cadolesMember -+ +@@ -219,3 +221,7 @@ %if %%ldap_replication_client == 'oui' include /etc/ldap/replication.conf %end if - ++ ++overlay memberof ++memberof-group-oc cadolesGroup ++memberof-member-ad cadolesMember