2078. [bug] dnssec-checkzone output style "default" was badly

                        named.  It is now called "relative". [RT #16326]

2077.   [bug]           'dnssec-signzone -O raw' wasn't outputing the
                        complete signed zone. [RT #16326]

diff --git a/CHANGES b/CHANGES
index 95a7f589fb95e90e8b26fc54e049b48bc498fe95..d7dceb51b8bb945c568d60cfb4858f87ec357dc1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+2078.  [bug]           dnssec-checkzone output style "default" was badly
+                       named.  It is now called "relative". [RT #16326]
+
+2077.  [bug]           'dnssec-signzone -O raw' wasn't outputing the
+                       complete signed zone. [RT #16326]
+
 2076.  [bug]           Several files were missing #include <config.h>
                        causing build failures on OSF. [RT #16341]
 

diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index 71b200fc5d9b96b476eed7faefdd57872d2c6583..c5487761fa8de226a4a356034d3ce91de26d5ca9 100644 (file)
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named-checkzone.c,v 1.43 2006/01/07 00:23:35 marka Exp $ */
+/* $Id: named-checkzone.c,v 1.44 2006/08/30 22:57:16 marka Exp $ */
 
 /*! \file */
 
@@ -273,7 +273,7 @@ main(int argc, char **argv) {
                case 's':
                        if (ARGCMP("full"))
                                outputstyle = &dns_master_style_full;
-                       else if (ARGCMP("default")) {
+                       else if (ARGCMP("relative")) {
                                outputstyle = &dns_master_style_default;
                        } else {
                                fprintf(stderr,

diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook
index 0b799c71d70cce97670ff102913e61907ef36d91..524ab28eb3187fc04c33b13e566e3a3083a2a7c3 100644 (file)
--- a/bin/check/named-checkzone.docbook
+++ b/bin/check/named-checkzone.docbook
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named-checkzone.docbook,v 1.25 2006/01/07 00:23:35 marka Exp $ -->
+<!-- $Id: named-checkzone.docbook,v 1.26 2006/08/30 22:57:16 marka Exp $ -->
 <refentry id="man.named-checkzone">
   <refentryinfo>
     <date>June 13, 2000</date>
@@ -311,10 +311,10 @@
          <para>
            Specify the style of the dumped zone file.
            Possible styles are <command>"full"</command> (default)
-           and <command>"default"</command>.
+           and <command>"relative"</command>.
            The full format is most suitable for processing
            automatically by a separate script.
-           On the other hand, the default format is more
+           On the other hand, the relative format is more
            human-readable and is thus suitable for editing by hand.
            For <command>named-checkzone</command>
            this does not cause any effects unless it dumps the zone

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index a58cbca754394b6dbe5f745c2efdb2c486296c66..46650a563549c8e1d28296d31002d627502513c1 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -16,7 +16,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.198 2006/04/13 18:09:56 dhankins Exp $ */
+/* $Id: dnssec-signzone.c,v 1.199 2006/08/30 22:57:16 marka Exp $ */
 
 /*! \file */
 
@@ -1132,6 +1132,9 @@ cleannode(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node) {
        dns_rdataset_t set;
        isc_result_t result, dresult;
 
+       if (outputformat != dns_masterformat_text)
+               return;
+
        dns_rdataset_init(&set);
        result = dns_db_allrdatasets(db, node, version, 0, &rdsiter);
        check_result(result, "dns_db_allrdatasets");