add named-checkconf tests for dnskey-sig-validity at range limits

(cherry picked from commit 918f020f9f5d3ca41cd230e489326654cf14c588)

diff --git a/CHANGES b/CHANGES
index 3006441638d15530ee072b9fd063c2b3a3b04558..a76cb358d2d934ab0c4d0d4092372e2eb06eab06 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5304.  [bug]           "dnskey-sig-validity 0;" was not being accepted.
+                       [GL #876]
+
 5302.  [bug]           Fix checking that "dnstap-output" is defined when
                        "dnstap" is specified" in a view. [GL #1281]
 

diff --git a/bin/tests/system/checkconf/good-dnskey-validity-3660.conf b/bin/tests/system/checkconf/good-dnskey-validity-3660.conf
new file mode 100644 (file)
index 0000000..2a69951
--- /dev/null
+++ b/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 */
+};

diff --git a/bin/tests/system/checkconf/good-dnskey-validity-zero.conf b/bin/tests/system/checkconf/good-dnskey-validity-zero.conf
new file mode 100644 (file)
index 0000000..3f89670
--- /dev/null
+++ b/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 */
+};