From: Matthijs Mekking <matthijs@isc.org>
Date: Wed, 14 Jun 2023 07:05:31 +0000 (+0200)
Subject: Update findzonekeys function name in log message
X-Git-Tag: v9.19.15~32^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e59c6a5adc299ee7470aca6591f2e9a94c517abd;p=thirdparty%2Fbind9.git

Update findzonekeys function name in log message

The "dns_dnssec_findzonekeys2" log message is a leftover from when that
was the name of the function. Rename to match the current name of the
function.
---

diff --git a/bin/tests/system/multisigner/tests.sh b/bin/tests/system/multisigner/tests.sh
index 5a209e79464..1b3d6cbc903 100644
--- a/bin/tests/system/multisigner/tests.sh
+++ b/bin/tests/system/multisigner/tests.sh
@@ -142,7 +142,7 @@ status=$((status+ret))
 n=$((n+1))
 ret=0
 echo_i "make sure we did not try to sign with the keys added with nsupdate for zone ${ZONE} ($n)"
-grep "dns_dnssec_findzonekeys2: error reading ./K${ZONE}.*\.private: file not found" "${DIR}/named.run" && ret=1
+grep "dns_dnssec_findzonekeys: error reading ./K${ZONE}.*\.private: file not found" "${DIR}/named.run" && ret=1
 test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 # Verify again.
@@ -168,7 +168,7 @@ status=$((status+ret))
 n=$((n+1))
 ret=0
 echo_i "make sure we did not try to sign with the keys added with nsupdate for zone ${ZONE} ($n)"
-grep "dns_dnssec_findzonekeys2: error reading ./K${ZONE}.*\.private: file not found" "${DIR}/named.run" && ret=1
+grep "dns_dnssec_findzonekeys: error reading ./K${ZONE}.*\.private: file not found" "${DIR}/named.run" && ret=1
 test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 # Verify again.
@@ -464,7 +464,7 @@ test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 dnssec_verify
 no_dnssec_in_journal
-grep "dns_dnssec_findzonekeys2: error reading ./K${ZONE}.*\.private: file not found" "${DIR}/named.run" && ret=1
+grep "dns_dnssec_findzonekeys: error reading ./K${ZONE}.*\.private: file not found" "${DIR}/named.run" && ret=1
 test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 # NS4
@@ -475,7 +475,7 @@ test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 dnssec_verify
 no_dnssec_in_journal
-grep "dns_dnssec_findzonekeys2: error reading ./K${ZONE}.*\.private: file not found" "${DIR}/named.run" && ret=1
+grep "dns_dnssec_findzonekeys: error reading ./K${ZONE}.*\.private: file not found" "${DIR}/named.run" && ret=1
 test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))
 
diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index ca0bf413f44..8240080a8e0 100644
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -858,7 +858,7 @@ dns_dnssec_findzonekeys(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node,
 
 			isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
 				      DNS_LOGMODULE_DNSSEC, ISC_LOG_WARNING,
-				      "dns_dnssec_findzonekeys2: error "
+				      "dns_dnssec_findzonekeys: error "
 				      "reading %s: %s",
 				      filename, isc_result_totext(result));
 		}