From: Evan Hunt <each@isc.org>
Date: Wed, 10 Jun 2015 17:22:59 +0000 (-0700)
Subject: [master] log outdated rpz settings regardless of enable-querytrace
X-Git-Tag: v9.11.0a1~731
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=27970e78c6cb2650893132944871a6ee24d86b02;p=thirdparty%2Fbind9.git

[master] log outdated rpz settings regardless of enable-querytrace
---

diff --git a/bin/named/query.c b/bin/named/query.c
index 399e27b0344..e686b51b344 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -6565,15 +6565,13 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 			 * Has response policy changed out from under us?
 			 */
 			if (rpz_st->rpz_ver != client->view->rpzs->rpz_ver) {
-#ifdef WANT_QUERYTRACE
-				char txt[80];
-				sprintf(txt,
-					"query_find: RPZ settings out of date "
-					"(rpz_ver %d, expected %d)",
-					client->view->rpzs->rpz_ver,
-					rpz_st->rpz_ver);
-				CTRACE(ISC_LOG_ERROR, txt);
-#endif
+				ns_client_log(client, NS_LOGCATEGORY_CLIENT,
+					      NS_LOGMODULE_QUERY, ISC_LOG_INFO,
+					      "query_find: RPZ settings "
+					      "out of date "
+					      "(rpz_ver %d, expected %d)",
+					      client->view->rpzs->rpz_ver,
+					      rpz_st->rpz_ver);
 				QUERY_ERROR(DNS_R_SERVFAIL);
 				goto cleanup;
 			}