diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-11-29 22:54:19 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-11-29 23:12:23 +0100 |
| commit | 6546b70c98a3fba1b6430496b41b2868476323af (patch) | |
| tree | 2df79f06e8c889f28bd639c896b3e2816bdae41a | |
| parent | c966fd54bfe3d421299d3aec7d5f3d2329230012 (diff) | |
| download | NetworkManager-bg/dnsmasq-clear-cache-option.tar.gz | |
Revert "dns: clear dnsmasq cache after an update"bg/dnsmasq-clear-cache-option
We now pass the --clear-on-reload option to dnsmasq, so the manual
clear is no longer needed.
This reverts commit 4feb58b50b9fd6caceda83bab907ad107ad8ed01.
| -rw-r--r-- | src/dns/nm-dns-dnsmasq.c | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/src/dns/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c index 2db1680595..5223638e68 100644 --- a/src/dns/nm-dns-dnsmasq.c +++ b/src/dns/nm-dns-dnsmasq.c @@ -368,25 +368,6 @@ add_ip_config_data (NMDnsDnsmasq *self, GVariantBuilder *servers, const NMDnsIPC } static void -dnsmasq_clear_cache_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data) -{ - NMDnsDnsmasq *self; - gs_free_error GError *error = NULL; - gs_unref_variant GVariant *response = NULL; - - response = g_dbus_proxy_call_finish (proxy, res, &error); - if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) - return; - - self = NM_DNS_DNSMASQ (user_data); - - if (!response) - _LOGW ("dnsmasq cache clear failed: %s", error->message); - else - _LOGD ("dnsmasq update successful, cache cleared"); -} - -static void dnsmasq_update_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data) { NMDnsDnsmasq *self; @@ -403,16 +384,8 @@ dnsmasq_update_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data) if (!response) _LOGW ("dnsmasq update failed: %s", error->message); - else { - g_dbus_proxy_call (priv->dnsmasq, - "ClearCache", - NULL, - G_DBUS_CALL_FLAGS_NONE, - -1, - priv->update_cancellable, - (GAsyncReadyCallback) dnsmasq_clear_cache_done, - self); - } + else + _LOGD ("dnsmasq update successful"); } static void |