Commit 97573334 authored by Mark Andrews's avatar Mark Andrews
Browse files

fix up bad merge

parent 39844d47
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dnssec-signzone.c,v 1.215 2009/06/04 02:56:47 tbox Exp $ */ /* $Id: dnssec-signzone.c,v 1.216 2009/06/04 04:33:11 marka Exp $ */
/*! \file */ /*! \file */
...@@ -2916,7 +2916,7 @@ main(int argc, char *argv[]) { ...@@ -2916,7 +2916,7 @@ main(int argc, char *argv[]) {
unsigned char saltbuf[255]; unsigned char saltbuf[255];
hashlist_t hashlist; hashlist_t hashlist;
#define CMDLINE_FLAGS "3:aAc:d:e:f:FghH: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:pPr:s:StUv:z"
/* /*
* Process memory debugging argument first. * Process memory debugging argument first.
...@@ -3003,23 +3003,19 @@ main(int argc, char *argv[]) { ...@@ -3003,23 +3003,19 @@ main(int argc, char *argv[]) {
generateds = ISC_TRUE; generateds = ISC_TRUE;
break; break;
case 'F': case 'H':
/* Reserved for FIPS mode */ iterations = strtoul(isc_commandline_argument,
/* FALLTHROUGH */ &endp, 0);
case '?': if (*endp != '\0')
if (isc_commandline_option != '?') fatal("iterations must be numeric");
fprintf(stderr, "%s: invalid argument -%c\n", if (iterations > 0xffffU)
program, isc_commandline_option); fatal("iterations too big");
/* FALLTHROUGH */ break;
case 'h': case 'h':
usage(); usage();
break; break;
default:
fprintf(stderr, "%s: unhandled option -%c\n",
program, isc_commandline_option);
exit(1);
case 'i': case 'i':
endp = NULL; endp = NULL;
cycle = strtol(isc_commandline_argument, &endp, 0); cycle = strtol(isc_commandline_argument, &endp, 0);
...@@ -3120,6 +3116,9 @@ main(int argc, char *argv[]) { ...@@ -3120,6 +3116,9 @@ main(int argc, char *argv[]) {
ignoreksk = ISC_TRUE; ignoreksk = ISC_TRUE;
break; break;
case 'F':
/* Reserved for FIPS mode */
/* FALLTHROUGH */
case '?': case '?':
if (isc_commandline_option != '?') if (isc_commandline_option != '?')
fprintf(stderr, "%s: invalid argument -%c\n", fprintf(stderr, "%s: invalid argument -%c\n",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment