Merge branch 'linux-disallow-nm-dnsmasq'

2 files changed, 6 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acef112297..a80a06862f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -101,6 +101,7 @@ Line wrap the file at 100 chars.                                              Th
 - Fix memory leak in firewall code via updating `nftnl` dependency.
 - Handle IPv6 traffic correctly using `mullvad-exclude` when there is no default route to any
   non-tunnel interface.
+- Fix issues managing DNS when dnsmasq is used with NetworkManager.
 
 ### Security
 - Restore the last target state if the daemon crashes. Previously, if auto-connect and
diff --git a/talpid-core/src/linux/network_manager.rs b/talpid-core/src/linux/network_manager.rs
index 6cc811dacb..a09acb7e11 100644
--- a/talpid-core/src/linux/network_manager.rs
+++ b/talpid-core/src/linux/network_manager.rs
@@ -83,6 +83,9 @@ pub enum Error {
     #[error(display = "NetworkManager not detected")]
     NetworkManagerNotDetected,
 
+    #[error(display = "NetworkManager is using dnsmasq to manage DNS")]
+    UsingDnsmasq,
+
     #[error(display = "NetworkManager is too old: {}", 0)]
     TooOldNetworkManager(String),
 
@@ -491,6 +494,8 @@ impl NetworkManager {
             .map_err(Error::Dbus)?;
 
         match dns_mode.as_ref() {
+            // NM can't setup config for multiple interfaces with dnsmasq
+            "dnsmasq" => return Err(Error::UsingDnsmasq),
             // If NetworkManager isn't managing DNS for us, it's useless.
             "none" => return Err(Error::NetworkManagerNotManagingDns),
             _ => (),