2809. [cleanup] Restored accidentally-deleted text in usage output

			in dnssec-settime and dnssec-revoke [RT #20739]

diff --git a/CHANGES b/CHANGES
index 492d6d3ea874e5904c6446dd85d5fd8574a58132..9c9d25c860213a4ed2d7bc10503855cd71a38432 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2809.  [cleanup]       Restored accidentally-deleted text in usage output
+                       in dnssec-settime and dnssec-revoke [RT #20739]
+
 2808.  [bug]           Remove the attempt to install atomic.h from lib/isc.
                        atomic.h is correctly installed by the architecture
                        specific subdirectories.  [RT #20722]

diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c
index 4df61fd5c011f18983d6393cf39015c6a560c44d..a154a98175042bf404ef8f73102cd9e0cceeca4f 100644 (file)
--- a/bin/dnssec/dnssec-revoke.c
+++ b/bin/dnssec/dnssec-revoke.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-revoke.c,v 1.18 2009/10/27 18:56:48 each Exp $ */
+/* $Id: dnssec-revoke.c,v 1.19 2009/12/18 07:49:42 each Exp $ */
 
 /*! \file */
 
@@ -54,12 +54,11 @@ usage(void) {
        fprintf(stderr, "Usage:\n");
        fprintf(stderr, "    %s [options] keyfile\n\n", program);
        fprintf(stderr, "Version: %s\n", VERSION);
-       fprintf(stderr, "\t-E engine:\n");
 #ifdef USE_PKCS11
-       fprintf(stderr, "\t\tname of an OpenSSL engine to use "
-                               "(default is \"pkcs11\")\n");
+       fprintf(stderr, "    -E engine:    specify OpenSSL engine "
+                                          "(default \"pkcs11\")\n");
 #else
-       fprintf(stderr, "\t\tname of an OpenSSL engine to use\n");
+       fprintf(stderr, "    -E engine:    specify OpenSSL engine\n");
 #endif
        fprintf(stderr, "    -f:           force overwrite\n");
        fprintf(stderr, "    -K directory: use directory for key files\n");

diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c
index 0fedbbb7f930a43838ab4f2adec79909afda73be..9d4f33de2b58d4f6ced35cb2efe39c9d273a38b3 100644 (file)
--- a/bin/dnssec/dnssec-settime.c
+++ b/bin/dnssec/dnssec-settime.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-settime.c,v 1.19 2009/10/27 18:56:49 each Exp $ */
+/* $Id: dnssec-settime.c,v 1.20 2009/12/18 07:49:42 each Exp $ */
 
 /*! \file */
 
@@ -58,10 +58,10 @@ usage(void) {
        fprintf(stderr, "Version: %s\n", VERSION);
        fprintf(stderr, "General options:\n");
 #ifdef USE_PKCS11
-       fprintf(stderr, "\t\tname of an OpenSSL engine to use "
-                               "(default is \"pkcs11\")\n");
+       fprintf(stderr, "     -E engine:         specify OpenSSL engine "
+                                                "(default \"pkcs11\")\n");
 #else
-       fprintf(stderr, "\t\tname of an OpenSSL engine to use\n");
+       fprintf(stderr, "     -E engine:         specify OpenSSL engine\n");
 #endif
        fprintf(stderr, "    -f:                 force update of old-style "
                                                 "keys\n");