Commit 463e20b

committed

Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1: Attempt to improve setup-slapd.sh stability

2 parents 60dd88c + 4cc800f commit 463e20bCopy full SHA for 463e20b

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
@@ -44,8 +44,6 @@ DBDN=`sudo ldapsearch -Q -LLL -Y EXTERNAL -H ldapi:/// -b cn=config '(&(olcRootD
`44`	`44`
`45`	`45`	`sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/ppolicy.ldif`
`46`	`46`
`47`		`-sudo service slapd restart`
`48`		`-`
`49`	`47`	`sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF`
`50`	`48`	`dn: $DBDN`
`51`	`49`	`changetype: modify`
`@@ -90,8 +88,6 @@ add: olcModuleLoad`
`90`	`88`	`olcModuleLoad: dds`
`91`	`89`	`EOF`
`92`	`90`
`93`		`-sudo service slapd restart`
`94`		`-`
`95`	`91`	`sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// << EOF`
`96`	`92`	`dn: olcOverlay=sssvlv,$DBDN`
`97`	`93`	`objectClass: olcOverlayConfig`
`@@ -116,17 +112,13 @@ objectClass: olcDdsConfig`
`116`	`112`	`olcOverlay: dds`
`117`	`113`	`EOF`
`118`	`114`
`119`		`-sudo service slapd restart`
`120`		`-`
`121`	`115`	`sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF`
`122`	`116`	`dn: $DBDN`
`123`	`117`	`changetype: modify`
`124`	`118`	`add: olcDbIndex`
`125`	`119`	`olcDbIndex: entryExpireTimestamp eq`
`126`	`120`	`EOF`
`127`	`121`
`128`		`-sudo service slapd restart`
`129`		`-`
`130`	`122`	`ldapadd -H ldapi:/// -D cn=Manager,dc=my-domain,dc=com -w secret <<EOF`
`131`	`123`	`dn: dc=my-domain,dc=com`
`132`	`124`	`objectClass: top`
`@@ -164,6 +156,8 @@ o: php ldap tests`
`164`	`156`	`## pwdSafeModify: FALSE`
`165`	`157`	`EOF`
`166`	`158`
	`159`	`+sudo service slapd restart`
	`160`	`+`
`167`	`161`	`# Verify TLS connection`
`168`	`162`	`tries=0`
`169`	`163`	`while : ; do`

Comments

(0)