diff options
| author | Alexey D | 2015-07-05 12:33:33 +0300 |
|---|---|---|
| committer | Alexey D | 2015-07-05 12:33:33 +0300 |
| commit | f788186d7bedc164e039d39eafc01d886513dca4 (patch) | |
| tree | bac79862378decf4f389b6f2a1af04d7c7565708 /0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch | |
| download | aur-f788186d7bedc164e039d39eafc01d886513dca4.tar.gz | |
initial version
Diffstat (limited to '0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch')
| -rw-r--r-- | 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch b/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch new file mode 100644 index 000000000000..fd05b93a644f --- /dev/null +++ b/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch @@ -0,0 +1,34 @@ +From 35c9e8d5321b6451fb74f8e7231a690c940a6e69 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Wed, 6 May 2015 20:49:57 +0200 +Subject: [PATCH] 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) +-- +2.4.0 + |