diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 002b677d69..1a7f15361f 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -49,6 +49,7 @@ #include #include #include +#include #include @@ -937,6 +938,8 @@ usage() { fprintf(stderr, "\t\tcycle period - regenerate if < cycle from end ( (end-start)/4 )\n"); fprintf(stderr, "\t-v level:\n"); fprintf(stderr, "\t\tverbose level (0)\n"); + fprintf(stderr, "\t-l\n"); + fprintf(stderr, "\t\tturn on logging to standard output\n"); fprintf(stderr, "\t-o origin:\n"); fprintf(stderr, "\t\tzone origin (name of zonefile)\n"); fprintf(stderr, "\t-f outfile:\n"); @@ -968,13 +971,14 @@ main(int argc, char *argv[]) { dns_dbversion_t *version; signer_key_t *key; isc_result_t result; + isc_log_t *log = NULL; dns_result_register(); result = isc_mem_create(0, 0, &mctx); check_result(result, "isc_mem_create()"); - while ((ch = isc_commandline_parse(argc, argv, "s:e:c:v:o:f:h")) != -1) + while ((ch = isc_commandline_parse(argc, argv, "s:e:c:v:o:f:hl")) != -1) { switch (ch) { case 's': @@ -1005,6 +1009,17 @@ main(int argc, char *argv[]) { check_result(ISC_R_FAILURE, "strtol()"); break; + case 'l': + RUNTIME_CHECK(isc_log_create(mctx, &log) == + ISC_R_SUCCESS); + RUNTIME_CHECK(dns_log_init(log) == ISC_R_SUCCESS); + + RUNTIME_CHECK(isc_log_usechannel(log, "default_stderr", + NULL, NULL) + == ISC_R_SUCCESS); + dns_lctx = log; + break; + case 'o': origin = isc_mem_strdup(mctx, isc_commandline_argument); diff --git a/bin/tests/signer.c b/bin/tests/signer.c index 002b677d69..1a7f15361f 100644 --- a/bin/tests/signer.c +++ b/bin/tests/signer.c @@ -49,6 +49,7 @@ #include #include #include +#include #include @@ -937,6 +938,8 @@ usage() { fprintf(stderr, "\t\tcycle period - regenerate if < cycle from end ( (end-start)/4 )\n"); fprintf(stderr, "\t-v level:\n"); fprintf(stderr, "\t\tverbose level (0)\n"); + fprintf(stderr, "\t-l\n"); + fprintf(stderr, "\t\tturn on logging to standard output\n"); fprintf(stderr, "\t-o origin:\n"); fprintf(stderr, "\t\tzone origin (name of zonefile)\n"); fprintf(stderr, "\t-f outfile:\n"); @@ -968,13 +971,14 @@ main(int argc, char *argv[]) { dns_dbversion_t *version; signer_key_t *key; isc_result_t result; + isc_log_t *log = NULL; dns_result_register(); result = isc_mem_create(0, 0, &mctx); check_result(result, "isc_mem_create()"); - while ((ch = isc_commandline_parse(argc, argv, "s:e:c:v:o:f:h")) != -1) + while ((ch = isc_commandline_parse(argc, argv, "s:e:c:v:o:f:hl")) != -1) { switch (ch) { case 's': @@ -1005,6 +1009,17 @@ main(int argc, char *argv[]) { check_result(ISC_R_FAILURE, "strtol()"); break; + case 'l': + RUNTIME_CHECK(isc_log_create(mctx, &log) == + ISC_R_SUCCESS); + RUNTIME_CHECK(dns_log_init(log) == ISC_R_SUCCESS); + + RUNTIME_CHECK(isc_log_usechannel(log, "default_stderr", + NULL, NULL) + == ISC_R_SUCCESS); + dns_lctx = log; + break; + case 'o': origin = isc_mem_strdup(mctx, isc_commandline_argument);