1403. [func] dnssec-signzone, dnssec-keygen, dnssec-makekeyset

                        dnssec-signkey now report their version in the
                        usage message.

diff --git a/CHANGES b/CHANGES
index e1c62835bd49c51419b56bee10fafd086ad0af19..793d66a991b56a61675a8f4338928551737e1977 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1403.  [func]          dnssec-signzone, dnssec-keygen, dnssec-makekeyset
+                       dnssec-signkey now report their version in the
+                       usage message.
+
 1402.  [cleanup]       A6 has been moved to experimental and is no longer
                        fully supported.
 

diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index d9b363bfa49a74d843bb70f4a695edd64f53e917..2234d99e1008e75bb0f3299a78cd375c84e7fc51 100644 (file)
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.22 2002/06/17 04:01:03 marka Exp $
+# $Id: Makefile.in,v 1.23 2002/12/03 05:01:34 marka Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -25,7 +25,7 @@ top_srcdir =  @top_srcdir@
 
 CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES =
+CDEFINES =     -DVERSION=\"${VERSION}\" 
 CWARNINGS =
 
 DNSLIBS =      ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
@@ -57,7 +57,7 @@ dnssec-keygen: dnssec-keygen.@O@ ${OBJS} ${DEPLIBS}
        ${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ dnssec-keygen.@O@ ${OBJS} ${LIBS}
 
 dnssec-signzone.@O@: dnssec-signzone.c
-       ${LIBTOOL} ${PURIFY} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" -c $<
+       ${LIBTOOL} ${PURIFY} ${CC} ${ALL_CFLAGS} -c $<
 
 dnssec-signzone: dnssec-signzone.@O@ ${OBJS} ${DEPLIBS}
        ${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ dnssec-signzone.@O@ ${OBJS} ${LIBS}

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index bd9dfaaf1aeee4c776711bcd1c9369f84df364db..e344db6977c0c9c67b22e47687ae0531f696c086 100644 (file)
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-keygen.c,v 1.61 2002/02/20 03:32:58 marka Exp $ */
+/* $Id: dnssec-keygen.c,v 1.62 2002/12/03 05:01:34 marka Exp $ */
 
 #include <config.h>
 
@@ -60,6 +60,7 @@ usage(void) {
        fprintf(stderr, "Usage:\n");
        fprintf(stderr, "    %s -a alg -b bits -n type [options] name\n\n",
                program);
+       fprintf(stderr, "Version: %s\n", VERSION);
        fprintf(stderr, "Required options:\n");
        fprintf(stderr, "    -a algorithm: %s\n", algs);
        fprintf(stderr, "    -b key size, in bits:\n");

diff --git a/bin/dnssec/dnssec-makekeyset.c b/bin/dnssec/dnssec-makekeyset.c
index 27c32736cfbfcad8839a782dbe53e9bb0f3eb516..079c51d55f051db55b1d0c5a717a0c74814fdb88 100644 (file)
--- a/bin/dnssec/dnssec-makekeyset.c
+++ b/bin/dnssec/dnssec-makekeyset.c
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-makekeyset.c,v 1.58 2001/10/04 23:48:14 gson Exp $ */
+/* $Id: dnssec-makekeyset.c,v 1.59 2002/12/03 05:01:34 marka Exp $ */
 
 #include <config.h>
 
@@ -69,6 +69,8 @@ usage(void) {
 
        fprintf(stderr, "\n");
 
+       fprintf(stderr, "Version: %s\n", VERSION);
+
        fprintf(stderr, "Options: (default value in parenthesis) \n");
        fprintf(stderr, "\t-a\n");
        fprintf(stderr, "\t\tverify generated signatures\n");

diff --git a/bin/dnssec/dnssec-signkey.c b/bin/dnssec/dnssec-signkey.c
index 6bd85af1b10e6c5fee8ba052c1ee2cdef979b685..366e887b209a43a1a0da5e28d3872a50cbab731c 100644 (file)
--- a/bin/dnssec/dnssec-signkey.c
+++ b/bin/dnssec/dnssec-signkey.c
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signkey.c,v 1.57 2001/10/11 22:53:46 gson Exp $ */
+/* $Id: dnssec-signkey.c,v 1.58 2002/12/03 05:01:34 marka Exp $ */
 
 #include <config.h>
 
@@ -71,6 +71,8 @@ usage(void) {
 
        fprintf(stderr, "\n");
 
+       fprintf(stderr, "Version: %s\n", VERSION);
+
        fprintf(stderr, "Options: (default value in parenthesis) \n");
        fprintf(stderr, "\t-a\n");
        fprintf(stderr, "\t\tverify generated signatures\n");

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 514ae8446f21b8b41c337e81a1a9e26e1b310d2c..0a008b366749fe0cff92a4208b5a91d96c2f9d48 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.164 2002/11/12 21:52:43 explorer Exp $ */
+/* $Id: dnssec-signzone.c,v 1.165 2002/12/03 05:01:34 marka Exp $ */
 
 #include <config.h>
 
@@ -1379,6 +1379,8 @@ usage(void) {
 
        fprintf(stderr, "\n");
 
+       fprintf(stderr, "Version: %s\n", VERSION);
+
        fprintf(stderr, "Options: (default value in parenthesis) \n");
        fprintf(stderr, "\t-c class (IN)\n");
        fprintf(stderr, "\t-d directory\n");