fixup! fixup! Save progress?

diff --git a/bin/named/server.c b/bin/named/server.c
index b975a59501bd4a1adaf9438f0bb46e30c376d332..ae869b7f2af37c8c0523c015a07a70e55e2252ce 100644 (file)
--- 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 8d4c06ed77459317ff36bbbc697f2008daa7c189..f172d7f5c4d74975d4a5d8291576eedda6476ca3 100644 (file)
--- 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)))