Commit e66b4dff authored by Simon Kelley's avatar Simon Kelley

Fix argument-order botch which broke DNSSEC for TCP queries.

parent 8efd731c
...@@ -1996,8 +1996,9 @@ unsigned char *tcp_request(int confd, time_t now, ...@@ -1996,8 +1996,9 @@ unsigned char *tcp_request(int confd, time_t now,
} }
else else
result = (status == STAT_SECURE ? "SECURE" : (status == STAT_INSECURE ? "INSECURE" : "BOGUS")); result = (status == STAT_SECURE ? "SECURE" : (status == STAT_INSECURE ? "INSECURE" : "BOGUS"));
if (status == STAT_BOGUS && extract_request(header, m, daemon->namebuff, NULL))
domain = daemon->namebuff; if (status == STAT_BOGUS && extract_request(header, m, daemon->namebuff, NULL))
domain = daemon->namebuff;
log_query(F_KEYTAG | F_SECSTAT, domain, NULL, result); log_query(F_KEYTAG | F_SECSTAT, domain, NULL, result);
...@@ -2040,8 +2041,8 @@ unsigned char *tcp_request(int confd, time_t now, ...@@ -2040,8 +2041,8 @@ unsigned char *tcp_request(int confd, time_t now,
#endif #endif
m = process_reply(header, now, last_server, (unsigned int)m, m = process_reply(header, now, last_server, (unsigned int)m,
option_bool(OPT_NO_REBIND) && !norebind, no_cache_dnssec, bogusanswer, option_bool(OPT_NO_REBIND) && !norebind, no_cache_dnssec, cache_secure, bogusanswer,
cache_secure, ad_question, do_bit, added_pheader, check_subnet, &peer_addr); ad_question, do_bit, added_pheader, check_subnet, &peer_addr);
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment