diff options
| author | Dan Williams <dcbw@redhat.com> | 2015-05-06 14:55:46 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2015-05-06 14:55:46 -0500 |
| commit | f575c6a5cbf9266d6bfa21d068889ed449f0e476 (patch) | |
| tree | 9bae32de0e283589127a1734713908935e4d34b5 | |
| parent | 113a4bcb213279b4f3d9f1d3c5bb5e84325285b3 (diff) | |
| download | NetworkManager-f575c6a5cbf9266d6bfa21d068889ed449f0e476.tar.gz | |
dns: clear error before updating resolv.conf
If the resolv.conf method failed, don't trigger a warning by overwriting
an already-set error.
| -rw-r--r-- | src/dns-manager/nm-dns-manager.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index 160e6fb352..a403a85faf 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -848,8 +848,10 @@ update_dns (NMDnsManager *self, /* Unless we've already done it, update private resolv.conf in NMRUNDIR ignoring any errors */ - if (!(update && priv->rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE)) + if (!(update && priv->rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE)) { + g_clear_error (error); update_resolv_conf (searches, nameservers, error, FALSE); + } /* signal that resolv.conf was changed */ if (update && success) |