3211. [func] dnssec-signzone: "-f -" prints to stdout; "-O full"

			option prints in single-line-per-record format.
			[RT #20287]

diff --git a/CHANGES b/CHANGES
index 95e045582fffb0d9102fedf002939bab2a98b083..5757e3af41049dbc6de57c0edee96f769fc48569 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3211.  [func]          dnssec-signzone: "-f -" prints to stdout; "-O full"
+                       option prints in single-line-per-record format.
+                       [RT #20287]
+
 3210.  [bug]           Canceling the oldest query due to recursive-client
                        overload could trigger an assertion failure. [RT #26463]
 

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 52cea879780b84ad8b03d5482881122f48e29b1d..0bf289ca0d25d5d11ffff8c97bf0ecd2cde3f62f 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.280 2011/10/11 19:26:05 each Exp $ */
+/* $Id: dnssec-signzone.c,v 1.281 2011/11/07 23:16:31 each Exp $ */
 
 /*! \file */
 
@@ -37,6 +37,7 @@
 
 #include <stdlib.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <isc/app.h>
 #include <isc/base32.h>
@@ -133,7 +134,7 @@ static isc_mem_t *mctx = NULL;
 static isc_entropy_t *ectx = NULL;
 static dns_ttl_t zone_soa_min_ttl;
 static dns_ttl_t soa_ttl;
-static FILE *fp;
+static FILE *fp = NULL;
 static char *tempfile = NULL;
 static const dns_master_style_t *masterstyle;
 static dns_masterformat_t inputformat = dns_masterformat_text;
@@ -174,6 +175,7 @@ static dns_ttl_t keyttl;
 static isc_boolean_t smartsign = ISC_FALSE;
 static isc_boolean_t remove_orphans = ISC_FALSE;
 static isc_boolean_t output_dnssec_only = ISC_FALSE;
+static isc_boolean_t output_stdout = ISC_FALSE;
 
 #define INCSTAT(counter)               \
        if (printstats) {               \
@@ -3403,30 +3405,32 @@ print_stats(isc_time_t *timer_start, isc_time_t *timer_finish,
        isc_uint64_t time_us;      /* Time in microseconds */
        isc_uint64_t time_ms;      /* Time in milliseconds */
        isc_uint64_t sig_ms;       /* Signatures per millisecond */
+       FILE *out = output_stdout ? stderr : stdout;
 
-       printf("Signatures generated:               %10d\n", nsigned);
-       printf("Signatures retained:                %10d\n", nretained);
-       printf("Signatures dropped:                 %10d\n", ndropped);
-       printf("Signatures successfully verified:   %10d\n", nverified);
-       printf("Signatures unsuccessfully verified: %10d\n", nverifyfailed);
+       fprintf(out, "Signatures generated:               %10d\n", nsigned);
+       fprintf(out, "Signatures retained:                %10d\n", nretained);
+       fprintf(out, "Signatures dropped:                 %10d\n", ndropped);
+       fprintf(out, "Signatures successfully verified:   %10d\n", nverified);
+       fprintf(out, "Signatures unsuccessfully "
+                    "verified: %10d\n", nverifyfailed);
 
        time_us = isc_time_microdiff(sign_finish, sign_start);
        time_ms = time_us / 1000;
-       printf("Signing time in seconds:           %7u.%03u\n",
-              (unsigned int) (time_ms / 1000),
-              (unsigned int) (time_ms % 1000));
+       fprintf(out, "Signing time in seconds:           %7u.%03u\n",
+               (unsigned int) (time_ms / 1000),
+               (unsigned int) (time_ms % 1000));
        if (time_us > 0) {
                sig_ms = ((isc_uint64_t)nsigned * 1000000000) / time_us;
-               printf("Signatures per second:             %7u.%03u\n",
-                      (unsigned int) sig_ms / 1000,
-                      (unsigned int) sig_ms % 1000);
+               fprintf(out, "Signatures per second:             %7u.%03u\n",
+                       (unsigned int) sig_ms / 1000,
+                       (unsigned int) sig_ms % 1000);
        }
 
        time_us = isc_time_microdiff(timer_finish, timer_start);
        time_ms = time_us / 1000;
-       printf("Runtime in seconds:                %7u.%03u\n",
-              (unsigned int) (time_ms / 1000),
-              (unsigned int) (time_ms % 1000));
+       fprintf(out, "Runtime in seconds:                %7u.%03u\n",
+               (unsigned int) (time_ms / 1000),
+               (unsigned int) (time_ms % 1000));
 }
 
 int
@@ -3453,7 +3457,7 @@ main(int argc, char *argv[]) {
 #endif
        unsigned int eflags;
        isc_boolean_t free_output = ISC_FALSE;
-       int tempfilelen;
+       int tempfilelen = 0;
        dns_rdataclass_t rdclass;
        isc_task_t **tasks = NULL;
        isc_buffer_t b;
@@ -3565,6 +3569,8 @@ main(int argc, char *argv[]) {
 
                case 'f':
                        output = isc_commandline_argument;
+                       if (strcmp(output, "-") == 0)
+                               output_stdout = ISC_TRUE;
                        break;
 
                case 'g':
@@ -3811,7 +3817,10 @@ main(int argc, char *argv[]) {
                        outputformat = dns_masterformat_text;
                else if (strcasecmp(outputformatstr, "raw") == 0)
                        outputformat = dns_masterformat_raw;
-               else
+               else if (strcasecmp(outputformatstr, "full") == 0) {
+                       outputformat = dns_masterformat_text;
+                       masterstyle = &dns_master_style_full;
+               } else
                        fatal("unknown file format: %s\n", outputformatstr);
        }
 
@@ -3967,21 +3976,26 @@ main(int argc, char *argv[]) {
                }
        }
 
-       tempfilelen = strlen(output) + 20;
-       tempfile = isc_mem_get(mctx, tempfilelen);
-       if (tempfile == NULL)
-               fatal("out of memory");
+       if (output_stdout) {
+               fp = stdout;
+               if (outputformatstr == NULL)
+                       masterstyle = &dns_master_style_full;
+       } else {
+               tempfilelen = strlen(output) + 20;
+               tempfile = isc_mem_get(mctx, tempfilelen);
+               if (tempfile == NULL)
+                       fatal("out of memory"); 
 
-       result = isc_file_mktemplate(output, tempfile, tempfilelen);
-       check_result(result, "isc_file_mktemplate");
+               result = isc_file_mktemplate(output, tempfile, tempfilelen);
+               check_result(result, "isc_file_mktemplate"); 
 
-       fp = NULL;
-       result = isc_file_openunique(tempfile, &fp);
-       if (result != ISC_R_SUCCESS)
-               fatal("failed to open temporary output file: %s",
-                     isc_result_totext(result));
-       removefile = ISC_TRUE;
-       setfatalcallback(&removetempfile);
+               result = isc_file_openunique(tempfile, &fp);
+               if (result != ISC_R_SUCCESS)
+                       fatal("failed to open temporary output file: %s",
+                             isc_result_totext(result));
+               removefile = ISC_TRUE;
+               setfatalcallback(&removetempfile);
+       }
 
        print_time(fp);
        print_version(fp);
@@ -4047,20 +4061,22 @@ main(int argc, char *argv[]) {
                check_result(result, "dns_master_dumptostream2");
        }
 
-       result = isc_stdio_close(fp);
-       check_result(result, "isc_stdio_close");
-       removefile = ISC_FALSE;
-
-       result = isc_file_rename(tempfile, output);
-       if (result != ISC_R_SUCCESS)
-               fatal("failed to rename temp file to %s: %s\n",
-                     output, isc_result_totext(result));
-
        DESTROYLOCK(&namelock);
        if (printstats)
                DESTROYLOCK(&statslock);
 
-       printf("%s\n", output);
+       if (!output_stdout) {
+               result = isc_stdio_close(fp);
+               check_result(result, "isc_stdio_close");
+               removefile = ISC_FALSE; 
+
+               result = isc_file_rename(tempfile, output);
+               if (result != ISC_R_SUCCESS)
+                       fatal("failed to rename temp file to %s: %s\n",
+                             output, isc_result_totext(result));
+
+               printf("%s\n", output);
+       }
 
        dns_db_closeversion(gdb, &gversion, ISC_FALSE);
        dns_db_detach(&gdb);
@@ -4071,7 +4087,8 @@ main(int argc, char *argv[]) {
                dns_dnsseckey_destroy(mctx, &key);
        }
 
-       isc_mem_put(mctx, tempfile, tempfilelen);
+       if (tempfilelen != 0)
+               isc_mem_put(mctx, tempfile, tempfilelen);
 
        if (free_output)
                isc_mem_free(mctx, output);

diff --git a/bin/dnssec/dnssec-signzone.docbook b/bin/dnssec/dnssec-signzone.docbook
index 342c498651f96a83b0882bcd340ca58e92d3b2d3..d571e95d21579cbebf8d1d659f1a622410a9b32d 100644 (file)
--- a/bin/dnssec/dnssec-signzone.docbook
+++ b/bin/dnssec/dnssec-signzone.docbook
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-signzone.docbook,v 1.49 2011/03/21 07:26:47 each Exp $ -->
+<!-- $Id: dnssec-signzone.docbook,v 1.50 2011/11/07 23:16:31 each Exp $ -->
 <refentry id="man.dnssec-signzone">
   <refentryinfo>
     <date>June 05, 2009</date>
@@ -288,8 +288,10 @@
           <para>
             The name of the output file containing the signed zone.  The
             default is to append <filename>.signed</filename> to
-            the
-            input filename.
+            the input filename.  If <option>output-file</option> is
+            set to <literal>"-"</literal>, then the signed zone is
+            written to the standard output, with a default output
+            format of "full".
           </para>
         </listitem>
       </varlistentry>
@@ -433,7 +435,9 @@
           <para>
             The format of the output file containing the signed zone.
            Possible formats are <command>"text"</command> (default)
-           and <command>"raw"</command>.
+           <command>"raw"</command>, and <command>"full"</command>,
+            which is text output in a format suitable for processing
+            by external scripts.
           </para>
         </listitem>
       </varlistentry>

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index f2ca9373b7539c828e83cae7b4dfe564c49f4772..a7ce2d1d9070bd4e3e07d588795681367405848e 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.103 2011/11/04 10:41:38 marka Exp $
+# $Id: tests.sh,v 1.104 2011/11/07 23:16:31 each Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -1105,6 +1105,18 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
+echo "I:checking dnssec-signzone output format ($n)"
+ret=0
+(
+cd signer
+$SIGNER -O full -f - -Sxt -o example example.db > signer.out.3 2>&1
+$SIGNER -O text -f - -Sxt -o example example.db > signer.out.4 2>&1
+) || ret=1
+awk '/IN *SOA/ {if (NF != 11) exit(1)}' signer/signer.out.3 || ret=1
+awk '/IN *SOA/ {if (NF != 7) exit(1)}' signer/signer.out.4 || ret=1
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
 echo "I:checking validated data are not cached longer than originalttl ($n)"
 ret=0
 $DIG $DIGOPTS +ttl +noauth a.ttlpatch.example. @10.53.0.3 a > dig.out.ns3.test$n || ret=1

diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index e948922034f078de07da8014724218df38a1b7cc..ff5438775410af0597b07f705c5dfc14a29a41bc 100644 (file)
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.c,v 1.109 2011/09/07 19:11:13 each Exp $ */
+/* $Id: masterdump.c,v 1.110 2011/11/07 23:16:31 each Exp $ */
 
 /*! \file */
 
@@ -1150,20 +1150,52 @@ dns_dumpctx_cancel(dns_dumpctx_t *dctx) {
 }
 
 static isc_result_t
-closeandrename(FILE *f, isc_result_t result, const char *temp, const char *file)
-{
-       isc_result_t tresult;
+flushandsync(FILE *f, isc_result_t result, const char *temp) {
        isc_boolean_t logit = ISC_TF(result == ISC_R_SUCCESS);
 
        if (result == ISC_R_SUCCESS)
-               result = isc_stdio_sync(f);
+               result = isc_stdio_flush(f);
        if (result != ISC_R_SUCCESS && logit) {
-               isc_log_write(dns_lctx, ISC_LOGCATEGORY_GENERAL,
-                             DNS_LOGMODULE_MASTERDUMP, ISC_LOG_ERROR,
-                             "dumping master file: %s: fsync: %s",
-                             temp, isc_result_totext(result));
+               if (temp != NULL)
+                       isc_log_write(dns_lctx, ISC_LOGCATEGORY_GENERAL,
+                                     DNS_LOGMODULE_MASTERDUMP, ISC_LOG_ERROR,
+                                     "dumping to master file: %s: flush: %s",
+                                     temp, isc_result_totext(result));
+               else
+                       isc_log_write(dns_lctx, ISC_LOGCATEGORY_GENERAL,
+                                     DNS_LOGMODULE_MASTERDUMP, ISC_LOG_ERROR,
+                                     "dumping to stream: flush: %s",
+                                     isc_result_totext(result));
                logit = ISC_FALSE;
        }
+
+       if (result == ISC_R_SUCCESS)
+               result = isc_stdio_sync(f);
+       if (result != ISC_R_SUCCESS && logit) {
+               if (temp != NULL)
+                       isc_log_write(dns_lctx, ISC_LOGCATEGORY_GENERAL,
+                                     DNS_LOGMODULE_MASTERDUMP, ISC_LOG_ERROR,
+                                     "dumping to master file: %s: fsync: %s",
+                                     temp, isc_result_totext(result));
+               else
+                       isc_log_write(dns_lctx, ISC_LOGCATEGORY_GENERAL,
+                                     DNS_LOGMODULE_MASTERDUMP, ISC_LOG_ERROR,
+                                     "dumping to stream: fsync: %s",
+                                     isc_result_totext(result));
+       }
+       return (result);
+}
+
+static isc_result_t
+closeandrename(FILE *f, isc_result_t result, const char *temp, const char *file)
+{
+       isc_result_t tresult;
+       isc_boolean_t logit = ISC_TF(result == ISC_R_SUCCESS);
+
+       result = flushandsync(f, result, temp);
+       if (result != ISC_R_SUCCESS)
+               logit = ISC_FALSE;
+
        tresult = isc_stdio_close(f);
        if (result == ISC_R_SUCCESS)
                result = tresult;
@@ -1211,7 +1243,8 @@ dump_quantum(isc_task_t *task, isc_event_t *event) {
                                         dctx->tmpfile, dctx->file);
                if (tresult != ISC_R_SUCCESS && result == ISC_R_SUCCESS)
                        result = tresult;
-       }
+       } else
+               result = flushandsync(dctx->f, result, NULL);
        (dctx->done)(dctx->done_arg, result);
        isc_event_free(&event);
        dns_dumpctx_detach(&dctx);
@@ -1544,6 +1577,8 @@ dns_master_dumptostream2(isc_mem_t *mctx, dns_db_t *db,
        result = dumptostreaminc(dctx);
        INSIST(result != DNS_R_CONTINUE);
        dns_dumpctx_detach(&dctx);
+
+       result = flushandsync(f, result, NULL);
        return (result);
 }