mirror of
https://github.com/isc-projects/bind9.git
synced 2026-02-25 19:04:57 -05:00
Use Stream DNS in dig for DNS over TLS
This commit makes dig use the new Stream DNS transport for DNS over TLS.
This commit is contained in:
parent
85cefb80f8
commit
2b7e85591f
1 changed files with 6 additions and 5 deletions
|
|
@ -3037,9 +3037,9 @@ start_tcp(dig_query_t *query) {
|
|||
if (tlsctx == NULL) {
|
||||
goto failure_tls;
|
||||
}
|
||||
isc_nm_tlsdnsconnect(netmgr, &localaddr, &query->sockaddr,
|
||||
tcp_connected, connectquery, local_timeout,
|
||||
tlsctx, sess_cache);
|
||||
isc_nm_streamdnsconnect(netmgr, &localaddr, &query->sockaddr,
|
||||
tcp_connected, connectquery,
|
||||
local_timeout, tlsctx, sess_cache);
|
||||
#if HAVE_LIBNGHTTP2
|
||||
} else if (query->lookup->https_mode) {
|
||||
char uri[4096] = { 0 };
|
||||
|
|
@ -3454,8 +3454,9 @@ launch_next_query(dig_query_t *query) {
|
|||
|
||||
xfr = query->lookup->rdtype == dns_rdatatype_ixfr ||
|
||||
query->lookup->rdtype == dns_rdatatype_axfr;
|
||||
if (xfr && isc_nm_socket_type(query->handle) == isc_nm_tlsdnssocket &&
|
||||
!isc_nm_xfr_allowed(query->handle))
|
||||
if (xfr &&
|
||||
isc_nm_socket_type(query->handle) == isc_nm_streamdnssocket &&
|
||||
query->lookup->tls_mode && !isc_nm_xfr_allowed(query->handle))
|
||||
{
|
||||
dighost_error("zone transfers over the "
|
||||
"established TLS connection are not allowed");
|
||||
|
|
|
|||
Loading…
Reference in a new issue