summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls <emils@mullvad.net>2020-11-09 11:54:19 +0000
committerEmīls <emils@mullvad.net>2020-11-09 16:11:35 +0000
commit6f046fffa5df85201dd23321b06ceeaea8df7d32 (patch)
treebe8d41745e25d7f980db9deec34810243431e7a7
parent2c3f37f73fa5d2b04b546bbf44e712c5e8da1444 (diff)
downloadmullvadvpn-6f046fffa5df85201dd23321b06ceeaea8df7d32.tar.xz
mullvadvpn-6f046fffa5df85201dd23321b06ceeaea8df7d32.zip
Add search domain to NM DNS config
-rw-r--r--CHANGELOG.md2
-rw-r--r--talpid-core/src/dns/linux/network_manager.rs1
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>> {