diff options
| author | Emīls <emils@mullvad.net> | 2021-02-02 09:58:03 +0000 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2021-02-02 09:58:03 +0000 |
| commit | e3ec8bc85aa1cea4711a3549bcae04bc74e5965b (patch) | |
| tree | 46ce4924c0d411ca1bda357837c237a428967a15 | |
| parent | f6e4ed4f3865782f03f3da5c491975d20aa40d93 (diff) | |
| parent | da579e79be741452eedb7137261f4e1ed63492cd (diff) | |
| download | mullvadvpn-e3ec8bc85aa1cea4711a3549bcae04bc74e5965b.tar.xz mullvadvpn-e3ec8bc85aa1cea4711a3549bcae04bc74e5965b.zip | |
Merge branch 'fix-empty-custom-dns'
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | mullvad-cli/src/main.rs | 14 | ||||
| -rw-r--r-- | mullvad-daemon/src/lib.rs | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c7105e672d..8966ce6b52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,10 @@ Line wrap the file at 100 chars. Th - Update Electron from 11.0.2 to 11.2.1 which includes a newer Chromium version and security patches. +### Fixed +#### MacOS +- When applying empty list of custom DNS servers, the daemon won't get stuck in the offline state. + ## [2021.1-beta1] - 2021-01-25 ### Added diff --git a/mullvad-cli/src/main.rs b/mullvad-cli/src/main.rs index 20dfae5fc9..766fb43bad 100644 --- a/mullvad-cli/src/main.rs +++ b/mullvad-cli/src/main.rs @@ -54,14 +54,12 @@ async fn main() { Error::RpcFailed(status) => { eprintln!("{}: {:?}: {}", error, status.code(), status.message()) } - Error::RpcFailedExt(_message, status) => { - eprintln!( - "{}\nCaused by: {:?}: {}", - error, - status.code(), - status.message() - ) - } + Error::RpcFailedExt(_message, status) => eprintln!( + "{}\nCaused by: {:?}: {}", + error, + status.code(), + status.message() + ), error => eprintln!("{}", error.display_chain()), } 1 diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs index 691e96cd5b..41aad6ed23 100644 --- a/mullvad-daemon/src/lib.rs +++ b/mullvad-daemon/src/lib.rs @@ -698,7 +698,7 @@ where } fn get_custom_resolvers(dns_options: &DnsOptions) -> Option<Vec<IpAddr>> { - if dns_options.custom { + if dns_options.custom && !dns_options.addresses.is_empty() { Some(dns_options.addresses.clone()) } else { None |