Merge branch '876-documentation-feedback-2' into 'master'

"dnskey-sig-validity 0;" was not accepted

Closes #876

See merge request isc-projects/bind9!2484

CHANGES

@@ -1,3 +1,6 @@
+5304.	[bug]		"dnskey-sig-validity 0;" was not being accepted.
+			[GL #876]
+
 5303.	[placeholder]
 
 5302.	[bug]		Fix checking that "dnstap-output" is defined when

bin/tests/system/checkconf/good-dnskey-validity-3660.conf

@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+options {
+	dnskey-sig-validity 3660;	/* maximum value 10 years */
+};

bin/tests/system/checkconf/good-dnskey-validity-zero.conf

@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+options {
+	dnskey-sig-validity 0;	/* 0 is disabled */
+};

lib/bind9/check.c

@@ -1000,9 +1000,9 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
 		uint32_t keyvalidity;
 
 		keyvalidity = cfg_obj_asuint32(obj);
-		if (keyvalidity > 3660 || keyvalidity == 0) { /* 10 years */
+		if (keyvalidity > 3660) {		 /* 10 years */
 			cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
-				    "%s '%u' is out of range (1..3660)",
+				    "%s '%u' is out of range (0..3660)",
 				    "dnskey-sig-validity",
 				    keyvalidity);
 			result = ISC_R_RANGE;