]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Clarify error message about missing inline-signing & dnssec-policy
authorPetr Špaček <pspacek@isc.org>
Wed, 5 Oct 2022 12:44:09 +0000 (14:44 +0200)
committerPetr Špaček <pspacek@isc.org>
Thu, 6 Oct 2022 08:26:30 +0000 (10:26 +0200)
bin/tests/system/checkconf/tests.sh
lib/bind9/check.c

index c42f673a8b8bbc5892f08f5c5b063984849dcca5..f32e6266c14982400a0f88c72ee9c83bffdd6356 100644 (file)
@@ -492,7 +492,7 @@ n=`expr $n + 1`
 echo_i "checking named-checkconf kasp errors ($n)"
 ret=0
 $CHECKCONF kasp-and-other-dnssec-options.conf > checkconf.out$n 2>&1 && ret=1
-grep "'dnssec-policy;' requires dynamic DNS or inline-signing to be configured for the zone" < checkconf.out$n > /dev/null || ret=1
+grep "'inline-signing yes;' must also be configured explicitly for zones using dnssec-policy without a configured 'allow-update' or 'update-policy'" < checkconf.out$n > /dev/null || ret=1
 grep "'auto-dnssec maintain;' cannot be configured if dnssec-policy is also set" < checkconf.out$n > /dev/null || ret=1
 grep "dnskey-sig-validity: cannot be configured if dnssec-policy is also set" < checkconf.out$n > /dev/null || ret=1
 grep "dnssec-dnskey-kskonly: cannot be configured if dnssec-policy is also set" < checkconf.out$n > /dev/null || ret=1
index 2ddd90b27060e319c81f2624e2ebe46f5f528e12..99b41c051a3d7bd1789d14ebf269a694a3f700f4 100644 (file)
@@ -3450,11 +3450,16 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
                if (has_dnssecpolicy) {
                        if (!ddns && !signing) {
                                cfg_obj_log(kasp, logctx, ISC_LOG_ERROR,
-                                           "'dnssec-policy;' requires%s "
-                                           "inline-signing to be configured "
-                                           "for the zone",
+                                           "'inline-signing yes;' must also "
+                                           "be configured explicitly for "
+                                           "zones using dnssec-policy%s. See "
+                                           "https://kb.isc.org/docs/"
+                                           "dnssec-policy-requires-dynamic-"
+                                           "dns-or-inline-signing",
                                            (ztype == CFG_ZONE_PRIMARY)
-                                                   ? " dynamic DNS or"
+                                                   ? " without a configured "
+                                                     "'allow-update' or "
+                                                     "'update-policy'"
                                                    : "");
                                result = ISC_R_FAILURE;
                        }