Fix Channel Binding tests

Related: rhbz#1967853

openldap-cbinding-fix-multiprovider-tests.patch

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

openldap.spec

@@ -7,7 +7,7 @@
 
 Name: openldap
 Version: 2.4.57
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: LDAP support libraries
 License: OpenLDAP
 URL: http://www.openldap.org/
@@ -54,6 +54,7 @@ Patch60: openldap-cbinding-Fix-slaptest-in-test077.patch
 Patch61: openldap-cbinding-Convert-test077-to-LDIF-config.patch
 Patch62: openldap-cbinding-Update-keys-to-RSA-4096.patch
 Patch63: openldap-cbinding-ITS-9215-fix-for-glibc-again.patch
+Patch64: openldap-cbinding-fix-multiprovider-tests.patch
 
 # check-password module specific patches
 Patch90: check-password-makefile.patch
@@ -161,6 +162,7 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
 %patch61 -p1
 %patch62 -p1
 %patch63 -p1
+%patch64 -p1
 
 # build smbk5pwd with other overlays
 ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays
@@ -554,14 +556,15 @@ exit 0
 %{_libdir}/libldap-2.4*.so.*
 
 %changelog
+* Mon Jul 12 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.57-7
+- Fix Channel Binding tests Related: rhbz#1967853
+
 * Thu Jun 24 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.57-6
 - Fix slapd.tmpfiles complaints. Related: rhbz#1969853
 - Use https:// for source Related: rhbz#1973597
 
 * Tue Jun 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.57-5
-- Rebuilt for RHEL 9 BETA for openssl 3.0
+- Rebuilt for RHEL 9 BETA for openssl 3.0 Related: rhbz#1971065
-
-Related: rhbz#1971065
 
 * Fri Jun  4 2021 Simon Pichugin <spichugi@redhat.com> - 2.4.57-4
 - Backport Channel Binding support. Related: rhbz#1967853