mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-23 10:39:16 +00:00
Code Issues Releases Wiki Activity

[master] version cleanup

Browse Source 
4073.	[cleanup]	Add libjson-c version number reporting to
			"named -V"; normalize version number formatting.
			[RT #38056]
This commit is contained in:
Evan Hunt 2015-02-26 11:53:11 -08:00
parent f5927ab826
commit 044008f58f
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -1,3 +1,7 @@
4073. [cleanup] Add libjson-c version number reporting to
"named -V"; normalize version number formatting.
[RT #38056]
4072. [func] Add a --enable-querytrace configure switch for 4072. [func] Add a --enable-querytrace configure switch for
very verbose query tracelogging. [RT #37520] very verbose query tracelogging. [RT #37520]

32
bin/named/main.c
View File

@ -625,16 +625,16 @@ parse_command_line(int argc, char *argv[]) {
ns_g_username = isc_commandline_argument; ns_g_username = isc_commandline_argument;
break; break;
case 'v': case 'v':
printf("%s %s", ns_g_product, ns_g_version); printf("%s %s%s%s <id:%s>\n",
if (*ns_g_description != 0) ns_g_product, ns_g_version,
printf(" %s", ns_g_description); (*ns_g_description != '\0') ? " " : "",
printf("\n"); ns_g_description, ns_g_srcid);
exit(0); exit(0);
case 'V': case 'V':
printf("%s %s", ns_g_product, ns_g_version); printf("%s %s%s%s <id:%s>\n", ns_g_product, ns_g_version,
if (*ns_g_description != 0) (*ns_g_description != '\0') ? " " : "",
printf(" %s", ns_g_description); ns_g_description, ns_g_srcid);
printf(" <id:%s> built by %s with %s\n", ns_g_srcid, printf("built by %s with %s\n",
ns_g_builder, ns_g_configargs); ns_g_builder, ns_g_configargs);
#ifdef __clang__ #ifdef __clang__
printf("compiled by CLANG %s\n", __VERSION__); printf("compiled by CLANG %s\n", __VERSION__);
@ -664,6 +664,12 @@ parse_command_line(int argc, char *argv[]) {
LIBXML_DOTTED_VERSION); LIBXML_DOTTED_VERSION);
printf("linked to libxml2 version: %s\n", printf("linked to libxml2 version: %s\n",
xmlParserVersion); xmlParserVersion);
#endif
#ifdef HAVE_JSON
printf("compiled with libjson-c version: %s\n",
JSON_C_VERSION);
printf("linked to libjson-c version: %s\n",
json_c_version());
#endif #endif
exit(0); exit(0);
case 'x': case 'x':
@ -992,12 +998,18 @@ setup(void) {
isc_result_totext(result)); isc_result_totext(result));
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
ISC_LOG_NOTICE, "starting %s %s%s", ns_g_product, ISC_LOG_NOTICE, "starting %s %s%s%s <id:%s>",
ns_g_version, saved_command_line); ns_g_product, ns_g_version,
*ns_g_description ? " " : "", ns_g_description,
ns_g_srcid);
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
ISC_LOG_NOTICE, "built with %s", ns_g_configargs); ISC_LOG_NOTICE, "built with %s", ns_g_configargs);
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
ISC_LOG_NOTICE, "running as: %s%s",
program_name, saved_command_line);
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
ISC_LOG_NOTICE, ISC_LOG_NOTICE,
"----------------------------------------------------"); "----------------------------------------------------");

6
bin/named/server.c
View File

@ -8342,8 +8342,10 @@ ns_server_status(ns_server_t *server, isc_buffer_t **text) {
isc_time_formathttptimestamp(&ns_g_configtime, configtime, isc_time_formathttptimestamp(&ns_g_configtime, configtime,
sizeof(configtime)); sizeof(configtime));
snprintf(line, sizeof(line), "version: %s%s%s%s <id:%s>\n", snprintf(line, sizeof(line), "version: %s %s%s%s <id:%s>%s%s%s\n",
ns_g_version, ob, alt, cb, ns_g_srcid); ns_g_product, ns_g_version,
(*ns_g_description != '\0') ? " " : "",
ns_g_description, ns_g_srcid, ob, alt, cb);
CHECK(putstr(text, line)); CHECK(putstr(text, line));
snprintf(line, sizeof(line), "boot time: %s\n", boottime); snprintf(line, sizeof(line), "boot time: %s\n", boottime);