cf01b2a08d
Some file changes were completely missing in the cherry-picks of CVE-2024-1737 upstream test changes, as well as older backports causing issues with the new version of bind. Resolves: RHEL-6454
69 lines
2.5 KiB
Diff
69 lines
2.5 KiB
Diff
From 1e3d6c2862cb7911fdd01b9d69a8599b462b797c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@isc.org>
|
|
Date: Tue, 7 Jan 2025 15:22:40 +0100
|
|
Subject: [PATCH] Isolate using the -T noaa flag only for part of the resolver
|
|
test
|
|
|
|
Instead of running the whole resolver/ns4 server with -T noaa flag,
|
|
use it only for the part where it is actually needed. The -T noaa
|
|
could interfere with other parts of the test because the answers don't
|
|
have the authoritative-answer bit set, and we could have false
|
|
positives (or false negatives) in the test because the authoritative
|
|
server doesn't follow the DNS protocol for all the tests in the resolver
|
|
system test.
|
|
|
|
(cherry picked from commit e51d4d3b88af00d6667f2055087ebfc47fb3107c)
|
|
---
|
|
bin/tests/system/resolver/ns4/named.noaa | 12 ------------
|
|
bin/tests/system/resolver/tests.sh | 8 ++++++++
|
|
2 files changed, 8 insertions(+), 12 deletions(-)
|
|
delete mode 100644 bin/tests/system/resolver/ns4/named.noaa
|
|
|
|
diff --git a/bin/tests/system/resolver/ns4/named.noaa b/bin/tests/system/resolver/ns4/named.noaa
|
|
deleted file mode 100644
|
|
index be78cc2c94..0000000000
|
|
--- a/bin/tests/system/resolver/ns4/named.noaa
|
|
+++ /dev/null
|
|
@@ -1,12 +0,0 @@
|
|
-Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
|
-
|
|
-SPDX-License-Identifier: MPL-2.0
|
|
-
|
|
-This Source Code Form is subject to the terms of the Mozilla Public
|
|
-License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
-file, you can obtain one at https://mozilla.org/MPL/2.0/.
|
|
-
|
|
-See the COPYRIGHT file distributed with this work for additional
|
|
-information regarding copyright ownership.
|
|
-
|
|
-Add -T noaa.
|
|
diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
|
|
index d9121d9ae5..29562c2db0 100755
|
|
--- a/bin/tests/system/resolver/tests.sh
|
|
+++ b/bin/tests/system/resolver/tests.sh
|
|
@@ -309,6 +309,10 @@ done
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
status=$((status + ret))
|
|
|
|
+stop_server ns4
|
|
+touch ns4/named.noaa
|
|
+start_server --noclean --restart --port ${PORT} ns4 || ret=1
|
|
+
|
|
n=$((n + 1))
|
|
echo_i "RT21594 regression test check setup ($n)"
|
|
ret=0
|
|
@@ -345,6 +349,10 @@ grep "status: NXDOMAIN" dig.ns5.out.${n} >/dev/null || ret=1
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
status=$((status + ret))
|
|
|
|
+stop_server ns4
|
|
+rm ns4/named.noaa
|
|
+start_server --noclean --restart --port ${PORT} ns4 || ret=1
|
|
+
|
|
n=$((n + 1))
|
|
echo_i "check that replacement of additional data by a negative cache no data entry clears the additional RRSIGs ($n)"
|
|
ret=0
|
|
--
|
|
2.53.0
|
|
|