|
 |
e4ff3b |
From a6d34ed8672a02b49bb286cbeb2d75a08bc0c085 Mon Sep 17 00:00:00 2001
|
|
|
e4ff3b |
From: Simon Pichugin <spichugi@rehdat.com>
|
|
|
e4ff3b |
Date: Thu, 1 Jul 2021 12:53:24 +0200
|
|
|
e4ff3b |
Subject: [PATCH] Fix Channel Binding tests
|
|
|
e4ff3b |
|
|
|
e4ff3b |
---
|
|
|
e4ff3b |
...s => test069-delta-multiprovider-starttls} | 24 +++++++++----------
|
|
|
e4ff3b |
...daps => test070-delta-multiprovider-ldaps} | 24 +++++++++----------
|
|
|
e4ff3b |
2 files changed, 24 insertions(+), 24 deletions(-)
|
|
|
e4ff3b |
rename tests/scripts/{test069-delta-multimaster-starttls => test069-delta-multiprovider-starttls} (96%)
|
|
|
e4ff3b |
rename tests/scripts/{test070-delta-multimaster-ldaps => test070-delta-multiprovider-ldaps} (96%)
|
|
|
e4ff3b |
|
|
|
e4ff3b |
diff --git a/tests/scripts/test069-delta-multimaster-starttls b/tests/scripts/test069-delta-multiprovider-starttls
|
|
|
e4ff3b |
similarity index 96%
|
|
|
e4ff3b |
rename from tests/scripts/test069-delta-multimaster-starttls
|
|
|
e4ff3b |
rename to tests/scripts/test069-delta-multiprovider-starttls
|
|
|
e4ff3b |
index 2dfbb30a1..01fed1e2c 100755
|
|
|
e4ff3b |
--- a/tests/scripts/test069-delta-multimaster-starttls
|
|
|
e4ff3b |
+++ b/tests/scripts/test069-delta-multiprovider-starttls
|
|
|
e4ff3b |
@@ -2,7 +2,7 @@
|
|
|
e4ff3b |
# $OpenLDAP$
|
|
|
e4ff3b |
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
|
|
e4ff3b |
##
|
|
|
e4ff3b |
-## Copyright 1998-2017 The OpenLDAP Foundation.
|
|
|
e4ff3b |
+## Copyright 1998-2021 The OpenLDAP Foundation.
|
|
|
e4ff3b |
## All rights reserved.
|
|
|
e4ff3b |
##
|
|
|
e4ff3b |
## Redistribution and use in source and binary forms, with or without
|
|
|
e4ff3b |
@@ -277,7 +277,7 @@ done
|
|
|
e4ff3b |
n=2
|
|
|
e4ff3b |
while [ $n -le $MMR ]; do
|
|
|
e4ff3b |
echo "Comparing retrieved entries from server 1 and server $n..."
|
|
|
e4ff3b |
-$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT
|
|
|
e4ff3b |
+$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT
|
|
|
e4ff3b |
|
|
|
e4ff3b |
if test $? != 0 ; then
|
|
|
e4ff3b |
echo "test failed - server 1 and server $n databases differ"
|
|
|
e4ff3b |
@@ -301,7 +301,7 @@ THEDN="cn=James A Jones 2,ou=Alumni Association,ou=People,dc=example,dc=com"
|
|
|
e4ff3b |
sleep 1
|
|
|
e4ff3b |
for i in 1 2 3; do
|
|
|
e4ff3b |
$LDAPSEARCH -S "" -b "$THEDN" -H $URI1 \
|
|
|
e4ff3b |
- -s base '(objectClass=*)' entryCSN > "${MASTEROUT}.$i" 2>&1
|
|
|
e4ff3b |
+ -s base '(objectClass=*)' entryCSN > "${PROVIDEROUT}.$i" 2>&1
|
|
|
e4ff3b |
RC=$?
|
|
|
e4ff3b |
|
|
|
e4ff3b |
if test $RC = 0 ; then
|
|
|
e4ff3b |
@@ -309,7 +309,7 @@ for i in 1 2 3; do
|
|
|
e4ff3b |
fi
|
|
|
e4ff3b |
|
|
|
e4ff3b |
if test $RC != 32 ; then
|
|
|
e4ff3b |
- echo "ldapsearch failed at slave ($RC)!"
|
|
|
e4ff3b |
+ echo "ldapsearch failed at replica ($RC)!"
|
|
|
e4ff3b |
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
|
|
e4ff3b |
exit $RC
|
|
|
e4ff3b |
fi
|
|
|
e4ff3b |
@@ -340,7 +340,7 @@ done
|
|
|
e4ff3b |
n=2
|
|
|
e4ff3b |
while [ $n -le $MMR ]; do
|
|
|
e4ff3b |
echo "Comparing retrieved entries from server 1 and server $n..."
|
|
|
e4ff3b |
-$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT
|
|
|
e4ff3b |
+$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT
|
|
|
e4ff3b |
|
|
|
e4ff3b |
if test $? != 0 ; then
|
|
|
e4ff3b |
echo "test failed - server 1 and server $n databases differ"
|
|
|
e4ff3b |
@@ -555,7 +555,7 @@ done
|
|
|
e4ff3b |
n=2
|
|
|
e4ff3b |
while [ $n -le $MMR ]; do
|
|
|
e4ff3b |
echo "Comparing retrieved entries from server 1 and server $n..."
|
|
|
e4ff3b |
-$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT
|
|
|
e4ff3b |
+$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT
|
|
|
e4ff3b |
|
|
|
e4ff3b |
if test $? != 0 ; then
|
|
|
e4ff3b |
echo "test failed - server 1 and server $n databases differ"
|
|
|
e4ff3b |
diff --git a/tests/scripts/test070-delta-multimaster-ldaps b/tests/scripts/test070-delta-multiprovider-ldaps
|
|
|
e4ff3b |
similarity index 96%
|
|
|
e4ff3b |
rename from tests/scripts/test070-delta-multimaster-ldaps
|
|
|
e4ff3b |
rename to tests/scripts/test070-delta-multiprovider-ldaps
|
|
|
e4ff3b |
index 1024640ef..37de9ddd0 100755
|
|
|
e4ff3b |
--- a/tests/scripts/test070-delta-multimaster-ldaps
|
|
|
e4ff3b |
+++ b/tests/scripts/test070-delta-multiprovider-ldaps
|
|
|
e4ff3b |
@@ -2,7 +2,7 @@
|
|
|
e4ff3b |
# $OpenLDAP$
|
|
|
e4ff3b |
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
|
|
e4ff3b |
##
|
|
|
e4ff3b |
-## Copyright 1998-2017 The OpenLDAP Foundation.
|
|
|
e4ff3b |
+## Copyright 1998-2021 The OpenLDAP Foundation.
|
|
|
e4ff3b |
## All rights reserved.
|
|
|
e4ff3b |
##
|
|
|
e4ff3b |
## Redistribution and use in source and binary forms, with or without
|
|
|
e4ff3b |
@@ -276,7 +276,7 @@ done
|
|
|
e4ff3b |
n=2
|
|
|
e4ff3b |
while [ $n -le $MMR ]; do
|
|
|
e4ff3b |
echo "Comparing retrieved entries from server 1 and server $n..."
|
|
|
e4ff3b |
-$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT
|
|
|
e4ff3b |
+$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT
|
|
|
e4ff3b |
|
|
|
e4ff3b |
if test $? != 0 ; then
|
|
|
e4ff3b |
echo "test failed - server 1 and server $n databases differ"
|
|
|
e4ff3b |
@@ -300,7 +300,7 @@ THEDN="cn=James A Jones 2,ou=Alumni Association,ou=People,dc=example,dc=com"
|
|
|
e4ff3b |
sleep 1
|
|
|
e4ff3b |
for i in 1 2 3; do
|
|
|
e4ff3b |
$LDAPSEARCH -S "" -b "$THEDN" -o tls_cacert=$TESTDIR/tls/ca/certs/testsuiteCA.crt -H $SURIP1 \
|
|
|
e4ff3b |
- -s base '(objectClass=*)' entryCSN > "${MASTEROUT}.$i" 2>&1
|
|
|
e4ff3b |
+ -s base '(objectClass=*)' entryCSN > "${PROVIDEROUT}.$i" 2>&1
|
|
|
e4ff3b |
RC=$?
|
|
|
e4ff3b |
|
|
|
e4ff3b |
if test $RC = 0 ; then
|
|
|
e4ff3b |
@@ -308,7 +308,7 @@ for i in 1 2 3; do
|
|
|
e4ff3b |
fi
|
|
|
e4ff3b |
|
|
|
e4ff3b |
if test $RC != 32 ; then
|
|
|
e4ff3b |
- echo "ldapsearch failed at slave ($RC)!"
|
|
|
e4ff3b |
+ echo "ldapsearch failed at replica ($RC)!"
|
|
|
e4ff3b |
test $KILLSERVERS != no && kill -HUP $KILLPIDS
|
|
|
e4ff3b |
exit $RC
|
|
|
e4ff3b |
fi
|
|
|
e4ff3b |
@@ -339,7 +339,7 @@ done
|
|
|
e4ff3b |
n=2
|
|
|
e4ff3b |
while [ $n -le $MMR ]; do
|
|
|
e4ff3b |
echo "Comparing retrieved entries from server 1 and server $n..."
|
|
|
e4ff3b |
-$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT
|
|
|
e4ff3b |
+$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT
|
|
|
e4ff3b |
|
|
|
e4ff3b |
if test $? != 0 ; then
|
|
|
e4ff3b |
echo "test failed - server 1 and server $n databases differ"
|
|
|
e4ff3b |
@@ -552,7 +552,7 @@ done
|
|
|
e4ff3b |
n=2
|
|
|
e4ff3b |
while [ $n -le $MMR ]; do
|
|
|
e4ff3b |
echo "Comparing retrieved entries from server 1 and server $n..."
|
|
|
e4ff3b |
-$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT
|
|
|
e4ff3b |
+$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT
|
|
|
e4ff3b |
|
|
|
e4ff3b |
if test $? != 0 ; then
|
|
|
e4ff3b |
echo "test failed - server 1 and server $n databases differ"
|
|
|
e4ff3b |
--
|
|
|
e4ff3b |
2.31.1
|
|
|
e4ff3b |
|