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

This commit is contained in:
Evan Hunt 2015-06-10 10:22:59 -07:00
parent 59a9cb54c1
commit 27970e78c6

View file

@ -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;
}