mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

2880. [cleanup] Make the output of dnssec-keygen and dnssec-revoke

Browse Source 
consistent. [RT #21078]
This commit is contained in:
Mark Andrews 2010-05-06 05:31:19 +00:00
parent abe0aa7baa
commit 707d9fbd86
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,3 +1,6 @@
2880. [cleanup] Make the output of dnssec-keygen and dnssec-revoke
consistent. [RT #21078]
2879. [contrib] DLZ bdbhpt driver fails to close correct cursor. 2879. [contrib] DLZ bdbhpt driver fails to close correct cursor.
[RT #21106] [RT #21106]

13
bin/dnssec/dnssec-revoke.c
View File

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dnssec-revoke.c,v 1.20 2009/12/18 23:49:02 tbox Exp $ */ /* $Id: dnssec-revoke.c,v 1.21 2010/05/06 05:31:19 marka Exp $ */
/*! \file */ /*! \file */
@ -161,6 +161,10 @@ main(int argc, char **argv) {
fatal("cannot process filename %s: %s", fatal("cannot process filename %s: %s",
argv[isc_commandline_index], argv[isc_commandline_index],
isc_result_totext(result)); isc_result_totext(result));
if (strcmp(dir, ".") == 0) {
isc_mem_free(mctx, dir);
dir = NULL;
}
} }
if (ectx == NULL) if (ectx == NULL)
@ -224,10 +228,8 @@ main(int argc, char **argv) {
isc_result_totext(result)); isc_result_totext(result));
} }
printf("%s\n", newname);
isc_buffer_clear(&buf); isc_buffer_clear(&buf);
dst_key_buildfilename(key, DST_TYPE_PRIVATE, dir, &buf); dst_key_buildfilename(key, 0, dir, &buf);
printf("%s\n", newname); printf("%s\n", newname);
/* /*
@ -259,7 +261,8 @@ cleanup:
cleanup_entropy(&ectx); cleanup_entropy(&ectx);
if (verbose > 10) if (verbose > 10)
isc_mem_stats(mctx, stdout); isc_mem_stats(mctx, stdout);
isc_mem_free(mctx, dir); if (dir != NULL)
isc_mem_free(mctx, dir);
isc_mem_destroy(&mctx); isc_mem_destroy(&mctx);
return (0); return (0);