-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- update common/shlibs - add slapd.ldif to conf_files - add more options to runit service - add patch fixing test079 on musl (for some reason arguments are ignored if placed after the filter)
- Loading branch information
Showing
4 changed files
with
113 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 106 additions & 0 deletions
106
srcpkgs/openldap/patches/fix-test079-musl-ignored-params.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
--- a/tests/scripts/test079-proxy-timeout 2023-01-31 23:37:19.378324038 +0100 | ||
+++ b/tests/scripts/test079-proxy-timeout 2023-01-31 23:47:25.289052240 +0100 | ||
@@ -139,10 +139,10 @@ | ||
|
||
echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)" | ||
|
||
-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \ | ||
+$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \ | ||
-D "cn=Manager,dc=local,dc=com" \ | ||
-H $URI2 \ | ||
- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
RC=$? | ||
if test $RC != 0 ; then | ||
echo "Error: LDAP connection to remote LDAP server is not found ($RC)" | ||
@@ -150,10 +150,10 @@ | ||
exit $RC | ||
fi | ||
|
||
-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \ | ||
+$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \ | ||
-D "cn=Manager,dc=local,dc=com" \ | ||
-H $URI2 \ | ||
- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
RC=$? | ||
if test $RC != 0 ; then | ||
echo "Error: LDAP connection to remote LDAP server is not found ($RC)" | ||
@@ -171,10 +171,10 @@ | ||
|
||
echo "Checking that proxy has closed expired connections towards the remote LDAP server (time_t now=`date +%s`)" | ||
|
||
-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \ | ||
+$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \ | ||
-D "cn=Manager,dc=local,dc=com" \ | ||
-H $URI2 \ | ||
- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
RC=$? | ||
if test $RC != 1 ; then | ||
echo "Error: LDAP connection to remote LDAP server was not closed" | ||
@@ -182,10 +182,10 @@ | ||
exit $RC | ||
fi | ||
|
||
-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \ | ||
+$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \ | ||
-D "cn=Manager,dc=local,dc=com" \ | ||
-H $URI2 \ | ||
- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
RC=$? | ||
if test $RC != 1 ; then | ||
echo "Error: LDAP connection to remote LDAP server was not closed" | ||
@@ -235,10 +235,10 @@ | ||
|
||
echo "Checking that proxy has created connections towards backend (time_t now=`date +%s`)" | ||
|
||
-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \ | ||
+$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \ | ||
-D "cn=Manager,dc=local,dc=com" \ | ||
-H $URI2 \ | ||
- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
RC=$? | ||
if test $RC != 0 ; then | ||
echo "Error: LDAP connection to remote LDAP server is not found ($RC)" | ||
@@ -246,10 +246,10 @@ | ||
exit $RC | ||
fi | ||
|
||
-$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \ | ||
+$LDAPSEARCH -b "cn=Connections,cn=database 3,cn=databases,cn=monitor" -s one -LLL \ | ||
-D "cn=Manager,dc=local,dc=com" \ | ||
-H $URI2 \ | ||
- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
RC=$? | ||
if test $RC != 0 ; then | ||
echo "Error: LDAP connection to remote LDAP server is not found ($RC)" | ||
@@ -339,10 +339,10 @@ | ||
NOW=`date +%s` | ||
sleep `expr $CONN_EXPIRES - $NOW - 2` | ||
echo "Check that connection is still alive due to idle-timeout reset (time_t now=`date +%s`)" | ||
-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \ | ||
+$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \ | ||
-D "cn=Manager,dc=local,dc=com" \ | ||
-H $URI2 \ | ||
- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
RC=$? | ||
if test $RC != 0 ; then | ||
echo "Error: LDAP connection to remote LDAP server is not found ($RC)" | ||
@@ -354,10 +354,10 @@ | ||
NOW=`date +%s` | ||
sleep `expr $CONN_EXPIRES - $NOW + 2` | ||
echo "Check that connection is closed after extended idle-timeout has passed (time_t now=`date +%s`)" | ||
-$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL olmDbConnURI \ | ||
+$LDAPSEARCH -b "cn=Connections,cn=database 2,cn=databases,cn=monitor" -s one -LLL \ | ||
-D "cn=Manager,dc=local,dc=com" \ | ||
-H $URI2 \ | ||
- -w $PASSWD 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
+ -w $PASSWD olmDbConnURI 2>&1 | tee -a $TESTOUT | grep ldap://${LOCALHOST}:$PORT1 >/dev/null | ||
RC=$? | ||
if test $RC != 1 ; then | ||
echo "Error: LDAP connection to remote LDAP server was not closed" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters