Commit 7bda437998 for bind

commit 7bda437998b4ec823f4d248910699606c24fbd2c
Author: Matthijs Mekking <matthijs@isc.org>
Date:   Wed Sep 30 15:09:01 2026 +0200

    Modify multisigner test for NOTIFY(CDS)

    Change the code to log the type of notify received. Then, expect the
    right type of notify in the system test.

diff --git a/bin/tests/system/multisigner/tests_multisigner.py b/bin/tests/system/multisigner/tests_multisigner.py
index 54d5da9b19..114278cd98 100644
--- a/bin/tests/system/multisigner/tests_multisigner.py
+++ b/bin/tests/system/multisigner/tests_multisigner.py
@@ -564,7 +564,7 @@ def test_multisigner(ns2, ns3, ns4, default_algorithm):
         # then, notifies for child zones towards the parent result in
         # not authoritative (unless child and parent are served by the
         # same name server).
-        watcher.wait_for_line(f"received notify for zone '{zone}': NOTAUTH")
+        watcher.wait_for_line(f"received NOTIFY(CDS) for zone '{zone}': NOTAUTH")

     keys3 = isctest.kasp.keydir_to_keylist(zone, ns3.identifier)
     ksks3 = [k for k in keys3 if k.is_ksk()]
@@ -652,7 +652,7 @@ def test_multisigner_update_any(ns2, ns3, ns4, default_algorithm):
         # then, notifies for child zones towards the parent result in
         # not authoritative (unless child and parent are served by the
         # same name server).
-        watcher.wait_for_line(f"received notify for zone '{zone}': NOTAUTH")
+        watcher.wait_for_line(f"received NOTIFY(CDS) for zone '{zone}': NOTAUTH")

     keys3 = isctest.kasp.keydir_to_keylist(zone, ns3.identifier)
     ksks3 = [k for k in keys3 if k.is_ksk()]
@@ -760,7 +760,7 @@ def test_multisigner_secondary(ns2, ns3, ns4, ns5, default_algorithm):
         # then, notifies for child zones towards the parent result in
         # not authoritative (unless child and parent are served by the
         # same name server).
-        watcher.wait_for_line(f"received notify for zone '{zone}': NOTAUTH")
+        watcher.wait_for_line(f"received NOTIFY(CDS) for zone '{zone}': NOTAUTH")

     keys3 = isctest.kasp.keydir_to_keylist(zone, ns3.identifier)
     ksks3 = [k for k in keys3 if k.is_ksk()]
diff --git a/lib/ns/notify.c b/lib/ns/notify.c
index f28702574d..085b488cd3 100644
--- a/lib/ns/notify.c
+++ b/lib/ns/notify.c
@@ -79,6 +79,7 @@ ns_notify_start(ns_client_t *client, isc_nmhandle_t *handle) {
 	dns_zone_t *zone = NULL;
 	char namebuf[DNS_NAME_FORMATSIZE];
 	char tsigbuf[DNS_NAME_FORMATSIZE * 2 + sizeof(": TSIG '' ()")];
+	char typebuf[DNS_RDATATYPE_FORMATSIZE];
 	dns_tsigkey_t *tsigkey;

 	/*
@@ -142,6 +143,7 @@ ns_notify_start(ns_client_t *client, isc_nmhandle_t *handle) {
 		tsigbuf[0] = '\0';
 	}

+	dns_rdatatype_format(zone_rdataset->type, typebuf, sizeof(typebuf));
 	dns_name_format(zonename, namebuf, sizeof(namebuf));
 	result = dns_view_findzone(client->inner.view, zonename,
 				   DNS_ZTFIND_EXACT, &zone);
@@ -156,8 +158,8 @@ ns_notify_start(ns_client_t *client, isc_nmhandle_t *handle) {
 			isc_sockaddr_t *from = ns_client_getsockaddr(client);
 			isc_sockaddr_t *to = ns_client_getdestaddr(client);
 			notify_log(client, ISC_LOG_INFO,
-				   "received notify for zone '%s'%s", namebuf,
-				   tsigbuf);
+				   "received NOTIFY(%s) for zone '%s'%s",
+				   typebuf, namebuf, tsigbuf);
 			result = dns_zone_notifyreceive(zone, from, to,
 							request);
 			goto done;
@@ -166,8 +168,8 @@ ns_notify_start(ns_client_t *client, isc_nmhandle_t *handle) {

 	result = DNS_R_NOTAUTH;
 	notify_log(client, ISC_LOG_NOTICE,
-		   "received notify for zone '%s'%s: %s", namebuf, tsigbuf,
-		   isc_result_totext(result));
+		   "received NOTIFY(%s) for zone '%s'%s: %s", typebuf, namebuf,
+		   tsigbuf, isc_result_totext(result));

 done:
 	if (zone != NULL) {