diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index 628e731508..7977756eeb 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.39 2000/09/12 10:07:46 bwelling Exp $ */ +/* $Id: dnssec-keygen.c,v 1.40 2000/09/12 11:50:44 bwelling Exp $ */ #include @@ -171,8 +171,6 @@ main(int argc, char **argv) { break; case 'r': randomfile = isc_commandline_argument; - if (randomfile == NULL) - fatal("out of memory"); break; case 'v': endp = NULL; @@ -191,8 +189,6 @@ main(int argc, char **argv) { } setup_entropy(mctx, randomfile, &ectx); - if (randomfile != NULL) - isc_mem_free(mctx, randomfile); ret = dst_lib_init(mctx, ectx, ISC_ENTROPY_BLOCKING | ISC_ENTROPY_GOODONLY); if (ret != ISC_R_SUCCESS) diff --git a/bin/dnssec/dnssec-makekeyset.c b/bin/dnssec/dnssec-makekeyset.c index 9c1be70de3..9236a65d33 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.39 2000/09/12 10:07:47 bwelling Exp $ */ +/* $Id: dnssec-makekeyset.c,v 1.40 2000/09/12 11:50:45 bwelling Exp $ */ #include @@ -144,10 +144,7 @@ main(int argc, char *argv[]) { break; case 'r': - randomfile = isc_mem_strdup(mctx, - isc_commandline_argument); - if (randomfile == NULL) - fatal("out of memory"); + randomfile = isc_commandline_argument; break; case 'v': @@ -175,8 +172,6 @@ main(int argc, char *argv[]) { usage(); setup_entropy(mctx, randomfile, &ectx); - if (randomfile != NULL) - isc_mem_free(mctx, randomfile); eflags = ISC_ENTROPY_BLOCKING; if (!pseudorandom) eflags |= ISC_ENTROPY_GOODONLY; diff --git a/bin/dnssec/dnssec-signkey.c b/bin/dnssec/dnssec-signkey.c index 39e41580d9..75dc7deef3 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.35 2000/09/12 10:07:48 bwelling Exp $ */ +/* $Id: dnssec-signkey.c,v 1.36 2000/09/12 11:50:46 bwelling Exp $ */ #include @@ -195,10 +195,7 @@ main(int argc, char *argv[]) { break; case 'r': - randomfile = isc_mem_strdup(mctx, - isc_commandline_argument); - if (randomfile == NULL) - fatal("out of memory"); + randomfile = isc_commandline_argument; break; case 'v': @@ -231,8 +228,6 @@ main(int argc, char *argv[]) { rdclass = dns_rdataclass_in; setup_entropy(mctx, randomfile, &ectx); - if (randomfile != NULL) - isc_mem_free(mctx, randomfile); eflags = ISC_ENTROPY_BLOCKING; if (!pseudorandom) eflags |= ISC_ENTROPY_GOODONLY;