diff options
| author | Emīls <emils@mullvad.net> | 2021-02-01 16:32:22 +0000 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2021-02-01 16:39:11 +0000 |
| commit | 878024a7f2fad012bd36dfbe79f60b55db5881e6 (patch) | |
| tree | d9a5b6bb39b70937a680ece08437bf9152252087 | |
| parent | f6e4ed4f3865782f03f3da5c491975d20aa40d93 (diff) | |
| download | mullvadvpn-878024a7f2fad012bd36dfbe79f60b55db5881e6.tar.xz mullvadvpn-878024a7f2fad012bd36dfbe79f60b55db5881e6.zip | |
Only apply custom dns config if it's not empty
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | mullvad-daemon/src/lib.rs | 2 |
2 files changed, 5 insertions, 1 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-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 |