From: Peter van Dijk Date: Tue, 22 Dec 2015 14:37:26 +0000 (+0100) Subject: force show-zone to output DS for ZSK X-Git-Tag: dnsdist-1.0.0-alpha1~22^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fb1ad08367ba039e01b63972d144a3f8f7c8a50;p=pdns force show-zone to output DS for ZSK --- diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master index 5ddcf33d2..0825de9a5 100644 --- a/regression-tests/backends/remote-master +++ b/regression-tests/backends/remote-master @@ -104,7 +104,7 @@ EOF fi # add DS records into list-all-records - $PDNSUTIL --config-dir=. --config-name=remote show-zone up.example.com | gawk '{ if ($1=="DS") { printf "up.example.com. 120 IN DS " $6 " " $7 " " $8 " " substr(toupper($9),0,56); if (length($9)>56) { print " " substr(toupper($9),57) } else { print "" } } }' > $testsdir/list-all-records/expected_dnssec_part2 + $PDNSUTIL --config-dir=. --config-name=remote show-zone -v up.example.com | gawk '{ if ($1=="DS") { printf "up.example.com. 120 IN DS " $6 " " $7 " " $8 " " substr(toupper($9),0,56); if (length($9)>56) { print " " substr(toupper($9),57) } else { print "" } } }' > $testsdir/list-all-records/expected_dnssec_part2 cat $testsdir/list-all-records/expected_dnssec_part1 $testsdir/list-all-records/expected_dnssec_part2 $testsdir/list-all-records/expected_dnssec_part3 > $testsdir/list-all-records/expected_result.dnssec cp -f $testsdir/list-all-records/expected_result.dnssec $testsdir/list-all-records/expected_result.nsec3 fi diff --git a/regression-tests/gsql_feed_ds.pl b/regression-tests/gsql_feed_ds.pl index 92a665563..6d5366b78 100755 --- a/regression-tests/gsql_feed_ds.pl +++ b/regression-tests/gsql_feed_ds.pl @@ -13,7 +13,7 @@ my $sqlcmd = shift; die "Usage: $0 domain parent pdnsutil sqlcmd" unless($domain and $parent and $pdnsutil and $sqlcmd); -open IN, "-|", "$pdnsutil show-zone $domain 2>&1"; +open IN, "-|", "$pdnsutil show-zone -v $domain 2>&1"; my $recs = [];