trust-dns-resolver requires explicit enables feature dns-over-https-r…

…ustls fix #367
shadowsocks · Dec 30, 2020 · e048bc2 · e048bc2
1 parent 2a92ab8
commit e048bc2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/shadowsocks-service/Cargo.toml b/crates/shadowsocks-service/Cargo.toml
@@ -37,7 +37,7 @@ manager = ["server"]
 # Enables trust-dns for replacing tokio's builtin DNS resolver
 trust-dns = ["trust-dns-resolver", "shadowsocks/trust-dns"]
 dns-over-tls = ["trust-dns", "trust-dns-resolver/dns-over-tls", "trust-dns-resolver/dns-over-rustls"]
-dns-over-https = ["trust-dns", "trust-dns-resolver/dns-over-https"]
+dns-over-https = ["trust-dns", "trust-dns-resolver/dns-over-https", "trust-dns-resolver/dns-over-https-rustls"]
 
 # Enable DNS-relay
 local-dns = ["local", "trust-dns", "rand"]

diff --git a/crates/shadowsocks-service/src/config.rs b/crates/shadowsocks-service/src/config.rs
@@ -1009,15 +1009,15 @@ impl Config {
                                     protocol: Protocol::Udp,
                                     tls_dns_name: None,
                                     trust_nx_responses: false,
-                                    #[cfg(feature = "dns-over-tls")]
+                                    #[cfg(any(feature = "dns-over-tls", feature = "dns-over-https"))]
                                     tls_config: None,
                                 });
                                 c.add_name_server(NameServerConfig {
                                     socket_addr,
                                     protocol: Protocol::Tcp,
                                     tls_dns_name: None,
                                     trust_nx_responses: false,
-                                    #[cfg(feature = "dns-over-tls")]
+                                    #[cfg(any(feature = "dns-over-tls", feature = "dns-over-https"))]
                                     tls_config: None,
                                 });
                             }