From 4d085258ccffeed949a8a8b91c07e4c0b46114d3 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 29 Sep 2015 15:02:49 +1000 Subject: [PATCH] make macro name match category name --- bin/named/client.c | 2 +- bin/named/include/named/log.h | 2 +- bin/named/query.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/named/client.c b/bin/named/client.c index e5c26895cc..cad69d8f4c 100644 --- a/bin/named/client.c +++ b/bin/named/client.c @@ -1338,7 +1338,7 @@ ns_client_error(ns_client_t *client, isc_result_t result) { */ if (wouldlog) { ns_client_log(client, - NS_LOGCATEGORY_QUERY_EERRORS, + NS_LOGCATEGORY_QUERY_ERRORS, NS_LOGMODULE_CLIENT, loglevel, "%s", log_buf); diff --git a/bin/named/include/named/log.h b/bin/named/include/named/log.h index 032743acbf..23d6739f65 100644 --- a/bin/named/include/named/log.h +++ b/bin/named/include/named/log.h @@ -36,7 +36,7 @@ #define NS_LOGCATEGORY_QUERIES (&ns_g_categories[4]) #define NS_LOGCATEGORY_UNMATCHED (&ns_g_categories[5]) #define NS_LOGCATEGORY_UPDATE_SECURITY (&ns_g_categories[6]) -#define NS_LOGCATEGORY_QUERY_EERRORS (&ns_g_categories[7]) +#define NS_LOGCATEGORY_QUERY_ERRORS (&ns_g_categories[7]) /* * Backwards compatibility. diff --git a/bin/named/query.c b/bin/named/query.c index c3ea5e011e..1d00bdc25a 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -1009,7 +1009,7 @@ rpz_log_fail(ns_client_t *client, int level, dns_name_t *p_name, failed = ": "; dns_name_format(client->query.qname, qnamebuf, sizeof(qnamebuf)); dns_name_format(p_name, p_namebuf, sizeof(p_namebuf)); - ns_client_log(client, NS_LOGCATEGORY_QUERY_EERRORS, + ns_client_log(client, NS_LOGCATEGORY_QUERY_ERRORS, NS_LOGMODULE_QUERY, level, "rpz %s rewrite %s via %s%s%s%s", dns_rpz_type2str(rpz_type), @@ -3812,7 +3812,7 @@ query_resume(isc_task_t *task, isc_event_t *event) { ns_client_t *client; isc_boolean_t fetch_canceled, client_shuttingdown; isc_result_t result; - isc_logcategory_t *logcategory = NS_LOGCATEGORY_QUERY_EERRORS; + isc_logcategory_t *logcategory = NS_LOGCATEGORY_QUERY_ERRORS; int errorloglevel; /* @@ -8795,7 +8795,7 @@ log_queryerror(ns_client_t *client, isc_result_t result, int line, int level) { } } - ns_client_log(client, NS_LOGCATEGORY_QUERY_EERRORS, NS_LOGMODULE_QUERY, + ns_client_log(client, NS_LOGCATEGORY_QUERY_ERRORS, NS_LOGMODULE_QUERY, level, "query failed (%s)%s%s%s%s%s%s at %s:%d", isc_result_totext(result), sep1, namep, sep2, classp, sep2, typep, __FILE__, line);