Merge branch '3742-catz-update-log-incorrect-soa-serial-representation' into 'main'

Fix an incorrect SOA serial representation in catz

Closes #3742

See merge request isc-projects/bind9!7229

CHANGES

@@ -1,3 +1,7 @@
+6048.	[bug]		Fix a log message error in dns_catz_update_from_db(),
+			where serials with values of 2^31 or larger were logged
+			incorrectly as negative numbers. [GL #3742]
+
 6047.	[bug]		Try the next server instead of trying the same
 			server again on an outgoing query timeout.
 			[GL #3637]

bin/tests/system/catz/ns3/catalog.example.db.in

@@ -9,6 +9,6 @@
 ; See the COPYRIGHT file distributed with this work for additional
 ; information regarding copyright ownership.
 
-@ 3600 SOA . . 1 86400 3600 86400 3600
+@ 3600 SOA . . 2670950424 86400 3600 86400 3600
 @ 3600 IN NS invalid.
 version IN TXT "1"

bin/tests/system/catz/tests.sh

@@ -382,6 +382,7 @@ status=$((status+ret))
 n=$((n+1))
 echo_i "waiting for secondary to sync up ($n)"
 ret=0
+wait_for_message ns2/named.run "catz: updating catalog zone 'catalog2.example' with serial 2670950425" &&
 wait_for_message ns2/named.run "catz: adding zone 'dom2.example' from catalog 'catalog1.example'" &&
 wait_for_message ns2/named.run "catz: adding zone 'dom3.example' from catalog 'catalog1.example'" &&
 wait_for_message ns2/named.run "catz: adding zone 'dom4.example' from catalog 'catalog2.example'" &&

lib/dns/catz.c

@@ -2167,8 +2167,8 @@ dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) {
 
 	isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_MASTER,
 		      ISC_LOG_INFO,
-		      "catz: updating catalog zone '%s' with serial %d", bname,
-		      vers);
+		      "catz: updating catalog zone '%s' with serial %" PRIu32,
+		      bname, vers);
 
 	result = dns_catz_new_zone(catzs, &newzone, &db->origin);
 	if (result != ISC_R_SUCCESS) {