diff options
| author | Emīls <emils@mullvad.net> | 2020-11-09 17:00:40 +0000 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2020-11-09 17:00:40 +0000 |
| commit | 94b507c92ffb53b0fd7b1d0f4c84e1eb5b04e27d (patch) | |
| tree | be8d41745e25d7f980db9deec34810243431e7a7 | |
| parent | 2c3f37f73fa5d2b04b546bbf44e712c5e8da1444 (diff) | |
| parent | 6f046fffa5df85201dd23321b06ceeaea8df7d32 (diff) | |
| download | mullvadvpn-94b507c92ffb53b0fd7b1d0f4c84e1eb5b04e27d.tar.xz mullvadvpn-94b507c92ffb53b0fd7b1d0f4c84e1eb5b04e27d.zip | |
Merge branch 'linux-nm-set-dns-domains' into master
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | talpid-core/src/dns/linux/network_manager.rs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 354346363f..d9a01fae1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -84,6 +84,8 @@ Line wrap the file at 100 chars. Th systemd-resolved directly to manage DNS. - Only use WireGuard kernel implementation if DNS isn't managed via NetworkManager. - Reset DNS config correctly when the tunnel monitor unexpectedly goes down. +- Set search domains in NetworkManager's DNS configuration, resolving issues where NetworkManager + is used to manage DNS via systemd-resolved. ### Security - Restore the last target state if the daemon crashes. Previously, if auto-connect and diff --git a/talpid-core/src/dns/linux/network_manager.rs b/talpid-core/src/dns/linux/network_manager.rs index 125bf12bf6..9bfac830eb 100644 --- a/talpid-core/src/dns/linux/network_manager.rs +++ b/talpid-core/src/dns/linux/network_manager.rs @@ -344,6 +344,7 @@ impl NetworkManager { settings.insert("method", Variant(Box::new("manual".to_string()))); settings.insert("dns-priority", Variant(Box::new(DNS_FIRST_PRIORITY))); settings.insert("dns", Variant(Box::new(servers))); + settings.insert("dns-search", Variant(Box::new(vec!["~.".to_string()]))); } fn fetch_device(&self, interface_name: &str) -> Result<dbus::Path<'static>> { |