From df9aeb663dfbee78c20a034fcd37a789215611fa Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Thu, 29 Nov 2012 09:08:14 -0800 Subject: [PATCH] [v9_9] add timezone to dig 3428. [cleanup] dig: Add timezone to date output. [RT #2269] (cherry picked from commit 706219e547c90fb7d9435b20e70fb4003dc6dfd5) --- CHANGES | 2 ++ bin/dig/dig.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 9a3577bec9..226c093f57 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +3428. [cleanup] dig: Add timezone to date output. [RT #2269] + 3427. [bug] dig +trace incorrectly displayed name server addresses instead of names. [RT #31641] diff --git a/bin/dig/dig.c b/bin/dig/dig.c index 74263c9b0d..66bed6a1d0 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -244,6 +244,8 @@ received(int bytes, isc_sockaddr_t *from, dig_query_t *query) { isc_uint64_t diff; isc_time_t now; time_t tnow; + struct tm tmnow; + char time_str[100]; char fromtext[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_format(from, fromtext, sizeof(fromtext)); @@ -255,7 +257,10 @@ received(int bytes, isc_sockaddr_t *from, dig_query_t *query) { printf(";; Query time: %ld msec\n", (long int)diff/1000); printf(";; SERVER: %s(%s)\n", fromtext, query->servname); time(&tnow); - printf(";; WHEN: %s", ctime(&tnow)); + tmnow = *localtime(&tnow); + if (strftime(time_str, sizeof(time_str), + "%a %b %d %T %Z %Y", &tmnow) > 0) + printf(";; WHEN: %s\n", time_str); if (query->lookup->doing_xfr) { printf(";; XFR size: %u records (messages %u, " "bytes %" ISC_PRINT_QUADFORMAT "u)\n", @@ -263,7 +268,6 @@ received(int bytes, isc_sockaddr_t *from, dig_query_t *query) { query->byte_count); } else { printf(";; MSG SIZE rcvd: %u\n", bytes); - } if (key != NULL) { if (!validated)