mirror of
https://github.com/isc-projects/bind9.git
synced 2026-06-14 00:10:00 -04:00
fix up merge
This commit is contained in:
parent
91c526913b
commit
e5e510dbab
1 changed files with 11 additions and 11 deletions
|
|
@ -29,7 +29,7 @@
|
|||
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: dnssec-signzone.c,v 1.209.12.5 2009/06/04 02:56:14 tbox Exp $ */
|
||||
/* $Id: dnssec-signzone.c,v 1.209.12.6 2009/06/04 03:11:31 marka Exp $ */
|
||||
|
||||
/*! \file */
|
||||
|
||||
|
|
@ -2916,7 +2916,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:ghH:i:I:j:k:l:m:n:N:o:O:pPr:s:StUv:z"
|
||||
|
||||
/*
|
||||
* Process memory debugging argument first.
|
||||
|
|
@ -3003,19 +3003,19 @@ main(int argc, char *argv[]) {
|
|||
generateds = ISC_TRUE;
|
||||
break;
|
||||
|
||||
case '?':
|
||||
if (isc_commandline_option != '?')
|
||||
fprintf(stderr, "%s: invalid argument -%c\n",
|
||||
program, isc_commandline_option);
|
||||
case 'H':
|
||||
iterations = strtoul(isc_commandline_argument,
|
||||
&endp, 0);
|
||||
if (*endp != '\0')
|
||||
fatal("iterations must be numeric");
|
||||
if (iterations > 0xffffU)
|
||||
fatal("iterations too big");
|
||||
break;
|
||||
|
||||
case 'h':
|
||||
usage();
|
||||
break;
|
||||
|
||||
default:
|
||||
fprintf(stderr, "%s: unhandled option -%c\n",
|
||||
program, isc_commandline_option);
|
||||
exit(1);
|
||||
|
||||
case 'i':
|
||||
endp = NULL;
|
||||
cycle = strtol(isc_commandline_argument, &endp, 0);
|
||||
|
|
|
|||
Loading…
Reference in a new issue