colin/hickory-dns
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make dns-over-rustls optional for tools crate

Browse Source 
This is so we get a consistent requirement for the availability of the
`tls_config` field in the `NameServerConfig` struct.

Preserves two constraints that seem important:

* Crates are compiled without TLS by default, matching the default features
* Using cargo with --all-features works correctly
This commit is contained in:
Dirkjan Ochtman
2020-09-29 17:16:41 +02:00
committed by Benjamin Fry
parent e31e236edd
commit 89f786236a
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/resolver/src/tls/mod.rs
View File

@@ -13,7 +13,9 @@ mod dns_over_rustls;
cfg_if! {
if #[cfg(feature = "dns-over-rustls")] {
pub(crate) use self::dns_over_rustls::{new_tls_stream, CLIENT_CONFIG};
pub(crate) use self::dns_over_rustls::new_tls_stream;
#[cfg(feature = "dns-over-https-rustls")]
pub(crate) use self::dns_over_rustls::CLIENT_CONFIG;
} else if #[cfg(feature = "dns-over-native-tls")] {
pub(crate) use self::dns_over_native_tls::new_tls_stream;
} else if #[cfg(feature = "dns-over-openssl")] {