]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
make macro name match category name
authorMark Andrews <marka@isc.org>
Tue, 29 Sep 2015 05:02:49 +0000 (15:02 +1000)
committerMark Andrews <marka@isc.org>
Tue, 29 Sep 2015 05:02:49 +0000 (15:02 +1000)
bin/named/client.c
bin/named/include/named/log.h
bin/named/query.c

index e5c26895cc25a6d03f8994ea00ecc305cdf9e5d9..cad69d8f4c04b35eeaf6f7ca8ba5a0dc34e08005 100644 (file)
@@ -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);
index 032743acbfb21e35c1749e5ce509ea14727ff562..23d6739f6590659789ef1e7aacc8eaae68c2695c 100644 (file)
@@ -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.
index c3ea5e011ec15807c5f5b66d8e7fd7709cd32730..1d00bdc25a5add76f58d25f360b0b4ee209e2dd3 100644 (file)
@@ -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);