diff --git a/CHANGES b/CHANGES index 6e06236e45..c7d7e5996f 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,10 @@ 1500. [bug] host failed to lookup MX records. Also look up AAAA records. +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 081de8936a..46dd966e6d 100644 --- 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.19.12.1 2003/08/04 04:20:07 marka Exp $ +# $Id: Makefile.in,v 1.19.12.2 2003/08/25 04:41:17 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_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@ @@ -74,7 +74,7 @@ dnssec-signkey: dnssec-signkey.@O@ ${OBJS} ${DEPLIBS} ${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ dnssec-signkey.@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 e66429ec35..34e9c3d451 100644 --- 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.48.2.1.10.4 2003/08/13 00:53:02 marka Exp $ */ +/* $Id: dnssec-keygen.c,v 1.48.2.1.10.5 2003/08/25 04:41:17 marka Exp $ */ #include @@ -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 e40ab38f18..ef6d73ecce 100644 --- 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.52.2.1.10.1 2003/08/01 23:50:46 marka Exp $ */ +/* $Id: dnssec-makekeyset.c,v 1.52.2.1.10.2 2003/08/25 04:41:17 marka Exp $ */ #include @@ -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-signkey.c b/bin/dnssec/dnssec-signkey.c index 3ad2ede61f..e56ed21c18 100644 --- 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.50.2.2.2.1 2003/08/01 23:50:46 marka Exp $ */ +/* $Id: dnssec-signkey.c,v 1.50.2.2.2.2 2003/08/25 04:41:17 marka Exp $ */ #include @@ -73,6 +73,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 aecafb9056..adbbd2e14a 100644 --- 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.139.2.2.4.5 2003/08/22 06:40:04 marka Exp $ */ +/* $Id: dnssec-signzone.c,v 1.139.2.2.4.6 2003/08/25 04:41:17 marka Exp $ */ #include @@ -1450,6 +1450,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");