diff --git a/bind8/config-Alma-Linux-6.0-ALL b/bind8/config-Alma-Linux-6.0-ALL index c0d420f2f..29ddfefb6 100644 --- a/bind8/config-Alma-Linux-6.0-ALL +++ b/bind8/config-Alma-Linux-6.0-ALL @@ -53,3 +53,4 @@ dnssectools_keydir=/var/named/dtkeys dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-CentOS-Linux-6.0-ALL b/bind8/config-CentOS-Linux-6.0-ALL index c0d420f2f..29ddfefb6 100644 --- a/bind8/config-CentOS-Linux-6.0-ALL +++ b/bind8/config-CentOS-Linux-6.0-ALL @@ -53,3 +53,4 @@ dnssectools_keydir=/var/named/dtkeys dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-Redhat-Enterprise-Linux-6.0-ALL b/bind8/config-Redhat-Enterprise-Linux-6.0-ALL index 4e873d401..b4c280044 100644 --- a/bind8/config-Redhat-Enterprise-Linux-6.0-ALL +++ b/bind8/config-Redhat-Enterprise-Linux-6.0-ALL @@ -46,3 +46,4 @@ other_slaves=1 restart_cmd=restart force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-Scientific-Linux-6.0-ALL b/bind8/config-Scientific-Linux-6.0-ALL index 6b5a8c79d..d15fd38e6 100644 --- a/bind8/config-Scientific-Linux-6.0-ALL +++ b/bind8/config-Scientific-Linux-6.0-ALL @@ -46,3 +46,4 @@ other_slaves=1 restart_cmd=restart force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-aix b/bind8/config-aix index 63cda9e12..88a20e80c 100644 --- a/bind8/config-aix +++ b/bind8/config-aix @@ -37,3 +37,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-cobalt-linux b/bind8/config-cobalt-linux index c573c045f..e41ce3c45 100644 --- a/bind8/config-cobalt-linux +++ b/bind8/config-cobalt-linux @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-coherent-linux b/bind8/config-coherent-linux index ca6377677..672abe22e 100644 --- a/bind8/config-coherent-linux +++ b/bind8/config-coherent-linux @@ -43,3 +43,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-corel-linux b/bind8/config-corel-linux index c573c045f..e41ce3c45 100644 --- a/bind8/config-corel-linux +++ b/bind8/config-corel-linux @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-debian-linux b/bind8/config-debian-linux index c573c045f..e41ce3c45 100644 --- a/bind8/config-debian-linux +++ b/bind8/config-debian-linux @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-debian-linux-2.2 b/bind8/config-debian-linux-2.2 index 3eacd47d7..e090cad23 100644 --- a/bind8/config-debian-linux-2.2 +++ b/bind8/config-debian-linux-2.2 @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-debian-linux-3.0 b/bind8/config-debian-linux-3.0 index 97cc7585d..d5dc6436e 100644 --- a/bind8/config-debian-linux-3.0 +++ b/bind8/config-debian-linux-3.0 @@ -42,3 +42,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-debian-linux-3.1-ALL b/bind8/config-debian-linux-3.1-ALL index 8c2362848..7c6096014 100644 --- a/bind8/config-debian-linux-3.1-ALL +++ b/bind8/config-debian-linux-3.1-ALL @@ -43,3 +43,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-freebsd-2.1-2.2 b/bind8/config-freebsd-2.1-2.2 index 3aaa90b08..13555c722 100644 --- a/bind8/config-freebsd-2.1-2.2 +++ b/bind8/config-freebsd-2.1-2.2 @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-freebsd-3.0 b/bind8/config-freebsd-3.0 index a77093584..87999a2fc 100644 --- a/bind8/config-freebsd-3.0 +++ b/bind8/config-freebsd-3.0 @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-freebsd-3.1-3.5 b/bind8/config-freebsd-3.1-3.5 index c573c045f..e41ce3c45 100644 --- a/bind8/config-freebsd-3.1-3.5 +++ b/bind8/config-freebsd-3.1-3.5 @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-freebsd-4.0-ALL b/bind8/config-freebsd-4.0-ALL index 25c489026..d0d95c7e7 100644 --- a/bind8/config-freebsd-4.0-ALL +++ b/bind8/config-freebsd-4.0-ALL @@ -40,3 +40,4 @@ other_slaves=1 force_random=0 spf_record=0 pid_file=/var/run/named/pid +dnssec_info=1 diff --git a/bind8/config-generic-linux b/bind8/config-generic-linux index 6cbc2f18a..9b723dbf4 100644 --- a/bind8/config-generic-linux +++ b/bind8/config-generic-linux @@ -40,3 +40,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-gentoo-linux b/bind8/config-gentoo-linux index e1489cff3..a12200f97 100644 --- a/bind8/config-gentoo-linux +++ b/bind8/config-gentoo-linux @@ -42,3 +42,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-hpux b/bind8/config-hpux index c573c045f..e41ce3c45 100644 --- a/bind8/config-hpux +++ b/bind8/config-hpux @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-irix b/bind8/config-irix index c573c045f..e41ce3c45 100644 --- a/bind8/config-irix +++ b/bind8/config-irix @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-macos b/bind8/config-macos index f62e8cdf2..fe1e3b24d 100644 --- a/bind8/config-macos +++ b/bind8/config-macos @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-macos-1.3-ALL b/bind8/config-macos-1.3-ALL index 42d7df150..e0375ba5e 100644 --- a/bind8/config-macos-1.3-ALL +++ b/bind8/config-macos-1.3-ALL @@ -40,3 +40,4 @@ other_slaves=1 pid_file=/var/run/named/named.pid /private/var/run/named/named.pid force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-mandrake-linux b/bind8/config-mandrake-linux index 78d9cc615..0908493f5 100644 --- a/bind8/config-mandrake-linux +++ b/bind8/config-mandrake-linux @@ -42,3 +42,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-mandrake-linux-10.2-ALL b/bind8/config-mandrake-linux-10.2-ALL index 21334de3c..da7f14e54 100644 --- a/bind8/config-mandrake-linux-10.2-ALL +++ b/bind8/config-mandrake-linux-10.2-ALL @@ -42,3 +42,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-msc-linux b/bind8/config-msc-linux index 1a67792d8..fd46bf73d 100644 --- a/bind8/config-msc-linux +++ b/bind8/config-msc-linux @@ -41,3 +41,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-netbsd b/bind8/config-netbsd index a77093584..87999a2fc 100644 --- a/bind8/config-netbsd +++ b/bind8/config-netbsd @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-open-linux b/bind8/config-open-linux index 2e469fd22..c13c1d75d 100644 --- a/bind8/config-open-linux +++ b/bind8/config-open-linux @@ -41,3 +41,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-openbsd-2.5-3.1 b/bind8/config-openbsd-2.5-3.1 index c573c045f..e41ce3c45 100644 --- a/bind8/config-openbsd-2.5-3.1 +++ b/bind8/config-openbsd-2.5-3.1 @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-openbsd-3.2-ALL b/bind8/config-openbsd-3.2-ALL index 1cdf2a82d..4e6fce78f 100644 --- a/bind8/config-openbsd-3.2-ALL +++ b/bind8/config-openbsd-3.2-ALL @@ -40,3 +40,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-openmamba-linux b/bind8/config-openmamba-linux index 2e469fd22..c13c1d75d 100644 --- a/bind8/config-openmamba-linux +++ b/bind8/config-openmamba-linux @@ -41,3 +41,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-openserver b/bind8/config-openserver index c573c045f..e41ce3c45 100644 --- a/bind8/config-openserver +++ b/bind8/config-openserver @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-osf1 b/bind8/config-osf1 index c573c045f..e41ce3c45 100644 --- a/bind8/config-osf1 +++ b/bind8/config-osf1 @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-pardus-linux b/bind8/config-pardus-linux index 025a9a9a8..ded8beb67 100644 --- a/bind8/config-pardus-linux +++ b/bind8/config-pardus-linux @@ -44,3 +44,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-redhat-linux b/bind8/config-redhat-linux index 2e469fd22..c13c1d75d 100644 --- a/bind8/config-redhat-linux +++ b/bind8/config-redhat-linux @@ -41,3 +41,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-redhat-linux-10.0 b/bind8/config-redhat-linux-10.0 index fa5844016..0d55efb9b 100644 --- a/bind8/config-redhat-linux-10.0 +++ b/bind8/config-redhat-linux-10.0 @@ -46,3 +46,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-redhat-linux-11.0-23.0 b/bind8/config-redhat-linux-11.0-23.0 index cdf8daffc..e848f062e 100644 --- a/bind8/config-redhat-linux-11.0-23.0 +++ b/bind8/config-redhat-linux-11.0-23.0 @@ -46,3 +46,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-redhat-linux-24.0-ALL b/bind8/config-redhat-linux-24.0-ALL index 625503574..d2df1ce6a 100644 --- a/bind8/config-redhat-linux-24.0-ALL +++ b/bind8/config-redhat-linux-24.0-ALL @@ -46,3 +46,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-redhat-linux-7.1-9.0 b/bind8/config-redhat-linux-7.1-9.0 index 321a1855e..b934e89e4 100644 --- a/bind8/config-redhat-linux-7.1-9.0 +++ b/bind8/config-redhat-linux-7.1-9.0 @@ -42,3 +42,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-slackware-linux b/bind8/config-slackware-linux index c573c045f..e41ce3c45 100644 --- a/bind8/config-slackware-linux +++ b/bind8/config-slackware-linux @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-slackware-linux-8.0-ALL b/bind8/config-slackware-linux-8.0-ALL index 19f3b3ca3..5d3c560e4 100644 --- a/bind8/config-slackware-linux-8.0-ALL +++ b/bind8/config-slackware-linux-8.0-ALL @@ -40,3 +40,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-sol-linux b/bind8/config-sol-linux index 0482d76a2..47422a0d5 100644 --- a/bind8/config-sol-linux +++ b/bind8/config-sol-linux @@ -42,3 +42,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-solaris b/bind8/config-solaris index 310e0bfe3..49eaa3c90 100644 --- a/bind8/config-solaris +++ b/bind8/config-solaris @@ -40,3 +40,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-solaris-10-ALL b/bind8/config-solaris-10-ALL index 6a06c52c4..fa9aa3fd6 100644 --- a/bind8/config-solaris-10-ALL +++ b/bind8/config-solaris-10-ALL @@ -40,3 +40,4 @@ checkconf=/usr/bin/named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-solaris-7-9 b/bind8/config-solaris-7-9 index 3e1d55aa4..abf794d21 100644 --- a/bind8/config-solaris-7-9 +++ b/bind8/config-solaris-7-9 @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-suse-linux b/bind8/config-suse-linux index dbc9bfe6e..ed975a460 100644 --- a/bind8/config-suse-linux +++ b/bind8/config-suse-linux @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-suse-linux-8.2 b/bind8/config-suse-linux-8.2 index 2b866ab82..3659d317d 100644 --- a/bind8/config-suse-linux-8.2 +++ b/bind8/config-suse-linux-8.2 @@ -44,3 +44,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-suse-linux-9.0-9.2 b/bind8/config-suse-linux-9.0-9.2 index 8aac52ab0..7ae9d8f01 100644 --- a/bind8/config-suse-linux-9.0-9.2 +++ b/bind8/config-suse-linux-9.0-9.2 @@ -45,3 +45,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-suse-linux-9.3-ALL b/bind8/config-suse-linux-9.3-ALL index cbcf98e2c..22e5ba998 100644 --- a/bind8/config-suse-linux-9.3-ALL +++ b/bind8/config-suse-linux-9.3-ALL @@ -47,3 +47,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-syno-linux b/bind8/config-syno-linux index 685cf412e..05603f78f 100644 --- a/bind8/config-syno-linux +++ b/bind8/config-syno-linux @@ -34,3 +34,4 @@ updserial_def=0 other_slaves=1 updserial_man=1 master_ttl=1 +dnssec_info=1 diff --git a/bind8/config-trustix-linux b/bind8/config-trustix-linux index d7db98e3f..748c69089 100644 --- a/bind8/config-trustix-linux +++ b/bind8/config-trustix-linux @@ -46,3 +46,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-trustix-linux-2.1 b/bind8/config-trustix-linux-2.1 index e2433a222..085c91ccc 100644 --- a/bind8/config-trustix-linux-2.1 +++ b/bind8/config-trustix-linux-2.1 @@ -46,3 +46,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-trustix-linux-2.2-ALL b/bind8/config-trustix-linux-2.2-ALL index e786eb615..0b85c428e 100644 --- a/bind8/config-trustix-linux-2.2-ALL +++ b/bind8/config-trustix-linux-2.2-ALL @@ -46,3 +46,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-turbo-linux b/bind8/config-turbo-linux index 55f429d5d..f1c8d35a9 100644 --- a/bind8/config-turbo-linux +++ b/bind8/config-turbo-linux @@ -39,3 +39,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-united-linux b/bind8/config-united-linux index 938d58d51..0cf1b0614 100644 --- a/bind8/config-united-linux +++ b/bind8/config-united-linux @@ -42,3 +42,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-unixware b/bind8/config-unixware index 91eea4005..5ac38cad9 100644 --- a/bind8/config-unixware +++ b/bind8/config-unixware @@ -40,3 +40,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config-windows b/bind8/config-windows index 5a893123d..1f4bd70aa 100644 --- a/bind8/config-windows +++ b/bind8/config-windows @@ -57,3 +57,4 @@ checkconf=named-checkconf other_slaves=1 force_random=0 spf_record=0 +dnssec_info=1 diff --git a/bind8/config.info b/bind8/config.info index 9cc8364ec..3f6d5d08a 100644 --- a/bind8/config.info +++ b/bind8/config.info @@ -24,6 +24,7 @@ extra_forward=Extra record types for forward zones,0 extra_reverse=Extra record types for reverse zones,0 largezones=Show records in zones?,1,0-Yes,1-No (for large zones) default_view=Default view for new zones,3,First in list +dnssec_info=Show DNSSEC expired zones on system information page?,1,1-Yes,0-No line2=Zone file options,11 soa_style=Serial number style,1,0-Running number,1-Date based (YYYYMMDDnn),2-Unix time diff --git a/bind8/records-lib.pl b/bind8/records-lib.pl index 059234831..d4dc851f9 100755 --- a/bind8/records-lib.pl +++ b/bind8/records-lib.pl @@ -323,6 +323,24 @@ while($i < @tok) { return @rv; } +# files_in_zone_file(file) +# Quickly finds all includes in a zone file +sub files_in_zone_file +{ +my ($file) = @_; +my @rv = ( $file ); +my $fh; +open($fh, "<", $file); +while(<$fh>) { + if (/^\$include\s+(\S+)/) { + my $inc = $1; + push(@rv, &files_in_zone_file($inc)); + } + } +close($fh); +return @rv; +} + # create_record(file, name, ttl, class, type, values, comment) # Add a new record of some type to some zone file sub create_record diff --git a/bind8/system_info.pl b/bind8/system_info.pl index b50b1d11c..33dfbda2e 100644 --- a/bind8/system_info.pl +++ b/bind8/system_info.pl @@ -5,7 +5,8 @@ sub list_system_info { my ($data, $in) = @_; my @rv; -if (&foreign_available($module_name) && $access{'defaults'}) { +if (&foreign_available($module_name) && $access{'defaults'} && + $config{'dnssec_info'}) { # Show DNSSEC client config errors my $err = &check_dnssec_client(); if ($err) { @@ -14,7 +15,8 @@ if (&foreign_available($module_name) && $access{'defaults'}) { 'warning' => $err }); } } -if (&foreign_available($module_name) && !$access{'noconfig'}) { +if (&foreign_available($module_name) && !$access{'noconfig'} && + $config{'dnssec_info'}) { # Show DNSSEC expired domains my @exps = &list_dnssec_expired_domains(); if (@exps) {