From 8ebf67b7f0aeea7ef8c6e034c57a1dc57a7b216a Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Thu, 7 Jan 2010 19:13:59 +0000 Subject: [PATCH] 2833. [cleanup] Fix usage messages in dnssec-keygen and dnssec-settime. [RT #20851] --- CHANGES | 3 +++ bin/dnssec/dnssec-keygen.c | 16 +++++++++------- bin/dnssec/dnssec-settime.c | 10 +++++----- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/CHANGES b/CHANGES index f4750d1783..97b1f3c460 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +2833. [cleanup] Fix usage messages in dnssec-keygen and dnssec-settime. + [RT #20851] + 2832. [bug] Modify "struct stat" in lib/export/samples/nsprobe.c to avoid redefinition in some OSes [RT 20831] diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index befd7385f0..9469f687ae 100644 --- a/bin/dnssec/dnssec-keygen.c +++ b/bin/dnssec/dnssec-keygen.c @@ -29,7 +29,7 @@ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-keygen.c,v 1.108 2009/11/25 22:58:48 marka Exp $ */ +/* $Id: dnssec-keygen.c,v 1.109 2010/01/07 19:13:59 each Exp $ */ /*! \file */ @@ -142,14 +142,16 @@ usage(void) { fprintf(stderr, " -m :\n"); fprintf(stderr, " usage | trace | record | size | mctx\n"); fprintf(stderr, " -v : set verbosity level (0 - 10)\n"); - fprintf(stderr, "Date options:\n"); - fprintf(stderr, " -P date/[+-]offset: set key publication date " + fprintf(stderr, "Timing options:\n"); + fprintf(stderr, " -P date/[+-]offset/none: set key publication date " "(default: now)\n"); - fprintf(stderr, " -A date/[+-]offset: set key activation date " + fprintf(stderr, " -A date/[+-]offset/none: set key activation date " "(default: now)\n"); - fprintf(stderr, " -R date/[+-]offset: set key revocation date\n"); - fprintf(stderr, " -I date/[+-]offset: set key inactivation date\n"); - fprintf(stderr, " -D date/[+-]offset: set key deletion date\n"); + fprintf(stderr, " -R date/[+-]offset/none: set key " + "revocation date\n"); + fprintf(stderr, " -I date/[+-]offset/none: set key " + "inactivation date\n"); + fprintf(stderr, " -D date/[+-]offset/none: set key deletion date\n"); fprintf(stderr, " -G: generate key only; do not set -P or -A\n"); fprintf(stderr, " -C: generate a backward-compatible key, omitting " "all dates\n"); diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c index 003642d406..ae02778314 100644 --- 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.23 2010/01/06 23:48:47 tbox Exp $ */ +/* $Id: dnssec-settime.c,v 1.24 2010/01/07 19:13:59 each Exp $ */ /*! \file */ @@ -71,13 +71,13 @@ usage(void) { fprintf(stderr, "Timing options:\n"); fprintf(stderr, " -P date/[+-]offset/none: set/unset key " "publication date\n"); - fprintf(stderr, " -A date/[+-]offset/none: set key " + fprintf(stderr, " -A date/[+-]offset/none: set/unset key " "activation date\n"); - fprintf(stderr, " -R date/[+-]offset/none: set key " + fprintf(stderr, " -R date/[+-]offset/none: set/unset key " "revocation date\n"); - fprintf(stderr, " -I date/[+-]offset/none: set key " + fprintf(stderr, " -I date/[+-]offset/none: set/unset key " "inactivation date\n"); - fprintf(stderr, " -D date/[+-]offset/none: set key " + fprintf(stderr, " -D date/[+-]offset/none: set/unset key " "deletion date\n"); fprintf(stderr, "Printing options:\n"); fprintf(stderr, " -p C/P/A/R/U/D/all: print a particular time "