Recover 2.6 version of the patch

This commit is contained in:
Philippe Caseiro 2021-01-20 14:05:01 +01:00
parent 362e1e3e17
commit 0e223d0593

View File

@ -1,50 +1,26 @@
--- distrib/slapd.conf 2019-06-04 11:18:04.000000000 +0200 --- distrib/slapd.conf 2019-06-04 11:18:04.000000000 +0200
+++ modif/slapd.conf 2021-01-12 11:06:19.496162295 +0100 +++ modif/slapd.conf 2020-03-24 09:10:44.724586266 +0100
@@ -23,11 +23,19 @@ @@ -23,6 +23,7 @@
%elif %%ldap_schema == 'zephir' %elif %%ldap_schema == 'zephir'
include /etc/ldap/schema/openldap.schema include /etc/ldap/schema/openldap.schema
%end if %end if
+include /etc/ldap/schema/cadoles.schema +include /etc/ldap/schema/cadoles.schema
## Support du TLS ## Support du TLS
+%if %%cert_type == "manuel"
+TLSCertificateFile %%server_cert
+TLSCertificateKeyFile %%server_key
+TLSCACertificateFile %%server_pem
+%else
TLSCertificateFile /etc/ldap/ssl/certs/openldap.crt TLSCertificateFile /etc/ldap/ssl/certs/openldap.crt
TLSCertificateKeyFile /etc/ldap/ssl/private/openldap.key @@ -46,6 +47,7 @@
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 @@
%if %%ldap_replication == 'oui' or %%ldap_replication_client == 'oui' %if %%ldap_replication == 'oui' or %%ldap_replication_client == 'oui'
moduleload syncprov moduleload syncprov
%end if %end if
+moduleload memberof +moduleload memberof
# Sample security restrictions # Sample security restrictions
# Require integrity protection (prevent hijacking) # Require integrity protection (prevent hijacking)
@@ -80,6 +89,7 @@ @@ -219,3 +221,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
+
%if %%ldap_replication_client == 'oui' %if %%ldap_replication_client == 'oui'
include /etc/ldap/replication.conf include /etc/ldap/replication.conf
%end if %end if
+
+overlay memberof
+memberof-group-oc cadolesGroup
+memberof-member-ad cadolesMember