Clarify error message about missing inline-signing & dnssec-policy

(cherry picked from commit 058c1744bac8317be57724ff0f235ee1e8a7438e)

diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index 1ad24684a7a851f022229db90b96ce202f61bad1..e03573494f1906dd1765b30d18ae588d1764bb60 100644 (file)
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -503,7 +503,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

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 3db917f3289c0a69b973d1b9687d7840fb10d8ae..31fb04d87c001a2acb4d328c13d83d511e4ced7b 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -2936,11 +2936,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;
                        }