Merge branch 'PHP-8.2'

* PHP-8.2:
  Attempt to improve setup-slapd.sh stability
This commit is contained in:
Ilija Tovilo 2023-07-05 15:08:30 +02:00
commit 61a49ae841
No known key found for this signature in database
GPG Key ID: A4F5D403F118200A

View File

@ -46,8 +46,6 @@ if test -f "/etc/ldap/schema/ppolicy.ldif"; then
sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/ppolicy.ldif
fi
sudo service slapd restart
sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF
dn: $DBDN
changetype: modify
@ -92,8 +90,6 @@ add: olcModuleLoad
olcModuleLoad: dds
EOF
sudo service slapd restart
sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// << EOF
dn: olcOverlay=sssvlv,$DBDN
objectClass: olcOverlayConfig
@ -118,8 +114,6 @@ objectClass: olcDdsConfig
olcOverlay: dds
EOF
sudo service slapd restart
sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF
dn: $DBDN
changetype: modify
@ -127,8 +121,6 @@ add: olcDbIndex
olcDbIndex: entryExpireTimestamp eq
EOF
sudo service slapd restart
ldapadd -H ldapi:/// -D cn=Manager,dc=my-domain,dc=com -w secret <<EOF
dn: dc=my-domain,dc=com
objectClass: top
@ -166,6 +158,8 @@ o: php ldap tests
## pwdSafeModify: FALSE
EOF
sudo service slapd restart
# Verify TLS connection
tries=0
while : ; do