From ddac1a2b9822b00aa936ef24c6d971f4a1407532 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Thu, 7 May 2009 09:33:52 +0000 Subject: [PATCH] reserve -F --- CHANGES | 2 ++ bin/dnssec/dnssec-dsfromkey.c | 9 ++++++--- bin/dnssec/dnssec-keyfromlabel.c | 9 ++++++--- bin/dnssec/dnssec-keygen.c | 9 ++++++--- bin/dnssec/dnssec-signzone.c | 8 ++++++-- bin/named/main.c | 8 ++++++-- 6 files changed, 32 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index b4934e43c5..59b78cbc22 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +2598. [func] Reserve the -F flag. [RT #19657] + 2597. [bug] Handle a validation failure with a insecure delegation from a NSEC3 signed master/slave zone. [RT #19464] diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c index c29949bfe6..faf67a8080 100644 --- a/bin/dnssec/dnssec-dsfromkey.c +++ b/bin/dnssec/dnssec-dsfromkey.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-dsfromkey.c,v 1.5 2009/03/02 03:01:04 marka Exp $ */ +/* $Id: dnssec-dsfromkey.c,v 1.6 2009/05/07 09:33:52 fdupont Exp $ */ /*! \file */ @@ -267,7 +267,7 @@ main(int argc, char **argv) { isc_commandline_errprint = ISC_FALSE; while ((ch = isc_commandline_parse(argc, argv, - "12a:c:d:sv:h")) != -1) { + "12a:c:d:sv:Fh")) != -1) { switch (ch) { case '1': dtype = DNS_DSDIGEST_SHA1; @@ -295,11 +295,14 @@ main(int argc, char **argv) { if (*endp != '\0') fatal("-v must be followed by a number"); break; + case 'F': + /* Reserved for FIPS mode */ + /* FALLTHROUGH */ case '?': if (isc_commandline_option != '?') fprintf(stderr, "%s: invalid argument -%c\n", program, isc_commandline_option); - /* Falls into */ + /* FALLTHROUGH */ case 'h': usage(); diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c index e7587c3966..4df382afdc 100644 --- a/bin/dnssec/dnssec-keyfromlabel.c +++ b/bin/dnssec/dnssec-keyfromlabel.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-keyfromlabel.c,v 1.4 2008/09/24 02:46:21 marka Exp $ */ +/* $Id: dnssec-keyfromlabel.c,v 1.5 2009/05/07 09:33:52 fdupont Exp $ */ /*! \file */ @@ -113,7 +113,7 @@ main(int argc, char **argv) { isc_commandline_errprint = ISC_FALSE; while ((ch = isc_commandline_parse(argc, argv, - "a:c:f:kl:n:p:t:v:h")) != -1) + "a:c:f:kl:n:p:t:v:Fh")) != -1) { switch (ch) { case 'a': @@ -152,11 +152,14 @@ main(int argc, char **argv) { if (*endp != '\0') fatal("-v must be followed by a number"); break; - + case 'F': + /* Reserved for FIPS mode */ + /* FALLTHROUGH */ case '?': if (isc_commandline_option != '?') fprintf(stderr, "%s: invalid argument -%c\n", program, isc_commandline_option); + /* FALLTHROUGH */ case 'h': usage(); diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index 614d388eb7..db655bb131 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.81 2008/09/25 04:02:38 tbox Exp $ */ +/* $Id: dnssec-keygen.c,v 1.82 2009/05/07 09:33:52 fdupont Exp $ */ /*! \file */ @@ -154,7 +154,7 @@ main(int argc, char **argv) { isc_commandline_errprint = ISC_FALSE; while ((ch = isc_commandline_parse(argc, argv, - "a:b:c:d:ef:g:kn:t:p:s:r:v:h")) != -1) + "a:b:c:d:ef:g:kn:t:p:s:r:v:Fh")) != -1) { switch (ch) { case 'a': @@ -220,11 +220,14 @@ main(int argc, char **argv) { if (*endp != '\0') fatal("-v must be followed by a number"); break; - + case 'F': + /* Reserved for FIPS mode */ + /* FALLTHROUGH */ case '?': if (isc_commandline_option != '?') fprintf(stderr, "%s: invalid argument -%c\n", program, isc_commandline_option); + /* FALLTHROUGH */ case 'h': usage(); diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 843d960ef4..81706733c3 100644 --- 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.212 2009/01/17 10:26:17 fdupont Exp $ */ +/* $Id: dnssec-signzone.c,v 1.213 2009/05/07 09:33:52 fdupont Exp $ */ /*! \file */ @@ -2448,7 +2448,7 @@ main(int argc, char *argv[]) { unsigned char saltbuf[255]; hashlist_t hashlist; -#define CMDLINE_FLAGS "3:aAc:d:e:f:ghH:i:I:j:k:l:m:n:N:o:O:pr:s:StUv:z" +#define CMDLINE_FLAGS "3:aAc:d:e:f:FghH:i:I:j:k:l:m:n:N:o:O:pr:s:StUv:z" /* * Process memory debugging argument first. @@ -2535,10 +2535,14 @@ main(int argc, char *argv[]) { generateds = ISC_TRUE; break; + case 'F': + /* Reserved for FIPS mode */ + /* FALLTHROUGH */ case '?': if (isc_commandline_option != '?') fprintf(stderr, "%s: invalid argument -%c\n", program, isc_commandline_option); + /* FALLTHROUGH */ case 'h': usage(); break; diff --git a/bin/named/main.c b/bin/named/main.c index 8256282212..a05daf15df 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: main.c,v 1.171 2009/04/03 19:55:59 marka Exp $ */ +/* $Id: main.c,v 1.172 2009/05/07 09:33:52 fdupont Exp $ */ /*! \file */ @@ -359,7 +359,7 @@ parse_command_line(int argc, char *argv[]) { isc_commandline_errprint = ISC_FALSE; while ((ch = isc_commandline_parse(argc, argv, - "46c:C:d:fgi:lm:n:N:p:P:" + "46c:C:d:fFgi:lm:n:N:p:P:" "sS:t:T:u:vVx:")) != -1) { switch (ch) { case '4': @@ -472,12 +472,16 @@ parse_command_line(int argc, char *argv[]) { printf("BIND %s built with %s\n", ns_g_version, ns_g_configargs); exit(0); + case 'F': + /* Reserved for FIPS mode */ + /* FALLTHROUGH */ case '?': usage(); if (isc_commandline_option == '?') exit(0); ns_main_earlyfatal("unknown option '-%c'", isc_commandline_option); + /* FALLTHROUGH */ default: ns_main_earlyfatal("parsing options returned %d", ch); }