From: Alessio Podda <alessio@isc.org>
Date: Fri, 20 Mar 2026 11:17:31 +0000 (+0100)
Subject: fixup! fixup! Save progress?
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bb50639c7ada6098b2849ee640228c48c8b1303;p=thirdparty%2Fbind9.git

fixup! fixup! Save progress?
---

diff --git a/bin/named/server.c b/bin/named/server.c
index b975a59501b..ae869b7f2af 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -595,7 +595,8 @@ configure_view_nametable(const cfg_obj_t *vconfig, const cfg_obj_t *config,
 		if (result != ISC_R_SUCCESS) {
 			cfg_obj_log(nameobj, ISC_LOG_ERROR,
 				    "failed to add %s for %s: %s", str,
-				    confname, isc_result_totext(result));
+				    cfg_clause_as_string[confname],
+				    isc_result_totext(result));
 			goto cleanup;
 		}
 	}
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 8d4c06ed774..f172d7f5c4d 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -4336,7 +4336,7 @@ cfg_print_zonegrammar(const unsigned int zonetype, unsigned int flags,
 		UNREACHABLE();
 	}
 
-	for (clause = clauses; clause->name != NULL; clause++) {
+	for (clause = clauses; clause->name != CFG_CLAUSE__NONE; clause++) {
 		if (((pctx.flags & CFG_PRINTER_ACTIVEONLY) != 0) &&
 		    (((clause->flags & CFG_CLAUSEFLAG_OBSOLETE) != 0) ||
 		     ((clause->flags & CFG_CLAUSEFLAG_TESTONLY) != 0)))