summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls <emils@mullvad.net>2018-10-04 10:13:38 +0100
committerEmīls <emils@mullvad.net>2018-10-04 10:20:40 +0100
commitebb518f9c6e161ddfbab7bfed2f87ca2ad3d3074 (patch)
tree0836cfbb6150cc9e738bbdafcd782f94fcefd9f3
parent125a0c12213f9ce1c71158d48cbe722c5b53f462 (diff)
downloadmullvadvpn-ebb518f9c6e161ddfbab7bfed2f87ca2ad3d3074.tar.xz
mullvadvpn-ebb518f9c6e161ddfbab7bfed2f87ca2ad3d3074.zip
Delete the DNS recovery file even if it's not restored
-rw-r--r--talpid-core/src/security/windows/dns.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/talpid-core/src/security/windows/dns.rs b/talpid-core/src/security/windows/dns.rs
index 2a3b6e968c..6d0d034a09 100644
--- a/talpid-core/src/security/windows/dns.rs
+++ b/talpid-core/src/security/windows/dns.rs
@@ -136,12 +136,15 @@ impl WinDns {
.chain_err(|| "Failed to read backed up DNS state")?
{
info!("Restoring DNS state from backup");
- self.restore_dns_settings(&previous_state)
- .chain_err(|| "Failed to restore backed up DNS state")?;
- trace!("Successfully restored DNS state");
+ if let Err(e) = self.restore_dns_settings(&previous_state) {
+ error!("Failed to restore DNS settings - {}", e);
+ } else {
+ trace!("Successfully restored DNS state");
+ };
self.backup_writer
.remove_backup()
.chain_err(|| "Failed to remove backed up DNS state after restoring it")?;
+ debug!("DNS recovery file removed!");
} else {
trace!("No dns state to restore");
}