blob: b354c189246a1bb684e23b67aceef9b93166b648 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Wed, 6 May 2015 20:49:57 +0200
Subject: dns: Fix falling back in the resolv.conf methods
---
src/dns-manager/nm-dns-manager.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
index 2f8ceab..eade2a0 100644
--- a/src/dns-manager/nm-dns-manager.c
+++ b/src/dns-manager/nm-dns-manager.c
@@ -782,13 +782,16 @@ update_dns (NMDnsManager *self,
#ifdef NETCONFIG_PATH
if (success == FALSE) {
+ g_clear_error (error);
success = dispatch_netconfig (searches, nameservers,
nis_domain, nis_servers, error);
}
#endif
- if (success == FALSE)
+ if (success == FALSE) {
+ g_clear_error (error);
success = update_resolv_conf (searches, nameservers, error);
+ }
/* signal that resolv.conf was changed */
if (success)
|
