diff options
Diffstat (limited to 'debian/patches/dns-Fix-falling-back-in-the-resolv.conf-methods.patch')
| -rw-r--r-- | debian/patches/dns-Fix-falling-back-in-the-resolv.conf-methods.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/debian/patches/dns-Fix-falling-back-in-the-resolv.conf-methods.patch b/debian/patches/dns-Fix-falling-back-in-the-resolv.conf-methods.patch deleted file mode 100644 index b354c1892..000000000 --- a/debian/patches/dns-Fix-falling-back-in-the-resolv.conf-methods.patch +++ /dev/null @@ -1,30 +0,0 @@ -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) |