New upstream version 1.5.90 upstream/1.5.90

8 files changed, 0 insertions, 3201 deletions

diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
deleted file mode 100644
index 69b26068..00000000
--- a/src/dns-manager/nm-dns-dnsmasq.c
+++ /dev/null
@@ -1,697 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- * Copyright (C) 2010 Dan Williams <dcbw@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#include "nm-default.h"
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <arpa/inet.h>
-#include <sys/stat.h>
-#include <linux/if.h>
-
-#include "nm-dns-dnsmasq.h"
-#include "nm-core-internal.h"
-#include "nm-platform.h"
-#include "nm-utils.h"
-#include "nm-ip4-config.h"
-#include "nm-ip6-config.h"
-#include "nm-bus-manager.h"
-#include "NetworkManagerUtils.h"
-
-G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsmasq, NM_TYPE_DNS_PLUGIN)
-
-#define NM_DNS_DNSMASQ_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DNS_DNSMASQ, NMDnsDnsmasqPrivate))
-
-#define PIDFILE NMRUNDIR "/dnsmasq.pid"
-#define CONFDIR NMCONFDIR "/dnsmasq.d"
-
-#define DNSMASQ_DBUS_SERVICE "org.freedesktop.NetworkManager.dnsmasq"
-#define DNSMASQ_DBUS_PATH "/uk/org/thekelleys/dnsmasq"
-
-typedef struct {
-	GDBusProxy *dnsmasq;
-	GCancellable *dnsmasq_cancellable;
-	GCancellable *update_cancellable;
-	gboolean running;
-
-	GVariant *set_server_ex_args;
-} NMDnsDnsmasqPrivate;
-
-/*****************************************************************************/
-
-#define _NMLOG_DOMAIN         LOGD_DNS
-#define _NMLOG_PREFIX_NAME    "dnsmasq"
-#define _NMLOG(level, ...) \
-    G_STMT_START { \
-        nm_log ((level), _NMLOG_DOMAIN, \
-                "%s[%p]: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \
-                _NMLOG_PREFIX_NAME, \
-                (self) \
-                _NM_UTILS_MACRO_REST(__VA_ARGS__)); \
-    } G_STMT_END
-
-/*****************************************************************************/
-
-static char **
-get_ip4_rdns_domains (NMIP4Config *ip4)
-{
-	char **strv;
-	GPtrArray *domains = NULL;
-	int i;
-
-	g_return_val_if_fail (ip4 != NULL, NULL);
-
-	domains = g_ptr_array_sized_new (5);
-
-	for (i = 0; i < nm_ip4_config_get_num_addresses (ip4); i++) {
-		const NMPlatformIP4Address *address = nm_ip4_config_get_address (ip4, i);
-
-		nm_utils_get_reverse_dns_domains_ip4 (address->address, address->plen, domains);
-	}
-
-	for (i = 0; i < nm_ip4_config_get_num_routes (ip4); i++) {
-		const NMPlatformIP4Route *route = nm_ip4_config_get_route (ip4, i);
-
-		nm_utils_get_reverse_dns_domains_ip4 (route->network, route->plen, domains);
-	}
-
-	/* Terminating NULL so we can use g_strfreev() to free it */
-	g_ptr_array_add (domains, NULL);
-
-	/* Free the array and return NULL if the only element was the ending NULL */
-	strv = (char **) g_ptr_array_free (domains, (domains->len == 1));
-
-	return _nm_utils_strv_cleanup (strv, FALSE, FALSE, TRUE);
-}
-
-static char **
-get_ip6_rdns_domains (NMIP6Config *ip6)
-{
-	char **strv;
-	GPtrArray *domains = NULL;
-	int i;
-
-	g_return_val_if_fail (ip6 != NULL, NULL);
-
-	domains = g_ptr_array_sized_new (5);
-
-	for (i = 0; i < nm_ip6_config_get_num_addresses (ip6); i++) {
-		const NMPlatformIP6Address *address = nm_ip6_config_get_address (ip6, i);
-
-		nm_utils_get_reverse_dns_domains_ip6 (&address->address, address->plen, domains);
-	}
-
-	for (i = 0; i < nm_ip6_config_get_num_routes (ip6); i++) {
-		const NMPlatformIP6Route *route = nm_ip6_config_get_route (ip6, i);
-
-		nm_utils_get_reverse_dns_domains_ip6 (&route->network, route->plen, domains);
-	}
-
-	/* Terminating NULL so we can use g_strfreev() to free it */
-	g_ptr_array_add (domains, NULL);
-
-	/* Free the array and return NULL if the only element was the ending NULL */
-	strv = (char **) g_ptr_array_free (domains, (domains->len == 1));
-
-	return _nm_utils_strv_cleanup (strv, FALSE, FALSE, TRUE);
-}
-
-static void
-add_dnsmasq_nameserver (NMDnsDnsmasq *self,
-                        GVariantBuilder *servers,
-                        const char *ip,
-                        const char *domain)
-{
-	g_return_if_fail (ip);
-
-	_LOGD ("adding nameserver '%s'%s%s%s", ip,
-	       NM_PRINT_FMT_QUOTED (domain, " for domain \"", domain, "\"", ""));
-
-	g_variant_builder_open (servers, G_VARIANT_TYPE ("as"));
-
-	g_variant_builder_add (servers, "s", ip);
-	if (domain)
-		g_variant_builder_add (servers, "s", domain);
-
-	g_variant_builder_close (servers);
-}
-
-static gboolean
-add_ip4_config (NMDnsDnsmasq *self, GVariantBuilder *servers, NMIP4Config *ip4,
-                const char *iface, gboolean split)
-{
-	char buf[INET_ADDRSTRLEN + 1 + IFNAMSIZ];
-	char buf2[INET_ADDRSTRLEN];
-	in_addr_t addr;
-	int nnameservers, i_nameserver, n, i;
-	gboolean added = FALSE;
-
-	g_return_val_if_fail (iface, FALSE);
-	nnameservers = nm_ip4_config_get_num_nameservers (ip4);
-
-	if (split) {
-		char **domains, **iter;
-
-		if (nnameservers == 0)
-			return FALSE;
-
-		for (i_nameserver = 0; i_nameserver < nnameservers; i_nameserver++) {
-			addr = nm_ip4_config_get_nameserver (ip4, i_nameserver);
-			g_snprintf (buf, sizeof (buf), "%s@%s",
-			            nm_utils_inet4_ntop (addr, buf2), iface);
-
-			/* searches are preferred over domains */
-			n = nm_ip4_config_get_num_searches (ip4);
-			for (i = 0; i < n; i++) {
-				add_dnsmasq_nameserver (self,
-				                        servers,
-				                        buf,
-				                        nm_ip4_config_get_search (ip4, i));
-				added = TRUE;
-			}
-
-			if (n == 0) {
-				/* If not searches, use any domains */
-				n = nm_ip4_config_get_num_domains (ip4);
-				for (i = 0; i < n; i++) {
-					add_dnsmasq_nameserver (self,
-					                        servers,
-					                        buf,
-					                        nm_ip4_config_get_domain (ip4, i));
-					added = TRUE;
-				}
-			}
-
-			/* Ensure reverse-DNS works by directing queries for in-addr.arpa
-			 * domains to the split domain's nameserver.
-			 */
-			domains = get_ip4_rdns_domains (ip4);
-			if (domains) {
-				for (iter = domains; iter && *iter; iter++)
-					add_dnsmasq_nameserver (self, servers, buf, *iter);
-				g_strfreev (domains);
-			}
-		}
-	}
-
-	/* If no searches or domains, just add the nameservers */
-	if (!added) {
-		for (i = 0; i < nnameservers; i++) {
-			addr = nm_ip4_config_get_nameserver (ip4, i);
-			g_snprintf (buf, sizeof (buf), "%s@%s",
-			            nm_utils_inet4_ntop (addr, buf2), iface);
-			add_dnsmasq_nameserver (self, servers, buf, NULL);
-		}
-	}
-
-	return TRUE;
-}
-
-static char *
-ip6_addr_to_string (const struct in6_addr *addr, const char *iface)
-{
-	char buf[NM_UTILS_INET_ADDRSTRLEN];
-
-	if (IN6_IS_ADDR_V4MAPPED (addr))
-		nm_utils_inet4_ntop (addr->s6_addr32[3], buf);
-	else
-		nm_utils_inet6_ntop (addr, buf);
-
-	/* Need to scope link-local addresses with %<zone-id>. Before dnsmasq 2.58,
-	 * only '@' was supported as delimiter. Since 2.58, '@' and '%' are
-	 * supported. Due to a bug, since 2.73 only '%' works properly as "server"
-	 * address.
-	 */
-	return g_strdup_printf ("%s%c%s",
-	                        buf,
-	                        IN6_IS_ADDR_LINKLOCAL (addr) ? '%' : '@',
-	                        iface);
-}
-
-static void
-add_global_config (NMDnsDnsmasq *self, GVariantBuilder *dnsmasq_servers, const NMGlobalDnsConfig *config)
-{
-	guint i, j;
-
-	g_return_if_fail (config);
-
-	for (i = 0; i < nm_global_dns_config_get_num_domains (config); i++) {
-		NMGlobalDnsDomain *domain = nm_global_dns_config_get_domain (config, i);
-		const char *const *servers = nm_global_dns_domain_get_servers (domain);
-		const char *name = nm_global_dns_domain_get_name (domain);
-
-		g_return_if_fail (name);
-
-		for (j = 0; servers && servers[j]; j++) {
-			if (!strcmp (name, "*"))
-				add_dnsmasq_nameserver (self, dnsmasq_servers, servers[j], NULL);
-			else
-				add_dnsmasq_nameserver (self, dnsmasq_servers, servers[j], name);
-		}
-
-	}
-}
-
-static gboolean
-add_ip6_config (NMDnsDnsmasq *self, GVariantBuilder *servers, NMIP6Config *ip6,
-                const char *iface, gboolean split)
-{
-	const struct in6_addr *addr;
-	char *buf = NULL;
-	int nnameservers, i_nameserver, n, i;
-	gboolean added = FALSE;
-
-	g_return_val_if_fail (iface, FALSE);
-	nnameservers = nm_ip6_config_get_num_nameservers (ip6);
-
-	if (split) {
-		char **domains, **iter;
-
-		if (nnameservers == 0)
-			return FALSE;
-
-		for (i_nameserver = 0; i_nameserver < nnameservers; i_nameserver++) {
-			addr = nm_ip6_config_get_nameserver (ip6, i_nameserver);
-			buf = ip6_addr_to_string (addr, iface);
-
-			/* searches are preferred over domains */
-			n = nm_ip6_config_get_num_searches (ip6);
-			for (i = 0; i < n; i++) {
-				add_dnsmasq_nameserver (self,
-				                        servers,
-				                        buf,
-				                        nm_ip6_config_get_search (ip6, i));
-				added = TRUE;
-			}
-
-			if (n == 0) {
-				/* If not searches, use any domains */
-				n = nm_ip6_config_get_num_domains (ip6);
-				for (i = 0; i < n; i++) {
-					add_dnsmasq_nameserver (self,
-					                        servers,
-					                        buf,
-					                        nm_ip6_config_get_domain (ip6, i));
-					added = TRUE;
-				}
-			}
-
-			/* Ensure reverse-DNS works by directing queries for ip6.arpa
-			 * domains to the split domain's nameserver.
-			 */
-			domains = get_ip6_rdns_domains (ip6);
-			if (domains) {
-				for (iter = domains; iter && *iter; iter++)
-					add_dnsmasq_nameserver (self, servers, buf, *iter);
-				g_strfreev (domains);
-			}
-
-			g_free (buf);
-		}
-	}
-
-	/* If no searches or domains, just add the nameservers */
-	if (!added) {
-		for (i = 0; i < nnameservers; i++) {
-			addr = nm_ip6_config_get_nameserver (ip6, i);
-			buf = ip6_addr_to_string (addr, iface);
-			if (buf) {
-				add_dnsmasq_nameserver (self, servers, buf, NULL);
-				g_free (buf);
-			}
-		}
-	}
-
-	return TRUE;
-}
-
-static gboolean
-add_ip_config_data (NMDnsDnsmasq *self, GVariantBuilder *servers, const NMDnsIPConfigData *data)
-{
-	if (NM_IS_IP4_CONFIG (data->config)) {
-		return add_ip4_config (self,
-		                       servers,
-		                       (NMIP4Config *) data->config,
-		                       data->iface,
-		                       data->type == NM_DNS_IP_CONFIG_TYPE_VPN);
-	} else if (NM_IS_IP6_CONFIG (data->config)) {
-		return add_ip6_config (self,
-		                       servers,
-		                       (NMIP6Config *) data->config,
-		                       data->iface,
-		                       data->type == NM_DNS_IP_CONFIG_TYPE_VPN);
-	} else
-		g_return_val_if_reached (FALSE);
-}
-
-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;
-	NMDnsDnsmasqPrivate *priv;
-	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);
-	priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
-
-	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);
-	}
-}
-
-static void
-send_dnsmasq_update (NMDnsDnsmasq *self)
-{
-	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
-
-	if (!priv->set_server_ex_args)
-		return;
-
-	if (priv->running) {
-		_LOGD ("trying to update dnsmasq nameservers");
-
-		nm_clear_g_cancellable (&priv->update_cancellable);
-		priv->update_cancellable = g_cancellable_new ();
-
-		g_dbus_proxy_call (priv->dnsmasq,
-		                   "SetServersEx",
-		                   priv->set_server_ex_args,
-		                   G_DBUS_CALL_FLAGS_NONE,
-		                   -1,
-		                   priv->update_cancellable,
-		                   (GAsyncReadyCallback) dnsmasq_update_done,
-		                   self);
-		g_clear_pointer (&priv->set_server_ex_args, g_variant_unref);
-	} else
-		_LOGD ("dnsmasq not found on the bus. The nameserver update will be sent when dnsmasq appears");
-}
-
-static void
-name_owner_changed (GObject    *object,
-                    GParamSpec *pspec,
-                    gpointer    user_data)
-{
-	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (user_data);
-	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
-	gs_free char *owner = NULL;
-
-	owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (object));
-	if (owner) {
-		_LOGI ("dnsmasq appeared as %s", owner);
-		priv->running = TRUE;
-		send_dnsmasq_update (self);
-	} else {
-		_LOGI ("dnsmasq disappeared");
-		priv->running = FALSE;
-		g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
-	}
-}
-
-static void
-dnsmasq_proxy_cb (GObject *source, GAsyncResult *res, gpointer user_data)
-{
-	NMDnsDnsmasq *self;
-	NMDnsDnsmasqPrivate *priv;
-	gs_free_error GError *error = NULL;
-	gs_free char *owner = NULL;
-	GDBusProxy *proxy;
-
-	proxy = g_dbus_proxy_new_finish (res, &error);
-	if (   !proxy
-	    && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-		return;
-
-	self = NM_DNS_DNSMASQ (user_data);
-
-	if (!proxy) {
-		_LOGW ("failed to connect to dnsmasq via DBus: %s", error->message);
-		g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
-		return;
-	}
-
-	priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
-
-	priv->dnsmasq = proxy;
-	nm_clear_g_cancellable (&priv->dnsmasq_cancellable);
-
-	_LOGD ("dnsmasq proxy creation successful");
-
-	g_signal_connect (priv->dnsmasq, "notify::g-name-owner",
-	                  G_CALLBACK (name_owner_changed), self);
-	owner = g_dbus_proxy_get_name_owner (priv->dnsmasq);
-	priv->running = (owner != NULL);
-
-	if (priv->running)
-		send_dnsmasq_update (self);
-}
-
-static void
-start_dnsmasq (NMDnsDnsmasq *self)
-{
-	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
-	const char *dm_binary;
-	const char *argv[15];
-	GPid pid = 0;
-	guint idx = 0;
-	NMBusManager *dbus_mgr;
-	GDBusConnection *connection;
-
-	if (priv->running) {
-		/* the dnsmasq process is running. Nothing to do. */
-		return;
-	}
-
-	if (nm_dns_plugin_child_pid ((NMDnsPlugin *) self) > 0) {
-		/* if we already have a child process spawned, don't do
-		 * it again. */
-		return;
-	}
-
-	dm_binary = nm_utils_find_helper ("dnsmasq", DNSMASQ_PATH, NULL);
-	if (!dm_binary) {
-		_LOGW ("could not find dnsmasq binary");
-		return;
-	}
-
-	argv[idx++] = dm_binary;
-	argv[idx++] = "--no-resolv";  /* Use only commandline */
-	argv[idx++] = "--keep-in-foreground";
-	argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
-	argv[idx++] = "--bind-interfaces";
-	argv[idx++] = "--pid-file=" PIDFILE;
-	argv[idx++] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
-	argv[idx++] = "--cache-size=400";
-	argv[idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */
-	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
-	argv[idx++] = "--enable-dbus=" DNSMASQ_DBUS_SERVICE;
-
-	/* dnsmasq exits if the conf dir is not present */
-	if (g_file_test (CONFDIR, G_FILE_TEST_IS_DIR))
-		argv[idx++] = "--conf-dir=" CONFDIR;
-
-	argv[idx++] = NULL;
-	nm_assert (idx <= G_N_ELEMENTS (argv));
-
-	/* And finally spawn dnsmasq */
-	pid = nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, PIDFILE, "bin/dnsmasq");
-	if (!pid)
-		return;
-
-	if (   priv->dnsmasq
-	    || priv->dnsmasq_cancellable) {
-		/* we already have a proxy or are about to create it.
-		 * We are done. */
-		return;
-	}
-
-	dbus_mgr = nm_bus_manager_get ();
-	g_return_if_fail (dbus_mgr);
-
-	connection = nm_bus_manager_get_connection (dbus_mgr);
-	g_return_if_fail (connection);
-
-	priv->dnsmasq_cancellable = g_cancellable_new ();
-	g_dbus_proxy_new (connection,
-	                  G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
-	                  NULL,
-	                  DNSMASQ_DBUS_SERVICE,
-	                  DNSMASQ_DBUS_PATH,
-	                  DNSMASQ_DBUS_SERVICE,
-	                  priv->dnsmasq_cancellable,
-	                  dnsmasq_proxy_cb,
-	                  self);
-}
-
-static gboolean
-update (NMDnsPlugin *plugin,
-        const NMDnsIPConfigData **configs,
-        const NMGlobalDnsConfig *global_config,
-        const char *hostname)
-{
-	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
-	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
-	GVariantBuilder servers;
-
-	start_dnsmasq (self);
-
-	g_variant_builder_init (&servers, G_VARIANT_TYPE ("aas"));
-
-	if (global_config)
-		add_global_config (self, &servers, global_config);
-	else {
-		while (*configs) {
-			add_ip_config_data (self, &servers, *configs);
-			configs++;
-		}
-	}
-
-	g_clear_pointer (&priv->set_server_ex_args, g_variant_unref);
-	priv->set_server_ex_args = g_variant_ref_sink (g_variant_new ("(aas)", &servers));
-
-	send_dnsmasq_update (self);
-
-	return TRUE;
-}
-
-/****************************************************************/
-
-static void
-child_quit (NMDnsPlugin *plugin, gint status)
-{
-	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
-	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
-	gboolean failed = TRUE;
-	int err;
-
-	if (WIFEXITED (status)) {
-		err = WEXITSTATUS (status);
-		if (err) {
-			_LOGW ("dnsmasq exited with error: %s",
-			       nm_utils_dnsmasq_status_to_string (err, NULL, 0));
-		} else {
-			_LOGD ("dnsmasq exited normally");
-			failed = FALSE;
-		}
-	} else if (WIFSTOPPED (status))
-		_LOGW ("dnsmasq stopped unexpectedly with signal %d", WSTOPSIG (status));
-	else if (WIFSIGNALED (status))
-		_LOGW ("dnsmasq died with signal %d", WTERMSIG (status));
-	else
-		_LOGW ("dnsmasq died from an unknown cause");
-
-	priv->running = FALSE;
-
-	if (failed)
-		g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
-}
-
-/****************************************************************/
-
-static gboolean
-is_caching (NMDnsPlugin *plugin)
-{
-	return TRUE;
-}
-
-static const char *
-get_name (NMDnsPlugin *plugin)
-{
-	return "dnsmasq";
-}
-
-/****************************************************************/
-
-NMDnsPlugin *
-nm_dns_dnsmasq_new (void)
-{
-	return g_object_new (NM_TYPE_DNS_DNSMASQ, NULL);
-}
-
-static void
-nm_dns_dnsmasq_init (NMDnsDnsmasq *self)
-{
-}
-
-static void
-dispose (GObject *object)
-{
-	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (object);
-
-	nm_clear_g_cancellable (&priv->dnsmasq_cancellable);
-	nm_clear_g_cancellable (&priv->update_cancellable);
-
-	g_clear_object (&priv->dnsmasq);
-
-	g_clear_pointer (&priv->set_server_ex_args, g_variant_unref);
-
-	G_OBJECT_CLASS (nm_dns_dnsmasq_parent_class)->dispose (object);
-}
-
-static void
-nm_dns_dnsmasq_class_init (NMDnsDnsmasqClass *dns_class)
-{
-	NMDnsPluginClass *plugin_class = NM_DNS_PLUGIN_CLASS (dns_class);
-	GObjectClass *object_class = G_OBJECT_CLASS (dns_class);
-
-	g_type_class_add_private (dns_class, sizeof (NMDnsDnsmasqPrivate));
-
-	object_class->dispose = dispose;
-
-	plugin_class->child_quit = child_quit;
-	plugin_class->is_caching = is_caching;
-	plugin_class->update = update;
-	plugin_class->get_name = get_name;
-}
-
diff --git a/src/dns-manager/nm-dns-dnsmasq.h b/src/dns-manager/nm-dns-dnsmasq.h
deleted file mode 100644
index f0393c12..00000000
--- a/src/dns-manager/nm-dns-dnsmasq.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2010 Red Hat, Inc.
- */
-
-#ifndef __NETWORKMANAGER_DNS_DNSMASQ_H__
-#define __NETWORKMANAGER_DNS_DNSMASQ_H__
-
-#include "nm-dns-plugin.h"
-
-#define NM_TYPE_DNS_DNSMASQ            (nm_dns_dnsmasq_get_type ())
-#define NM_DNS_DNSMASQ(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNS_DNSMASQ, NMDnsDnsmasq))
-#define NM_DNS_DNSMASQ_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DNS_DNSMASQ, NMDnsDnsmasqClass))
-#define NM_IS_DNS_DNSMASQ(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DNS_DNSMASQ))
-#define NM_IS_DNS_DNSMASQ_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DNS_DNSMASQ))
-#define NM_DNS_DNSMASQ_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNS_DNSMASQ, NMDnsDnsmasqClass))
-
-typedef struct {
-	NMDnsPlugin parent;
-} NMDnsDnsmasq;
-
-typedef struct {
-	NMDnsPluginClass parent;
-} NMDnsDnsmasqClass;
-
-GType nm_dns_dnsmasq_get_type (void);
-
-NMDnsPlugin *nm_dns_dnsmasq_new (void);
-
-#endif /* __NETWORKMANAGER_DNS_DNSMASQ_H__ */
-
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
deleted file mode 100644
index 5a758a9e..00000000
--- a/src/dns-manager/nm-dns-manager.c
+++ /dev/null
@@ -1,1800 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager -- Network link manager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2004 - 2005 Colin Walters <walters@redhat.com>
- * Copyright (C) 2004 - 2013 Red Hat, Inc.
- * Copyright (C) 2005 - 2008 Novell, Inc.
- *   and others
- */
-
-#include "nm-default.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <resolv.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include <linux/fs.h>
-
-#include "nm-utils.h"
-#include "nm-core-internal.h"
-#include "nm-dns-manager.h"
-#include "nm-ip4-config.h"
-#include "nm-ip6-config.h"
-#include "NetworkManagerUtils.h"
-#include "nm-config.h"
-
-#include "nm-dns-plugin.h"
-#include "nm-dns-dnsmasq.h"
-#include "nm-dns-unbound.h"
-
-#if WITH_LIBSOUP
-#include <libsoup/soup.h>
-
-#ifdef SOUP_CHECK_VERSION
-#if SOUP_CHECK_VERSION (2, 40, 0)
-#define DOMAIN_IS_VALID(domain) (*(domain) && !soup_tld_domain_is_public_suffix (domain))
-#endif
-#endif
-#endif
-
-#ifndef DOMAIN_IS_VALID
-#define DOMAIN_IS_VALID(domain) (*(domain))
-#endif
-
-#define HASH_LEN 20
-
-#ifndef RESOLVCONF_PATH
-#define RESOLVCONF_PATH "/sbin/resolvconf"
-#endif
-
-#ifndef NETCONFIG_PATH
-#define NETCONFIG_PATH "/sbin/netconfig"
-#endif
-
-#define PLUGIN_RATELIMIT_INTERVAL    30
-#define PLUGIN_RATELIMIT_BURST       5
-#define PLUGIN_RATELIMIT_DELAY       300
-
-enum {
-	CONFIG_CHANGED,
-
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-typedef enum {
-	SR_SUCCESS,
-	SR_NOTFOUND,
-	SR_ERROR
-} SpawnResult;
-
-/*********************************************************************************************/
-
-#define _NMLOG_PREFIX_NAME                "dns-mgr"
-#define _NMLOG_DOMAIN                     LOGD_DNS
-#define _NMLOG(level, ...) \
-    G_STMT_START { \
-        const NMLogLevel __level = (level); \
-        \
-        if (nm_logging_enabled (__level, _NMLOG_DOMAIN)) { \
-            char __prefix[20]; \
-            const NMDnsManager *const __self = (self); \
-            \
-            _nm_log (__level, _NMLOG_DOMAIN, 0, \
-                     "%s%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \
-                     _NMLOG_PREFIX_NAME, \
-                     ((!__self || __self == singleton_instance) \
-                        ? "" \
-                        : nm_sprintf_buf (__prefix, "[%p]", __self)) \
-                     _NM_UTILS_MACRO_REST (__VA_ARGS__)); \
-        } \
-    } G_STMT_END
-
-/*********************************************************************************************/
-
-typedef struct {
-	GPtrArray *configs;
-	NMDnsIPConfigData *best_conf4, *best_conf6;
-	gboolean need_sort;
-
-	char *hostname;
-	guint updates_queue;
-
-	guint8 hash[HASH_LEN];  /* SHA1 hash of current DNS config */
-	guint8 prev_hash[HASH_LEN];  /* Hash when begin_updates() was called */
-
-	NMDnsManagerResolvConfManager rc_manager;
-	NMDnsPlugin *plugin;
-
-	NMConfig *config;
-
-	gboolean dns_touched;
-
-	struct {
-		guint64 ts;
-		guint num_restarts;
-		guint timer;
-	} plugin_ratelimit;
-} NMDnsManagerPrivate;
-
-struct _NMDnsManager {
-	GObject parent;
-	NMDnsManagerPrivate _priv;
-};
-
-struct _NMDnsManagerClass {
-	GObjectClass parent;
-};
-
-G_DEFINE_TYPE (NMDnsManager, nm_dns_manager, G_TYPE_OBJECT)
-
-NM_DEFINE_SINGLETON_INSTANCE (NMDnsManager);
-
-#define NM_DNS_MANAGER_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDnsManager, NM_IS_DNS_MANAGER)
-
-/*****************************************************************************/
-
-typedef struct {
-	GPtrArray *nameservers;
-	GPtrArray *searches;
-	GPtrArray *options;
-	const char *nis_domain;
-	GPtrArray *nis_servers;
-} NMResolvConfData;
-
-NM_UTILS_LOOKUP_STR_DEFINE_STATIC (_rc_manager_to_string, NMDnsManagerResolvConfManager,
-	NM_UTILS_LOOKUP_DEFAULT_WARN (NULL),
-	NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_UNKNOWN,        "unknown"),
-	NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED,      "unmanaged"),
-	NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_IMMUTABLE,      "immutable"),
-	NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK,        "symlink"),
-	NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE,           "file"),
-	NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF,     "resolvconf"),
-	NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG,      "netconfig"),
-);
-
-NM_UTILS_LOOKUP_STR_DEFINE_STATIC (_config_type_to_string, NMDnsIPConfigType,
-	NM_UTILS_LOOKUP_DEFAULT_WARN ("<unknown>"),
-	NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_IP_CONFIG_TYPE_DEFAULT, "default"),
-	NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE, "best"),
-	NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_IP_CONFIG_TYPE_VPN, "vpn"),
-);
-
-static NMDnsIPConfigData *
-ip_config_data_new (gpointer config, NMDnsIPConfigType type, const char *iface)
-{
-	NMDnsIPConfigData *data;
-
-	data = g_slice_new0 (NMDnsIPConfigData);
-	data->config = g_object_ref (config);
-	data->iface = g_strdup (iface);
-	data->type = type;
-
-	return data;
-}
-
-static void
-ip_config_data_destroy (gpointer ptr)
-{
-	NMDnsIPConfigData *data = ptr;
-
-	if (!data)
-		return;
-
-	g_object_unref (data->config);
-	g_free (data->iface);
-	g_slice_free (NMDnsIPConfigData, data);
-}
-
-static gint
-ip_config_data_compare (const NMDnsIPConfigData *a, const NMDnsIPConfigData *b)
-{
-	gboolean a_v4, b_v4;
-	gint a_prio, b_prio;
-
-	a_v4 = NM_IS_IP4_CONFIG (a->config);
-	b_v4 = NM_IS_IP4_CONFIG (b->config);
-
-	a_prio = a_v4 ?
-		nm_ip4_config_get_dns_priority ((NMIP4Config *) a->config) :
-		nm_ip6_config_get_dns_priority ((NMIP6Config *) a->config);
-
-	b_prio = b_v4 ?
-		nm_ip4_config_get_dns_priority ((NMIP4Config *) b->config) :
-		nm_ip6_config_get_dns_priority ((NMIP6Config *) b->config);
-
-	/* Configurations with lower priority value first */
-	if (a_prio < b_prio)
-		return -1;
-	else if (a_prio > b_prio)
-		return 1;
-
-	/* Sort also according to type */
-	if (a->type > b->type)
-		return -1;
-	else if (a->type < b->type)
-		return 1;
-
-	return 0;
-}
-
-static gint
-ip_config_data_ptr_compare (gconstpointer a, gconstpointer b)
-{
-	const NMDnsIPConfigData *const *ptr_a = a, *const *ptr_b = b;
-
-	return ip_config_data_compare (*ptr_a, *ptr_b);
-}
-
-static void
-add_string_item (GPtrArray *array, const char *str)
-{
-	int i;
-
-	g_return_if_fail (array != NULL);
-	g_return_if_fail (str != NULL);
-
-	/* Check for dupes before adding */
-	for (i = 0; i < array->len; i++) {
-		const char *candidate = g_ptr_array_index (array, i);
-
-		if (candidate && !strcmp (candidate, str))
-			return;
-	}
-
-	/* No dupes, add the new item */
-	g_ptr_array_add (array, g_strdup (str));
-}
-
-static void
-add_dns_option_item (GPtrArray *array, const char *str, gboolean ipv6)
-{
-	if (_nm_utils_dns_option_find_idx (array, str) < 0)
-		g_ptr_array_add (array, g_strdup (str));
-}
-
-static void
-merge_one_ip4_config (NMResolvConfData *rc, NMIP4Config *src)
-{
-	guint32 num, num_domains, num_searches, i;
-
-	num = nm_ip4_config_get_num_nameservers (src);
-	for (i = 0; i < num; i++) {
-		add_string_item (rc->nameservers,
-		                 nm_utils_inet4_ntop (nm_ip4_config_get_nameserver (src, i), NULL));
-	}
-
-	num_domains = nm_ip4_config_get_num_domains (src);
-	num_searches = nm_ip4_config_get_num_searches (src);
-
-	for (i = 0; i < num_searches; i++) {
-		const char *search;
-
-		search = nm_ip4_config_get_search (src, i);
-		if (!DOMAIN_IS_VALID (search))
-			continue;
-		add_string_item (rc->searches, search);
-	}
-
-	if (num_domains > 1 || !num_searches) {
-		for (i = 0; i < num_domains; i++) {
-			const char *domain;
-
-			domain = nm_ip4_config_get_domain (src, i);
-			if (!DOMAIN_IS_VALID (domain))
-				continue;
-			add_string_item (rc->searches, domain);
-		}
-	}
-
-	num = nm_ip4_config_get_num_dns_options (src);
-	for (i = 0; i < num; i++) {
-		const char *option;
-
-		option = nm_ip4_config_get_dns_option (src, i);
-		add_dns_option_item (rc->options, option, FALSE);
-	}
-
-	/* NIS stuff */
-	num = nm_ip4_config_get_num_nis_servers (src);
-	for (i = 0; i < num; i++) {
-		add_string_item (rc->nis_servers,
-		                 nm_utils_inet4_ntop (nm_ip4_config_get_nis_server (src, i), NULL));
-	}
-
-	if (nm_ip4_config_get_nis_domain (src)) {
-		/* FIXME: handle multiple domains */
-		if (!rc->nis_domain)
-			rc->nis_domain = nm_ip4_config_get_nis_domain (src);
-	}
-}
-
-static void
-merge_one_ip6_config (NMResolvConfData *rc, NMIP6Config *src, const char *iface)
-{
-	guint32 num, num_domains, num_searches, i;
-
-	num = nm_ip6_config_get_num_nameservers (src);
-	for (i = 0; i < num; i++) {
-		const struct in6_addr *addr;
-		char buf[NM_UTILS_INET_ADDRSTRLEN + 50];
-
-		addr = nm_ip6_config_get_nameserver (src, i);
-
-		/* inet_ntop is probably supposed to do this for us, but it doesn't */
-		if (IN6_IS_ADDR_V4MAPPED (addr))
-			nm_utils_inet4_ntop (addr->s6_addr32[3], buf);
-		else {
-			nm_utils_inet6_ntop (addr, buf);
-			if (IN6_IS_ADDR_LINKLOCAL (addr)) {
-				g_strlcat (buf, "%", sizeof (buf));
-				g_strlcat (buf, iface, sizeof (buf));
-			}
-		}
-		add_string_item (rc->nameservers, buf);
-	}
-
-	num_domains = nm_ip6_config_get_num_domains (src);
-	num_searches = nm_ip6_config_get_num_searches (src);
-
-	for (i = 0; i < num_searches; i++) {
-		const char *search;
-
-		search = nm_ip6_config_get_search (src, i);
-		if (!DOMAIN_IS_VALID (search))
-			continue;
-		add_string_item (rc->searches, search);
-	}
-
-	if (num_domains > 1 || !num_searches) {
-		for (i = 0; i < num_domains; i++) {
-			const char *domain;
-
-			domain = nm_ip6_config_get_domain (src, i);
-			if (!DOMAIN_IS_VALID (domain))
-				continue;
-			add_string_item (rc->searches, domain);
-		}
-	}
-
-	num = nm_ip6_config_get_num_dns_options (src);
-	for (i = 0; i < num; i++) {
-		const char *option;
-
-		option = nm_ip6_config_get_dns_option (src, i);
-		add_dns_option_item (rc->options, option, TRUE);
-	}
-}
-
-static void
-merge_one_ip_config_data (NMDnsManager *self,
-                          NMResolvConfData *rc,
-                          NMDnsIPConfigData *data)
-{
-	if (NM_IS_IP4_CONFIG (data->config))
-		merge_one_ip4_config (rc, (NMIP4Config *) data->config);
-	else if (NM_IS_IP6_CONFIG (data->config))
-		merge_one_ip6_config (rc, (NMIP6Config *) data->config, data->iface);
-	else
-		g_return_if_reached ();
-}
-
-static GPid
-run_netconfig (NMDnsManager *self, GError **error, gint *stdin_fd)
-{
-	char *argv[5];
-	gs_free char *tmp = NULL;
-	GPid pid = -1;
-
-	argv[0] = NETCONFIG_PATH;
-	argv[1] = "modify";
-	argv[2] = "--service";
-	argv[3] = "NetworkManager";
-	argv[4] = NULL;
-
-	_LOGD ("spawning '%s'",
-	       (tmp = g_strjoinv (" ", argv)));
-
-	if (!g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL,
-	                               NULL, &pid, stdin_fd, NULL, NULL, error))
-		return -1;
-
-	return pid;
-}
-
-static void
-write_to_netconfig (NMDnsManager *self, gint fd, const char *key, const char *value)
-{
-	char *str;
-	int x;
-
-	str = g_strdup_printf ("%s='%s'\n", key, value);
-	_LOGD ("writing to netconfig: %s", str);
-	x = write (fd, str, strlen (str));
-	g_free (str);
-}
-
-static SpawnResult
-dispatch_netconfig (NMDnsManager *self,
-                    char **searches,
-                    char **nameservers,
-                    const char *nis_domain,
-                    char **nis_servers,
-                    GError **error)
-{
-	char *str;
-	GPid pid;
-	gint fd;
-	int status;
-
-	pid = run_netconfig (self, error, &fd);
-	if (pid <= 0)
-		return SR_NOTFOUND;
-
-	/* NM is writing already-merged DNS information to netconfig, so it
-	 * does not apply to a specific network interface.
-	 */
-	write_to_netconfig (self, fd, "INTERFACE", "NetworkManager");
-
-	if (searches) {
-		str = g_strjoinv (" ", searches);
-		write_to_netconfig (self, fd, "DNSSEARCH", str);
-		g_free (str);
-	}
-
-	if (nameservers) {
-		str = g_strjoinv (" ", nameservers);
-		write_to_netconfig (self, fd, "DNSSERVERS", str);
-		g_free (str);
-	}
-
-	if (nis_domain)
-		write_to_netconfig (self, fd, "NISDOMAIN", nis_domain);
-
-	if (nis_servers) {
-		str = g_strjoinv (" ", nis_servers);
-		write_to_netconfig (self, fd, "NISSERVERS", str);
-		g_free (str);
-	}
-
-	close (fd);
-
-	/* Wait until the process exits */
-	if (!nm_utils_kill_child_sync (pid, 0, LOGD_DNS, "netconfig", &status, 1000, 0)) {
-		int errsv = errno;
-
-		g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_FAILED,
-		             "Error waiting for netconfig to exit: %s",
-		             strerror (errsv));
-		return SR_ERROR;
-	}
-	if (!WIFEXITED (status) || WEXITSTATUS (status) != EXIT_SUCCESS) {
-		g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_FAILED,
-		             "Error calling netconfig: %s %d",
-		             WIFEXITED (status) ? "exited with status" : (WIFSIGNALED (status) ? "exited with signal" : "exited with unknown reason"),
-		             WIFEXITED (status) ? WEXITSTATUS (status) : (WIFSIGNALED (status) ? WTERMSIG (status) : status));
-		return SR_ERROR;
-	}
-	return SR_SUCCESS;
-}
-
-static char *
-create_resolv_conf (char **searches,
-                    char **nameservers,
-                    char **options)
-{
-	gs_free char *searches_str = NULL;
-	gs_free char *nameservers_str = NULL;
-	gs_free char *options_str = NULL;
-	char *tmp_str;
-	GString *str;
-	int i;
-
-	if (searches) {
-		tmp_str = g_strjoinv (" ", searches);
-		searches_str = g_strconcat ("search ", tmp_str, "\n", NULL);
-		g_free (tmp_str);
-	}
-
-	if (options) {
-		tmp_str = g_strjoinv (" ", options);
-		options_str = g_strconcat ("options ", tmp_str, "\n", NULL);
-		g_free (tmp_str);
-	}
-
-	if (nameservers) {
-		int num = g_strv_length (nameservers);
-
-		str = g_string_new ("");
-		for (i = 0; i < num; i++) {
-			if (i == 3) {
-				g_string_append (str, "# ");
-				g_string_append (str, "NOTE: the libc resolver may not support more than 3 nameservers.");
-				g_string_append (str, "\n# ");
-				g_string_append (str, "The nameservers listed below may not be recognized.");
-				g_string_append_c (str, '\n');
-			}
-
-			g_string_append (str, "nameserver ");
-			g_string_append (str, nameservers[i]);
-			g_string_append_c (str, '\n');
-		}
-		nameservers_str = g_string_free (str, FALSE);
-	}
-
-	return g_strdup_printf ("# Generated by NetworkManager\n%s%s%s",
-	                        searches_str ?: "",
-	                        nameservers_str ?: "",
-	                        options_str ?: "");
-}
-
-static gboolean
-write_resolv_conf_contents (FILE *f,
-                            const char *content,
-                            GError **error)
-{
-	int errsv;
-
-	if (fprintf (f, "%s", content) < 0) {
-		errsv = errno;
-		g_set_error (error,
-		             NM_MANAGER_ERROR,
-		             NM_MANAGER_ERROR_FAILED,
-		             "Could not write " _PATH_RESCONF ": %s",
-		             g_strerror (errsv));
-		errno = errsv;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static gboolean
-write_resolv_conf (FILE *f,
-                   char **searches,
-                   char **nameservers,
-                   char **options,
-                   GError **error)
-{
-	gs_free char *content = NULL;
-
-	content = create_resolv_conf (searches, nameservers, options);
-	return write_resolv_conf_contents (f, content, error);
-}
-
-static SpawnResult
-dispatch_resolvconf (NMDnsManager *self,
-                     char **searches,
-                     char **nameservers,
-                     char **options,
-                     GError **error)
-{
-	gs_free char *cmd = NULL;
-	FILE *f;
-	gboolean success = FALSE;
-	int errnosv, err;
-
-	if (!g_file_test (RESOLVCONF_PATH, G_FILE_TEST_IS_EXECUTABLE)) {
-		g_set_error_literal (error,
-		                     NM_MANAGER_ERROR,
-		                     NM_MANAGER_ERROR_FAILED,
-		                     RESOLVCONF_PATH " is not executable");
-		return SR_NOTFOUND;
-	}
-
-	if (!searches && !nameservers) {
-		_LOGI ("Removing DNS information from %s", RESOLVCONF_PATH);
-
-		cmd = g_strconcat (RESOLVCONF_PATH, " -d ", "NetworkManager", NULL);
-		if (nm_spawn_process (cmd, error) != 0)
-			return SR_ERROR;
-
-		return SR_SUCCESS;
-	}
-
-	_LOGI ("Writing DNS information to %s", RESOLVCONF_PATH);
-
-	cmd = g_strconcat (RESOLVCONF_PATH, " -a ", "NetworkManager", NULL);
-	if ((f = popen (cmd, "w")) == NULL) {
-		g_set_error (error,
-		             NM_MANAGER_ERROR,
-		             NM_MANAGER_ERROR_FAILED,
-		             "Could not write to %s: %s",
-		             RESOLVCONF_PATH,
-		             g_strerror (errno));
-		return SR_ERROR;
-	}
-
-	success = write_resolv_conf (f, searches, nameservers, options, error);
-	err = pclose (f);
-	if (err < 0) {
-		errnosv = errno;
-		g_clear_error (error);
-		g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errnosv),
-		             "Failed to close pipe to resolvconf: %d", errnosv);
-		return SR_ERROR;
-	} else if (err > 0) {
-		_LOGW ("resolvconf failed with status %d", err);
-		g_clear_error (error);
-		g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-		             "resolvconf failed with status %d", err);
-		return SR_ERROR;
-	}
-
-	return success ? SR_SUCCESS : SR_ERROR;
-}
-
-#define MY_RESOLV_CONF NMRUNDIR "/resolv.conf"
-#define MY_RESOLV_CONF_TMP MY_RESOLV_CONF ".tmp"
-#define RESOLV_CONF_TMP "/etc/.resolv.conf.NetworkManager"
-
-static SpawnResult
-update_resolv_conf (NMDnsManager *self,
-                    char **searches,
-                    char **nameservers,
-                    char **options,
-                    GError **error,
-                    NMDnsManagerResolvConfManager rc_manager)
-{
-	FILE *f;
-	struct stat st;
-	gboolean success;
-	gs_free char *content = NULL;
-	SpawnResult write_file_result = SR_SUCCESS;
-	int errsv;
-	const char *rc_path = _PATH_RESCONF;
-	nm_auto_free char *rc_path_real = NULL;
-
-	/* If we are not managing /etc/resolv.conf and it points to
-	 * MY_RESOLV_CONF, don't write the private DNS configuration to
-	 * MY_RESOLV_CONF otherwise we would overwrite the changes done by
-	 * some external application.
-	 *
-	 * This is the only situation, where we don't try to update our
-	 * internal resolv.conf file. */
-	if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED) {
-		gs_free char *path = g_file_read_link (_PATH_RESCONF, NULL);
-
-		if (g_strcmp0 (path, MY_RESOLV_CONF) == 0) {
-			_LOGD ("update-resolv-conf: not updating " _PATH_RESCONF
-			       " since it points to " MY_RESOLV_CONF);
-			return SR_SUCCESS;
-		}
-	}
-
-	content = create_resolv_conf (searches, nameservers, options);
-
-	if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE) {
-		GError *local = NULL;
-
-		rc_path_real = realpath (rc_path, NULL);
-		if (rc_path_real)
-			rc_path = rc_path_real;
-
-		/* we first write to /etc/resolv.conf directly. If that fails,
-		 * we still continue to write to runstatedir but remember the
-		 * error. */
-		if (!g_file_set_contents (rc_path, content, -1, &local)) {
-			_LOGT ("update-resolv-conf: write to %s failed (rc-manager=%s, %s)",
-			       rc_path, _rc_manager_to_string (rc_manager), local->message);
-			write_file_result = SR_ERROR;
-			g_propagate_error (error, local);
-			error = NULL;
-		} else {
-			_LOGT ("update-resolv-conf: write to %s succeeded (rc-manager=%s)",
-			       rc_path, _rc_manager_to_string (rc_manager));
-		}
-	}
-
-	if ((f = fopen (MY_RESOLV_CONF_TMP, "we")) == NULL) {
-		errsv = errno;
-		g_set_error (error,
-		             NM_MANAGER_ERROR,
-		             NM_MANAGER_ERROR_FAILED,
-		             "Could not open %s: %s",
-		             MY_RESOLV_CONF_TMP,
-		             g_strerror (errsv));
-		_LOGT ("update-resolv-conf: open temporary file %s failed (%s)",
-		       MY_RESOLV_CONF_TMP, g_strerror (errsv));
-		return SR_ERROR;
-	}
-
-	success = write_resolv_conf_contents (f, content, error);
-	if (!success) {
-		errsv = errno;
-		_LOGT ("update-resolv-conf: write temporary file %s failed (%s)",
-		       MY_RESOLV_CONF_TMP, g_strerror (errsv));
-	}
-
-	if (fclose (f) < 0) {
-		if (success) {
-			errsv = errno;
-			/* only set an error here if write_resolv_conf() was successful,
-			 * since its error is more important.
-			 */
-			g_set_error (error,
-			             NM_MANAGER_ERROR,
-			             NM_MANAGER_ERROR_FAILED,
-			             "Could not close %s: %s",
-			             MY_RESOLV_CONF_TMP,
-			             g_strerror (errsv));
-			_LOGT ("update-resolv-conf: close temporary file %s failed (%s)",
-			       MY_RESOLV_CONF_TMP, g_strerror (errsv));
-		}
-		return SR_ERROR;
-	} else if (!success)
-		return SR_ERROR;
-
-	if (rename (MY_RESOLV_CONF_TMP, MY_RESOLV_CONF) < 0) {
-		errsv = errno;
-		g_set_error (error,
-		             NM_MANAGER_ERROR,
-		             NM_MANAGER_ERROR_FAILED,
-		             "Could not replace %s: %s",
-		             MY_RESOLV_CONF,
-		             g_strerror (errno));
-		_LOGT ("update-resolv-conf: failed to rename temporary file %s to %s (%s)",
-		       MY_RESOLV_CONF_TMP, MY_RESOLV_CONF, g_strerror (errsv));
-		return SR_ERROR;
-	}
-
-	if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE) {
-		_LOGT ("update-resolv-conf: write internal file %s succeeded (rc-manager=%s)",
-		       rc_path, _rc_manager_to_string (rc_manager));
-		return write_file_result;
-	}
-
-	if (rc_manager != NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK) {
-		_LOGT ("update-resolv-conf: write internal file %s succeeded", MY_RESOLV_CONF);
-		return SR_SUCCESS;
-	}
-
-	/* A symlink pointing to NM's own resolv.conf (MY_RESOLV_CONF) is always
-	 * overwritten to ensure that changes are indicated with inotify.  Symlinks
-	 * pointing to any other file are never overwritten.
-	 */
-	if (lstat (_PATH_RESCONF, &st) != 0) {
-		errsv = errno;
-		if (errsv != ENOENT) {
-			/* NM cannot read /etc/resolv.conf */
-			_LOGT ("update-resolv-conf: write internal file %s succeeded but lstat(%s) failed (%s)",
-			       MY_RESOLV_CONF, _PATH_RESCONF, g_strerror (errsv));
-			g_set_error (error,
-			             NM_MANAGER_ERROR,
-			             NM_MANAGER_ERROR_FAILED,
-			             "Could not lstat %s: %s",
-			             _PATH_RESCONF,
-			             g_strerror (errsv));
-			return SR_ERROR;
-		}
-	} else {
-		if (S_ISLNK (st.st_mode)) {
-			if (stat (_PATH_RESCONF, &st) != -1) {
-				gs_free char *path = g_file_read_link (_PATH_RESCONF, NULL);
-
-				if (!path || !nm_streq (path, MY_RESOLV_CONF)) {
-					/* It's not NM's symlink; do nothing */
-					_LOGT ("update-resolv-conf: write internal file %s succeeded "
-					       "but don't update %s as it points to %s",
-					       MY_RESOLV_CONF, _PATH_RESCONF, path ?: "");
-					return SR_SUCCESS;
-				}
-
-				/* resolv.conf is a symlink owned by NM and the target is accessible
-				 */
-			} else {
-				/* resolv.conf is a symlink but the target is not accessible;
-				 * some other program is probably managing resolv.conf and
-				 * NM should not touch it.
-				 */
-				_LOGT ("update-resolv-conf: write internal file %s succeeded "
-				       "but don't update %s as the symlinks points somewhere else",
-				       MY_RESOLV_CONF, _PATH_RESCONF);
-				return SR_SUCCESS;
-			}
-		}
-	}
-
-	/* By this point, either /etc/resolv.conf does not exist, is a regular
-	 * file, or is a symlink already owned by NM.  In all cases /etc/resolv.conf
-	 * is replaced with a symlink pointing to NM's resolv.conf in /var/run/.
-	 */
-	if (   unlink (RESOLV_CONF_TMP) != 0
-	    && ((errsv = errno) != ENOENT)) {
-		g_set_error (error,
-		             NM_MANAGER_ERROR,
-		             NM_MANAGER_ERROR_FAILED,
-		             "Could not unlink %s: %s",
-		             RESOLV_CONF_TMP,
-		             g_strerror (errsv));
-		_LOGT ("update-resolv-conf: write internal file %s succeeded "
-		       "but canot delete temporary file %s: %s",
-		       MY_RESOLV_CONF, RESOLV_CONF_TMP, g_strerror (errsv));
-		return SR_ERROR;
-	}
-
-	if (symlink (MY_RESOLV_CONF, RESOLV_CONF_TMP) == -1) {
-		errsv = errno;
-		g_set_error (error,
-		             NM_MANAGER_ERROR,
-		             NM_MANAGER_ERROR_FAILED,
-		             "Could not create symlink %s pointing to %s: %s",
-		             RESOLV_CONF_TMP,
-		             MY_RESOLV_CONF,
-		             g_strerror (errsv));
-		_LOGT ("update-resolv-conf: write internal file %s succeeded "
-		       "but failed to symlink %s: %s",
-		       MY_RESOLV_CONF, RESOLV_CONF_TMP, g_strerror (errsv));
-		return SR_ERROR;
-	}
-
-	if (rename (RESOLV_CONF_TMP, _PATH_RESCONF) == -1) {
-		errsv = errno;
-		g_set_error (error,
-		             NM_MANAGER_ERROR,
-		             NM_MANAGER_ERROR_FAILED,
-		             "Could not rename %s to %s: %s",
-		             RESOLV_CONF_TMP,
-		             _PATH_RESCONF,
-		             g_strerror (errsv));
-		_LOGT ("update-resolv-conf: write internal file %s succeeded "
-		       "but failed to rename temporary symlink %s to %s: %s",
-		       MY_RESOLV_CONF, RESOLV_CONF_TMP, _PATH_RESCONF, g_strerror (errsv));
-		return SR_ERROR;
-	}
-
-	_LOGT ("update-resolv-conf: write internal file %s succeeded and update symlink %s",
-	       MY_RESOLV_CONF, _PATH_RESCONF);
-	return SR_SUCCESS;
-}
-
-static void
-compute_hash (NMDnsManager *self, const NMGlobalDnsConfig *global, guint8 buffer[HASH_LEN])
-{
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-	GChecksum *sum;
-	gsize len = HASH_LEN;
-	guint i;
-
-	sum = g_checksum_new (G_CHECKSUM_SHA1);
-	g_assert (len == g_checksum_type_get_length (G_CHECKSUM_SHA1));
-
-	if (global)
-		nm_global_dns_config_update_checksum (global, sum);
-	else {
-		for (i = 0; i < priv->configs->len; i++) {
-			NMDnsIPConfigData *data = priv->configs->pdata[i];
-
-			if (NM_IS_IP4_CONFIG (data->config))
-				nm_ip4_config_hash ((NMIP4Config *) data->config, sum, TRUE);
-			else if (NM_IS_IP6_CONFIG (data->config))
-				nm_ip6_config_hash ((NMIP6Config *) data->config, sum, TRUE);
-		}
-	}
-
-	g_checksum_get_digest (sum, buffer, &len);
-	g_checksum_free (sum);
-}
-
-static gboolean
-merge_global_dns_config (NMResolvConfData *rc, NMGlobalDnsConfig *global_conf)
-{
-	NMGlobalDnsDomain *default_domain;
-	const char *const *searches;
-	const char *const *options;
-	const char *const *servers;
-	gint i;
-
-	if (!global_conf)
-		return FALSE;
-
-	searches = nm_global_dns_config_get_searches (global_conf);
-	options = nm_global_dns_config_get_options (global_conf);
-
-	for (i = 0; searches && searches[i]; i++) {
-		if (DOMAIN_IS_VALID (searches[i]))
-			add_string_item (rc->searches, searches[i]);
-	}
-
-	for (i = 0; options && options[i]; i++)
-		add_string_item (rc->options, options[i]);
-
-	default_domain = nm_global_dns_config_lookup_domain (global_conf, "*");
-	g_assert (default_domain);
-	servers = nm_global_dns_domain_get_servers (default_domain);
-	for (i = 0; servers && servers[i]; i++)
-		add_string_item (rc->nameservers, servers[i]);
-
-	return TRUE;
-}
-
-static const char *
-get_nameserver_list (void *config, GString **str)
-{
-	NMIP4Config *ip4;
-	NMIP6Config *ip6;
-	guint num, i;
-
-	nm_assert (str);
-
-	if (*str)
-		g_string_truncate (*str, 0);
-	else
-		*str = g_string_sized_new (64);
-
-	if (NM_IS_IP4_CONFIG (config)) {
-		ip4 = (NMIP4Config *) config;
-		num = nm_ip4_config_get_num_nameservers (ip4);
-		for (i = 0; i < num; i++) {
-			g_string_append (*str,
-			                 nm_utils_inet4_ntop (nm_ip4_config_get_nameserver (ip4, i),
-			                                      NULL));
-			g_string_append_c (*str, ' ');
-		}
-	} else if (NM_IS_IP6_CONFIG (config)) {
-		ip6 = (NMIP6Config *) config;
-		num = nm_ip6_config_get_num_nameservers (ip6);
-		for (i = 0; i < num; i++) {
-			g_string_append (*str,
-			                 nm_utils_inet6_ntop (nm_ip6_config_get_nameserver (ip6, i),
-			                                      NULL));
-			g_string_append_c (*str, ' ');
-		}
-	} else
-		g_return_val_if_reached (NULL);
-
-	return (*str)->str;
-}
-
-static gboolean
-update_dns (NMDnsManager *self,
-            gboolean no_caching,
-            GError **error)
-{
-	NMDnsManagerPrivate *priv;
-	NMResolvConfData rc;
-	const char *nis_domain = NULL;
-	char **searches = NULL;
-	char **options = NULL;
-	char **nameservers = NULL;
-	char **nis_servers = NULL;
-	int num, i, len;
-	gboolean caching = FALSE, update = TRUE;
-	gboolean resolv_conf_updated = FALSE;
-	SpawnResult result = SR_ERROR;
-	NMConfigData *data;
-	NMGlobalDnsConfig *global_config;
-	gs_free NMDnsIPConfigData **plugin_confs = NULL;
-	nm_auto_free_gstring GString *tmp_gstring = NULL;
-
-	g_return_val_if_fail (!error || !*error, FALSE);
-
-	priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-	nm_clear_g_source (&priv->plugin_ratelimit.timer);
-
-	if (NM_IN_SET (priv->rc_manager, NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED,
-	                                 NM_DNS_MANAGER_RESOLV_CONF_MAN_IMMUTABLE)) {
-		update = FALSE;
-		_LOGD ("update-dns: not updating resolv.conf");
-	} else {
-		priv->dns_touched = TRUE;
-		_LOGD ("update-dns: updating resolv.conf");
-	}
-
-	data = nm_config_get_data (priv->config);
-	global_config = nm_config_data_get_global_dns_config (data);
-
-	if (priv->need_sort) {
-		g_ptr_array_sort (priv->configs, ip_config_data_ptr_compare);
-		priv->need_sort = FALSE;
-	}
-
-	/* Update hash with config we're applying */
-	compute_hash (self, global_config, priv->hash);
-
-	rc.nameservers = g_ptr_array_new ();
-	rc.searches = g_ptr_array_new ();
-	rc.options = g_ptr_array_new ();
-	rc.nis_domain = NULL;
-	rc.nis_servers = g_ptr_array_new ();
-
-	if (global_config)
-		merge_global_dns_config (&rc, global_config);
-	else {
-		int prio, prev_prio = 0;
-		NMDnsIPConfigData *current;
-		gboolean skip = FALSE, v4;
-
-		plugin_confs = g_new (NMDnsIPConfigData *, priv->configs->len + 1);
-
-		for (i = 0; i < priv->configs->len; i++) {
-			current = priv->configs->pdata[i];
-			v4 = NM_IS_IP4_CONFIG (current->config);
-
-			prio = v4 ?
-				nm_ip4_config_get_dns_priority ((NMIP4Config *) current->config) :
-				nm_ip6_config_get_dns_priority ((NMIP6Config *) current->config);
-
-			if (prev_prio < 0 && prio != prev_prio) {
-				skip = TRUE;
-				plugin_confs[i] = NULL;
-			}
-
-			prev_prio = prio;
-
-			_LOGT ("config: %8d %-7s v%c %-16s %s: %s",
-			       prio,
-			       _config_type_to_string (current->type),
-			       v4 ? '4' : '6',
-			       current->iface,
-			       skip ? "<SKIP>" : "",
-			       get_nameserver_list (current->config, &tmp_gstring));
-
-			if (!skip) {
-				merge_one_ip_config_data (self, &rc, current);
-				plugin_confs[i] = current;
-			}
-		}
-		plugin_confs[i] = NULL;
-	}
-
-	/* If the hostname is a FQDN ("dcbw.example.com"), then add the domain part of it
-	 * ("example.com") to the searches list, to ensure that we can still resolve its
-	 * non-FQ form ("dcbw") too. (Also, if there are no other search domains specified,
-	 * this makes a good default.) However, if the hostname is the top level of a domain
-	 * (eg, "example.com"), then use the hostname itself as the search (since the user is
-	 * unlikely to want "com" as a search domain).
-	 */
-	if (priv->hostname) {
-		const char *hostdomain = strchr (priv->hostname, '.');
-
-		if (   hostdomain
-		    && !nm_utils_ipaddr_valid (AF_UNSPEC, priv->hostname)) {
-			hostdomain++;
-			if (DOMAIN_IS_VALID (hostdomain))
-				add_string_item (rc.searches, hostdomain);
-			else if (DOMAIN_IS_VALID (priv->hostname))
-				add_string_item (rc.searches, priv->hostname);
-		}
-	}
-
-	/* Per 'man resolv.conf', the search list is limited to 6 domains
-	 * totalling 256 characters.
-	 */
-	num = MIN (rc.searches->len, 6);
-	for (i = 0, len = 0; i < num; i++) {
-		len += strlen (rc.searches->pdata[i]) + 1; /* +1 for spaces */
-		if (len > 256)
-			break;
-	}
-	g_ptr_array_set_size (rc.searches, i);
-	if (rc.searches->len) {
-		g_ptr_array_add (rc.searches, NULL);
-		searches = (char **) g_ptr_array_free (rc.searches, FALSE);
-	} else
-		g_ptr_array_free (rc.searches, TRUE);
-
-	if (rc.options->len) {
-		g_ptr_array_add (rc.options, NULL);
-		options = (char **) g_ptr_array_free (rc.options, FALSE);
-	} else
-		g_ptr_array_free (rc.options, TRUE);
-
-	if (rc.nameservers->len) {
-		g_ptr_array_add (rc.nameservers, NULL);
-		nameservers = (char **) g_ptr_array_free (rc.nameservers, FALSE);
-	} else
-		g_ptr_array_free (rc.nameservers, TRUE);
-
-	if (rc.nis_servers->len) {
-		g_ptr_array_add (rc.nis_servers, NULL);
-		nis_servers = (char **) g_ptr_array_free (rc.nis_servers, FALSE);
-	} else
-		g_ptr_array_free (rc.nis_servers, TRUE);
-
-	nis_domain = rc.nis_domain;
-
-	/* Let any plugins do their thing first */
-	if (priv->plugin) {
-		NMDnsPlugin *plugin = priv->plugin;
-		const char *plugin_name = nm_dns_plugin_get_name (plugin);
-
-		if (nm_dns_plugin_is_caching (plugin)) {
-			if (no_caching) {
-				_LOGD ("update-dns: plugin %s ignored (caching disabled)",
-				       plugin_name);
-				goto skip;
-			}
-			caching = TRUE;
-		}
-
-		_LOGD ("update-dns: updating plugin %s", plugin_name);
-		if (!nm_dns_plugin_update (plugin,
-		                           (const NMDnsIPConfigData **) plugin_confs,
-		                           global_config,
-		                           priv->hostname)) {
-			_LOGW ("update-dns: plugin %s update failed", plugin_name);
-
-			/* If the plugin failed to update, we shouldn't write out a local
-			 * caching DNS configuration to resolv.conf.
-			 */
-			caching = FALSE;
-		}
-
-	skip:
-		;
-	}
-
-	/* If caching was successful, we only send 127.0.0.1 to /etc/resolv.conf
-	 * to ensure that the glibc resolver doesn't try to round-robin nameservers,
-	 * but only uses the local caching nameserver.
-	 */
-	if (caching) {
-		if (nameservers)
-			g_strfreev (nameservers);
-		nameservers = g_new0 (char*, 2);
-		nameservers[0] = g_strdup ("127.0.0.1");
-	}
-
-	if (update) {
-		switch (priv->rc_manager) {
-		case NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK:
-		case NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE:
-			result = update_resolv_conf (self, searches, nameservers, options, error, priv->rc_manager);
-			resolv_conf_updated = TRUE;
-			break;
-		case NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF:
-			result = dispatch_resolvconf (self, searches, nameservers, options, error);
-			break;
-		case NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG:
-			result = dispatch_netconfig (self, searches, nameservers, nis_domain,
-			                             nis_servers, error);
-			break;
-		default:
-			g_assert_not_reached ();
-		}
-
-		if (result == SR_NOTFOUND) {
-			_LOGD ("update-dns: program not available, writing to resolv.conf");
-			g_clear_error (error);
-			result = update_resolv_conf (self, searches, nameservers, options, error, NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK);
-			resolv_conf_updated = TRUE;
-		}
-	}
-
-	/* Unless we've already done it, update private resolv.conf in NMRUNDIR
-	   ignoring any errors */
-	if (!resolv_conf_updated)
-		update_resolv_conf (self, searches, nameservers, options, NULL, NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED);
-
-	/* signal that resolv.conf was changed */
-	if (update && result == SR_SUCCESS)
-		g_signal_emit (self, signals[CONFIG_CHANGED], 0);
-
-	if (searches)
-		g_strfreev (searches);
-	if (options)
-		g_strfreev (options);
-	if (nameservers)
-		g_strfreev (nameservers);
-	if (nis_servers)
-		g_strfreev (nis_servers);
-
-	return !update || result == SR_SUCCESS;
-}
-
-static void
-plugin_failed (NMDnsPlugin *plugin, gpointer user_data)
-{
-	NMDnsManager *self = NM_DNS_MANAGER (user_data);
-	GError *error = NULL;
-
-	/* Errors with non-caching plugins aren't fatal */
-	if (!nm_dns_plugin_is_caching (plugin))
-		return;
-
-	/* Disable caching until the next DNS update */
-	if (!update_dns (self, TRUE, &error)) {
-		_LOGW ("could not commit DNS changes: %s", error->message);
-		g_clear_error (&error);
-	}
-}
-
-static gboolean
-plugin_child_quit_update_dns (gpointer user_data)
-{
-	GError *error = NULL;
-	NMDnsManager *self = NM_DNS_MANAGER (user_data);
-
-	/* Let the plugin try to spawn the child again */
-	if (!update_dns (self, FALSE, &error)) {
-		_LOGW ("could not commit DNS changes: %s", error->message);
-		g_clear_error (&error);
-	}
-
-	return G_SOURCE_REMOVE;
-}
-
-static void
-plugin_child_quit (NMDnsPlugin *plugin, int exit_status, gpointer user_data)
-{
-	NMDnsManager *self = NM_DNS_MANAGER (user_data);
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-	gint64 ts = nm_utils_get_monotonic_timestamp_ms ();
-
-	_LOGW ("plugin %s child quit unexpectedly", nm_dns_plugin_get_name (plugin));
-
-	if (   !priv->plugin_ratelimit.ts
-	    || (ts - priv->plugin_ratelimit.ts) / 1000 > PLUGIN_RATELIMIT_INTERVAL) {
-		priv->plugin_ratelimit.ts = ts;
-		priv->plugin_ratelimit.num_restarts = 0;
-	} else {
-		priv->plugin_ratelimit.num_restarts++;
-		if (priv->plugin_ratelimit.num_restarts > PLUGIN_RATELIMIT_BURST) {
-			_LOGW ("plugin %s child respawning too fast, delaying update for %u seconds",
-			        nm_dns_plugin_get_name (plugin), PLUGIN_RATELIMIT_DELAY);
-			priv->plugin_ratelimit.timer = g_timeout_add_seconds (PLUGIN_RATELIMIT_DELAY,
-			                                                      plugin_child_quit_update_dns,
-			                                                      self);
-			return;
-		}
-	}
-
-	plugin_child_quit_update_dns (self);
-}
-
-static void
-ip_config_dns_priority_changed (gpointer config,
-                                GParamSpec *pspec,
-                                NMDnsManager *self)
-{
-	NM_DNS_MANAGER_GET_PRIVATE (self)->need_sort = TRUE;
-}
-
-static void
-forget_data (NMDnsManager *self, NMDnsIPConfigData *data)
-{
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-
-	if (data == priv->best_conf4)
-		priv->best_conf4 = NULL;
-	else if (data == priv->best_conf6)
-		priv->best_conf6 = NULL;
-
-	g_signal_handlers_disconnect_by_func (data->config, ip_config_dns_priority_changed, self);
-}
-
-static gboolean
-nm_dns_manager_add_ip_config (NMDnsManager *self,
-                              const char *iface,
-                              gpointer config,
-                              NMDnsIPConfigType cfg_type)
-{
-	NMDnsManagerPrivate *priv;
-	GError *error = NULL;
-	NMDnsIPConfigData *data;
-	gboolean v4 = NM_IS_IP4_CONFIG (config);
-	guint i;
-
-	g_return_val_if_fail (NM_IS_DNS_MANAGER (self), FALSE);
-	g_return_val_if_fail (config, FALSE);
-	g_return_val_if_fail (iface && iface[0], FALSE);
-
-	priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-
-	for (i = 0; i < priv->configs->len; i++) {
-		data = priv->configs->pdata[i];
-		if (data->config == config) {
-			if (   nm_streq (data->iface, iface)
-			    && data->type == cfg_type)
-				return FALSE;
-			else {
-				forget_data (self, data);
-				g_ptr_array_remove_index_fast (priv->configs, i);
-				break;
-			}
-		}
-	}
-
-	data = ip_config_data_new (config, cfg_type, iface);
-	g_ptr_array_add (priv->configs, data);
-	g_signal_connect (config,
-	                  v4 ?
-	                    "notify::" NM_IP4_CONFIG_DNS_PRIORITY :
-	                    "notify::" NM_IP6_CONFIG_DNS_PRIORITY,
-	                  (GCallback) ip_config_dns_priority_changed, self);
-	priv->need_sort = TRUE;
-
-	if (cfg_type == NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE) {
-		/* Only one best-device per IP version is allowed */
-		if (v4) {
-			if (priv->best_conf4)
-				priv->best_conf4->type = NM_DNS_IP_CONFIG_TYPE_DEFAULT;
-			priv->best_conf4 = data;
-		} else {
-			if (priv->best_conf6)
-				priv->best_conf6->type = NM_DNS_IP_CONFIG_TYPE_DEFAULT;
-			priv->best_conf6 = data;
-		}
-	}
-
-	if (!priv->updates_queue && !update_dns (self, FALSE, &error)) {
-		_LOGW ("could not commit DNS changes: %s", error->message);
-		g_clear_error (&error);
-	}
-
-	return TRUE;
-}
-
-gboolean
-nm_dns_manager_add_ip4_config (NMDnsManager *self,
-                               const char *iface,
-                               NMIP4Config *config,
-                               NMDnsIPConfigType cfg_type)
-{
-	return nm_dns_manager_add_ip_config (self, iface, config, cfg_type);
-}
-
-gboolean
-nm_dns_manager_add_ip6_config (NMDnsManager *self,
-                               const char *iface,
-                               NMIP6Config *config,
-                               NMDnsIPConfigType cfg_type)
-{
-	return nm_dns_manager_add_ip_config (self, iface, config, cfg_type);
-}
-
-static gboolean
-nm_dns_manager_remove_ip_config (NMDnsManager *self, gpointer config)
-{
-	NMDnsManagerPrivate *priv;
-	GError *error = NULL;
-	NMDnsIPConfigData *data;
-	guint i;
-
-	g_return_val_if_fail (NM_IS_DNS_MANAGER (self), FALSE);
-	g_return_val_if_fail (config, FALSE);
-
-	priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-
-	for (i = 0; i < priv->configs->len; i++) {
-		data = priv->configs->pdata[i];
-
-		if (data->config == config) {
-			forget_data (self, data);
-			g_ptr_array_remove_index (priv->configs, i);
-
-			if (!priv->updates_queue && !update_dns (self, FALSE, &error)) {
-				_LOGW ("could not commit DNS changes: %s", error->message);
-				g_clear_error (&error);
-			}
-
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-gboolean
-nm_dns_manager_remove_ip4_config (NMDnsManager *self, NMIP4Config *config)
-{
-	return nm_dns_manager_remove_ip_config (self, config);
-}
-
-gboolean
-nm_dns_manager_remove_ip6_config (NMDnsManager *self, NMIP6Config *config)
-{
-	return nm_dns_manager_remove_ip_config (self, config);
-}
-
-void
-nm_dns_manager_set_initial_hostname (NMDnsManager *self,
-                                     const char *hostname)
-{
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-
-	priv->hostname = g_strdup (hostname);
-}
-
-void
-nm_dns_manager_set_hostname (NMDnsManager *self,
-                             const char *hostname)
-{
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-	GError *error = NULL;
-	const char *filtered = NULL;
-
-	/* Certain hostnames we don't want to include in resolv.conf 'searches' */
-	if (   hostname
-	    && nm_utils_is_specific_hostname (hostname)
-	    && !strstr (hostname, ".in-addr.arpa")
-	    && strchr (hostname, '.')) {
-		filtered = hostname;
-	}
-
-	if (   (!priv->hostname && !filtered)
-	    || (priv->hostname && filtered && !strcmp (priv->hostname, filtered)))
-		return;
-
-	g_free (priv->hostname);
-	priv->hostname = g_strdup (filtered);
-
-	if (!priv->updates_queue && !update_dns (self, FALSE, &error)) {
-		_LOGW ("could not commit DNS changes: %s", error->message);
-		g_clear_error (&error);
-	}
-}
-
-gboolean
-nm_dns_manager_get_resolv_conf_explicit (NMDnsManager *self)
-{
-	NMDnsManagerPrivate *priv;
-
-	g_return_val_if_fail (NM_IS_DNS_MANAGER (self), FALSE);
-
-	priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-
-	if (   NM_IN_SET (priv->rc_manager, NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED,
-	                                    NM_DNS_MANAGER_RESOLV_CONF_MAN_IMMUTABLE)
-	    || priv->plugin)
-		return FALSE;
-
-	return TRUE;
-}
-
-void
-nm_dns_manager_begin_updates (NMDnsManager *self, const char *func)
-{
-	NMDnsManagerPrivate *priv;
-
-	g_return_if_fail (self != NULL);
-	priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-
-	/* Save current hash when starting a new batch */
-	if (priv->updates_queue == 0)
-		memcpy (priv->prev_hash, priv->hash, sizeof (priv->hash));
-
-	priv->updates_queue++;
-
-	_LOGD ("(%s): queueing DNS updates (%d)", func, priv->updates_queue);
-}
-
-void
-nm_dns_manager_end_updates (NMDnsManager *self, const char *func)
-{
-	NMDnsManagerPrivate *priv;
-	GError *error = NULL;
-	gboolean changed;
-	guint8 new[HASH_LEN];
-
-	g_return_if_fail (self != NULL);
-
-	priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-	g_return_if_fail (priv->updates_queue > 0);
-
-	if (priv->need_sort) {
-		g_ptr_array_sort (priv->configs, ip_config_data_ptr_compare);
-		priv->need_sort = FALSE;
-	}
-
-	compute_hash (self, nm_config_data_get_global_dns_config (nm_config_get_data (priv->config)), new);
-	changed = (memcmp (new, priv->prev_hash, sizeof (new)) != 0) ? TRUE : FALSE;
-	_LOGD ("(%s): DNS configuration %s", func, changed ? "changed" : "did not change");
-
-	priv->updates_queue--;
-	if ((priv->updates_queue > 0) || (changed == FALSE)) {
-		_LOGD ("(%s): no DNS changes to commit (%d)", func, priv->updates_queue);
-		return;
-	}
-
-	/* Commit all the outstanding changes */
-	_LOGD ("(%s): committing DNS changes (%d)", func, priv->updates_queue);
-	if (!update_dns (self, FALSE, &error)) {
-		_LOGW ("could not commit DNS changes: %s", error->message);
-		g_clear_error (&error);
-	}
-
-	memset (priv->prev_hash, 0, sizeof (priv->prev_hash));
-}
-
-/******************************************************************/
-
-static gboolean
-_clear_plugin (NMDnsManager *self)
-{
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-
-	if (priv->plugin) {
-		g_signal_handlers_disconnect_by_func (priv->plugin, plugin_failed, self);
-		g_signal_handlers_disconnect_by_func (priv->plugin, plugin_child_quit, self);
-		nm_dns_plugin_stop (priv->plugin);
-		g_clear_object (&priv->plugin);
-		return TRUE;
-	}
-	priv->plugin_ratelimit.ts = 0;
-	nm_clear_g_source (&priv->plugin_ratelimit.timer);
-	return FALSE;
-}
-
-static NMDnsManagerResolvConfManager
-_check_resconf_immutable (NMDnsManagerResolvConfManager rc_manager)
-{
-	struct stat st;
-	int fd, flags;
-	bool immutable = FALSE;
-
-	switch (rc_manager) {
-	case NM_DNS_MANAGER_RESOLV_CONF_MAN_UNKNOWN:
-	case NM_DNS_MANAGER_RESOLV_CONF_MAN_IMMUTABLE:
-		nm_assert_not_reached ();
-		/* fall-through */
-	case NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED:
-		return NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED;
-	default:
-
-		if (lstat (_PATH_RESCONF, &st) != 0)
-			return rc_manager;
-
-		if (S_ISLNK (st.st_mode)) {
-			/* only regular files and directories can have extended file attributes. */
-			switch (rc_manager) {
-			case NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK:
-				/* we don't care whether the link-target is immutable.
-				 * If the symlink points to another file, rc-manager=symlink anyway backs off.
-				 * Otherwise, we would only check whether our internal resolv.conf is immutable. */
-				return NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK;
-			case NM_DNS_MANAGER_RESOLV_CONF_MAN_UNKNOWN:
-			case NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED:
-			case NM_DNS_MANAGER_RESOLV_CONF_MAN_IMMUTABLE:
-				nm_assert_not_reached ();
-				/* fall-through */
-			case NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE:
-			case NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF:
-			case NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG:
-				break;
-			}
-		}
-
-		fd = open (_PATH_RESCONF, O_RDONLY | O_CLOEXEC);
-		if (fd != -1) {
-			if (ioctl (fd, FS_IOC_GETFLAGS, &flags) != -1)
-				immutable = NM_FLAGS_HAS (flags, FS_IMMUTABLE_FL);
-			close (fd);
-		}
-		return immutable ? NM_DNS_MANAGER_RESOLV_CONF_MAN_IMMUTABLE : rc_manager;
-	}
-}
-
-NM_DEFINE_SINGLETON_GETTER (NMDnsManager, nm_dns_manager_get, NM_TYPE_DNS_MANAGER);
-
-static void
-init_resolv_conf_mode (NMDnsManager *self, gboolean force_reload_plugin)
-{
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-	NMDnsManagerResolvConfManager rc_manager;
-	const char *mode;
-	gboolean plugin_changed = FALSE;
-
-	mode = nm_config_data_get_dns_mode (nm_config_get_data (priv->config));
-
-	if (nm_streq0 (mode, "none"))
-		rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED;
-	else {
-		const char *man;
-
-		rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_UNKNOWN;
-		man = nm_config_data_get_rc_manager (nm_config_get_data (priv->config));
-
-again:
-		if (!man) {
-			/* nop */
-		} else if (NM_IN_STRSET (man, "symlink", "none"))
-			rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK;
-		else if (nm_streq (man, "file"))
-			rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE;
-		else if (nm_streq (man, "resolvconf"))
-			rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF;
-		else if (nm_streq (man, "netconfig"))
-			rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG;
-		else if (nm_streq (man, "unmanaged"))
-			rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED;
-
-		if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_UNKNOWN) {
-			if (man) {
-				_LOGW ("init: unknown resolv.conf manager \"%s\", fallback to \"%s\"",
-				       man, ""NM_CONFIG_DEFAULT_DNS_RC_MANAGER);
-			}
-			man = ""NM_CONFIG_DEFAULT_DNS_RC_MANAGER;
-			rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK;
-			goto again;
-		}
-	}
-
-	rc_manager = _check_resconf_immutable (rc_manager);
-
-	if (nm_streq0 (mode, "dnsmasq")) {
-		if (force_reload_plugin || !NM_IS_DNS_DNSMASQ (priv->plugin)) {
-			_clear_plugin (self);
-			priv->plugin = nm_dns_dnsmasq_new ();
-			plugin_changed = TRUE;
-		}
-	} else if (nm_streq0 (mode, "unbound")) {
-		if (force_reload_plugin || !NM_IS_DNS_UNBOUND (priv->plugin)) {
-			_clear_plugin (self);
-			priv->plugin = nm_dns_unbound_new ();
-			plugin_changed = TRUE;
-		}
-	} else {
-		if (!NM_IN_STRSET (mode, "none", "default")) {
-			if (mode)
-				_LOGW ("init: unknown dns mode '%s'", mode);
-			mode = "default";
-		}
-		if (_clear_plugin (self))
-			plugin_changed = TRUE;
-	}
-
-	if (plugin_changed && priv->plugin) {
-		g_signal_connect (priv->plugin, NM_DNS_PLUGIN_FAILED, G_CALLBACK (plugin_failed), self);
-		g_signal_connect (priv->plugin, NM_DNS_PLUGIN_CHILD_QUIT, G_CALLBACK (plugin_child_quit), self);
-	}
-
-	if (   plugin_changed
-	    || priv->rc_manager != rc_manager) {
-		priv->rc_manager = rc_manager;
-		_LOGI ("init: dns=%s, rc-manager=%s%s%s%s",
-		       mode, _rc_manager_to_string (rc_manager),
-		       NM_PRINT_FMT_QUOTED (priv->plugin, ", plugin=", nm_dns_plugin_get_name (priv->plugin), "", ""));
-	}
-}
-
-static void
-config_changed_cb (NMConfig *config,
-                   NMConfigData *config_data,
-                   NMConfigChangeFlags changes,
-                   NMConfigData *old_data,
-                   NMDnsManager *self)
-{
-	GError *error = NULL;
-
-	if (NM_FLAGS_ANY (changes, NM_CONFIG_CHANGE_DNS_MODE |
-	                           NM_CONFIG_CHANGE_RC_MANAGER |
-	                           NM_CONFIG_CHANGE_CAUSE_SIGHUP |
-	                           NM_CONFIG_CHANGE_CAUSE_DNS_FULL)) {
-		/* reload the resolv-conf mode also on SIGHUP (when DNS_MODE didn't change).
-		 * The reason is, that the configuration also depends on whether resolv.conf
-		 * is immutable, thus, without the configuration changing, we always want to
-		 * re-configure the mode. */
-		init_resolv_conf_mode (self,
-		                       NM_FLAGS_ANY (changes,   NM_CONFIG_CHANGE_CAUSE_SIGHUP
-		                                              | NM_CONFIG_CHANGE_CAUSE_DNS_FULL));
-	}
-
-	if (NM_FLAGS_ANY (changes, NM_CONFIG_CHANGE_CAUSE_SIGHUP |
-	                           NM_CONFIG_CHANGE_CAUSE_SIGUSR1 |
-	                           NM_CONFIG_CHANGE_CAUSE_DNS_RC |
-	                           NM_CONFIG_CHANGE_CAUSE_DNS_FULL |
-	                           NM_CONFIG_CHANGE_DNS_MODE |
-	                           NM_CONFIG_CHANGE_RC_MANAGER |
-	                           NM_CONFIG_CHANGE_GLOBAL_DNS_CONFIG)) {
-		if (!update_dns (self, FALSE, &error)) {
-			_LOGW ("could not commit DNS changes: %s", error->message);
-			g_clear_error (&error);
-		}
-	}
-}
-
-static void
-nm_dns_manager_init (NMDnsManager *self)
-{
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-
-	_LOGT ("creating...");
-
-	priv->config = g_object_ref (nm_config_get ());
-	priv->configs = g_ptr_array_new_full (8, ip_config_data_destroy);
-
-	/* Set the initial hash */
-	compute_hash (self, NULL, NM_DNS_MANAGER_GET_PRIVATE (self)->hash);
-
-	g_signal_connect (G_OBJECT (priv->config),
-	                  NM_CONFIG_SIGNAL_CONFIG_CHANGED,
-	                  G_CALLBACK (config_changed_cb),
-	                  self);
-	init_resolv_conf_mode (self, TRUE);
-}
-
-static void
-dispose (GObject *object)
-{
-	NMDnsManager *self = NM_DNS_MANAGER (object);
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-	NMDnsIPConfigData *data;
-	GError *error = NULL;
-	guint i;
-
-	_LOGT ("disposing");
-
-	_clear_plugin (self);
-
-	/* If we're quitting, leave a valid resolv.conf in place, not one
-	 * pointing to 127.0.0.1 if any plugins were active.  Thus update
-	 * DNS after disposing of all plugins.  But if we haven't done any
-	 * DNS updates yet, there's no reason to touch resolv.conf on shutdown.
-	 */
-	if (priv->dns_touched && !update_dns (self, TRUE, &error)) {
-		_LOGW ("could not commit DNS changes on shutdown: %s", error->message);
-		g_clear_error (&error);
-		priv->dns_touched = FALSE;
-	}
-
-	if (priv->config) {
-		g_signal_handlers_disconnect_by_func (priv->config, config_changed_cb, self);
-		g_clear_object (&priv->config);
-	}
-
-	if (priv->configs) {
-		for (i = 0; i < priv->configs->len; i++) {
-			data = priv->configs->pdata[i];
-			forget_data (self, data);
-		}
-		g_ptr_array_free (priv->configs, TRUE);
-		priv->configs = NULL;
-	}
-
-	nm_clear_g_source (&priv->plugin_ratelimit.timer);
-
-	G_OBJECT_CLASS (nm_dns_manager_parent_class)->dispose (object);
-}
-
-static void
-finalize (GObject *object)
-{
-	NMDnsManager *self = NM_DNS_MANAGER (object);
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-
-	g_free (priv->hostname);
-
-	G_OBJECT_CLASS (nm_dns_manager_parent_class)->finalize (object);
-}
-
-static void
-nm_dns_manager_class_init (NMDnsManagerClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	/* virtual methods */
-	object_class->dispose = dispose;
-	object_class->finalize = finalize;
-
-	/* signals */
-	signals[CONFIG_CHANGED] =
-	    g_signal_new (NM_DNS_MANAGER_CONFIG_CHANGED,
-	                  G_OBJECT_CLASS_TYPE (object_class),
-	                  G_SIGNAL_RUN_FIRST,
-	                  0, NULL, NULL,
-	                  g_cclosure_marshal_VOID__VOID,
-	                  G_TYPE_NONE, 0);
-}
-
diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns-manager/nm-dns-manager.h
deleted file mode 100644
index 3deda582..00000000
--- a/src/dns-manager/nm-dns-manager.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager -- Network link manager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2004 - 2005 Colin Walters <walters@redhat.com>
- * Copyright (C) 2004 - 2013 Red Hat, Inc.
- * Copyright (C) 2005 - 2008 Novell, Inc.
- *   and others
- */
-
-#ifndef __NETWORKMANAGER_DNS_MANAGER_H__
-#define __NETWORKMANAGER_DNS_MANAGER_H__
-
-#include "nm-ip4-config.h"
-#include "nm-ip6-config.h"
-
-typedef enum {
-	NM_DNS_IP_CONFIG_TYPE_DEFAULT = 0,
-	NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE,
-	NM_DNS_IP_CONFIG_TYPE_VPN
-} NMDnsIPConfigType;
-
-enum {
-	NM_DNS_PRIORITY_DEFAULT_NORMAL  = 100,
-	NM_DNS_PRIORITY_DEFAULT_VPN     = 50,
-};
-
-typedef struct {
-	gpointer config;
-	NMDnsIPConfigType type;
-	char *iface;
-} NMDnsIPConfigData;
-
-#define NM_TYPE_DNS_MANAGER (nm_dns_manager_get_type ())
-#define NM_DNS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_DNS_MANAGER, NMDnsManager))
-#define NM_DNS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NM_TYPE_DNS_MANAGER, NMDnsManagerClass))
-#define NM_IS_DNS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_DNS_MANAGER))
-#define NM_IS_DNS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_DNS_MANAGER))
-#define NM_DNS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_DNS_MANAGER, NMDnsManagerClass))
-
-#define NM_DNS_MANAGER_CONFIG_CHANGED "config-changed"
-
-typedef struct _NMDnsManager NMDnsManager;
-typedef struct _NMDnsManagerClass NMDnsManagerClass;
-
-GType nm_dns_manager_get_type (void);
-
-NMDnsManager * nm_dns_manager_get (void);
-
-/* Allow changes to be batched together */
-void nm_dns_manager_begin_updates (NMDnsManager *self, const char *func);
-void nm_dns_manager_end_updates (NMDnsManager *self, const char *func);
-
-gboolean nm_dns_manager_add_ip4_config (NMDnsManager *self,
-                                        const char *iface,
-                                        NMIP4Config *config,
-                                        NMDnsIPConfigType cfg_type);
-
-gboolean nm_dns_manager_remove_ip4_config (NMDnsManager *self, NMIP4Config *config);
-
-gboolean nm_dns_manager_add_ip6_config (NMDnsManager *self,
-                                        const char *iface,
-                                        NMIP6Config *config,
-                                        NMDnsIPConfigType cfg_type);
-
-gboolean nm_dns_manager_remove_ip6_config (NMDnsManager *self, NMIP6Config *config);
-
-void nm_dns_manager_set_initial_hostname (NMDnsManager *self,
-                                          const char *hostname);
-void nm_dns_manager_set_hostname         (NMDnsManager *self,
-                                          const char *hostname);
-
-/**
- * NMDnsManagerResolvConfManager
- * @NM_DNS_MANAGER_RESOLV_CONF_MAN_UNKNOWN: unspecified rc-manager.
- * @NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED: do not touch /etc/resolv.conf
- *   (but still write the internal copy -- unless it is symlinked by
- *   /etc/resolv.conf)
- * @NM_DNS_MANAGER_RESOLV_CONF_MAN_IMMUTABLE: similar to "unmanaged",
- *   but indicates that resolv.conf cannot be modified.
- * @NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK: NM writes resolv.conf
- *   by symlinking it to the run state directory.
- * @NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE: Like SYMLINK, but instead of
- *   symlinking /etc/resolv.conf, write it as a file.
- * @NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF: NM is managing resolv.conf
-     through resolvconf
- * @NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG: NM is managing resolv.conf
-     through netconfig
- *
- * NMDnsManager's management of resolv.conf
- */
-typedef enum {
-	NM_DNS_MANAGER_RESOLV_CONF_MAN_UNKNOWN,
-	NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED,
-	NM_DNS_MANAGER_RESOLV_CONF_MAN_IMMUTABLE,
-	NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK,
-	NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE,
-	NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF,
-	NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG,
-} NMDnsManagerResolvConfManager;
-
-gboolean nm_dns_manager_get_resolv_conf_explicit (NMDnsManager *self);
-
-#endif /* __NETWORKMANAGER_DNS_MANAGER_H__ */
diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c
deleted file mode 100644
index f065a1ce..00000000
--- a/src/dns-manager/nm-dns-plugin.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2010 - 2012 Red Hat, Inc.
- *
- */
-
-#include "nm-default.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "nm-core-internal.h"
-
-#include "nm-dns-plugin.h"
-#include "NetworkManagerUtils.h"
-
-typedef struct {
-	GPid pid;
-	guint watch_id;
-	char *progname;
-	char *pidfile;
-} NMDnsPluginPrivate;
-
-#define NM_DNS_PLUGIN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DNS_PLUGIN, NMDnsPluginPrivate))
-
-G_DEFINE_TYPE_EXTENDED (NMDnsPlugin, nm_dns_plugin, G_TYPE_OBJECT, G_TYPE_FLAG_ABSTRACT, {})
-
-enum {
-	FAILED,
-	CHILD_QUIT,
-	LAST_SIGNAL
-};
-static guint signals[LAST_SIGNAL] = { 0 };
-
-/******************************************************************************/
-
-#define _NMLOG_PREFIX_NAME                "dns-plugin"
-#define _NMLOG_DOMAIN                     LOGD_DNS
-#define _NMLOG(level, ...) \
-    G_STMT_START { \
-        const NMLogLevel __level = (level); \
-        \
-        if (nm_logging_enabled (__level, _NMLOG_DOMAIN)) { \
-            char __prefix[20]; \
-            const NMDnsPlugin *const __self = (self); \
-            \
-            _nm_log (__level, _NMLOG_DOMAIN, 0, \
-                     "%s%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \
-                     _NMLOG_PREFIX_NAME, \
-                     (!__self \
-                        ? "" \
-                        : nm_sprintf_buf (__prefix, "[%p]", __self)) \
-                     _NM_UTILS_MACRO_REST (__VA_ARGS__)); \
-        } \
-    } G_STMT_END
-
-/******************************************************************************/
-
-gboolean
-nm_dns_plugin_update (NMDnsPlugin *self,
-                      const NMDnsIPConfigData **configs,
-                      const NMGlobalDnsConfig *global_config,
-                      const char *hostname)
-{
-	g_return_val_if_fail (NM_DNS_PLUGIN_GET_CLASS (self)->update != NULL, FALSE);
-
-	return NM_DNS_PLUGIN_GET_CLASS (self)->update (self,
-	                                               configs,
-	                                               global_config,
-	                                               hostname);
-}
-
-static gboolean
-is_caching (NMDnsPlugin *self)
-{
-	return FALSE;
-}
-
-gboolean
-nm_dns_plugin_is_caching (NMDnsPlugin *self)
-{
-	return NM_DNS_PLUGIN_GET_CLASS (self)->is_caching (self);
-}
-
-const char *
-nm_dns_plugin_get_name (NMDnsPlugin *self)
-{
-	g_assert (NM_DNS_PLUGIN_GET_CLASS (self)->get_name);
-	return NM_DNS_PLUGIN_GET_CLASS (self)->get_name (self);
-}
-
-/********************************************/
-
-static void
-_clear_pidfile (NMDnsPlugin *self)
-{
-	NMDnsPluginPrivate *priv = NM_DNS_PLUGIN_GET_PRIVATE (self);
-
-	if (priv->pidfile) {
-		unlink (priv->pidfile);
-		g_clear_pointer (&priv->pidfile, g_free);
-	}
-}
-
-static void
-kill_existing (const char *progname, const char *pidfile, const char *kill_match)
-{
-	glong pid;
-	gs_free char *contents = NULL;
-	gs_free char *cmdline_contents = NULL;
-	guint64 start_time;
-	char proc_path[256];
-	gs_free_error GError *error = NULL;
-
-	if (!pidfile)
-		return;
-
-	if (!kill_match)
-		g_return_if_reached ();
-
-	if (!g_file_get_contents (pidfile, &contents, NULL, &error)) {
-		if (g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
-			return;
-		goto out;
-	}
-
-	pid = _nm_utils_ascii_str_to_int64 (contents, 10, 2, INT_MAX, -1);
-	if (pid == -1)
-		goto out;
-
-	start_time = nm_utils_get_start_time_for_pid (pid, NULL, NULL);
-	if (start_time == 0)
-		goto out;
-
-	nm_sprintf_buf (proc_path, "/proc/%ld/cmdline", pid);
-	if (!g_file_get_contents (proc_path, &cmdline_contents, NULL, NULL))
-		goto out;
-
-	if (!strstr (cmdline_contents, kill_match))
-		goto out;
-
-	nm_utils_kill_process_sync (pid, start_time, SIGKILL, _NMLOG_DOMAIN,
-	                            progname ?: "<dns-process>",
-	                            0, 0, 1000);
-
-out:
-	unlink (pidfile);
-}
-
-static void
-watch_cb (GPid pid, gint status, gpointer user_data)
-{
-	NMDnsPlugin *self = NM_DNS_PLUGIN (user_data);
-	NMDnsPluginPrivate *priv = NM_DNS_PLUGIN_GET_PRIVATE (self);
-
-	priv->pid = 0;
-	priv->watch_id = 0;
-	g_clear_pointer (&priv->progname, g_free);
-	_clear_pidfile (self);
-
-	g_signal_emit (self, signals[CHILD_QUIT], 0, status);
-}
-
-GPid
-nm_dns_plugin_child_pid (NMDnsPlugin *self)
-{
-	NMDnsPluginPrivate *priv;
-
-	g_return_val_if_fail (NM_IS_DNS_PLUGIN (self), 0);
-
-	priv = NM_DNS_PLUGIN_GET_PRIVATE (self);
-	return priv->pid;
-}
-
-GPid
-nm_dns_plugin_child_spawn (NMDnsPlugin *self,
-                           const char **argv,
-                           const char *pidfile,
-                           const char *kill_match)
-{
-	NMDnsPluginPrivate *priv;
-	GError *error = NULL;
-	GPid pid;
-	gs_free char *cmdline = NULL;
-	gs_free char *progname = NULL;
-
-	g_return_val_if_fail (argv && argv[0], 0);
-	g_return_val_if_fail (NM_IS_DNS_PLUGIN (self), 0);
-
-	priv = NM_DNS_PLUGIN_GET_PRIVATE (self);
-
-	g_return_val_if_fail (!priv->pid, 0);
-	nm_assert (!priv->progname);
-	nm_assert (!priv->watch_id);
-	nm_assert (!priv->pidfile);
-
-	progname = g_path_get_basename (argv[0]);
-	kill_existing (progname, pidfile, kill_match);
-
-	_LOGI ("starting %s...", progname);
-	_LOGD ("command line: %s",
-	       (cmdline = g_strjoinv (" ", (char **) argv)));
-
-	if (!g_spawn_async (NULL, (char **) argv, NULL,
-	                   G_SPAWN_DO_NOT_REAP_CHILD,
-	                   nm_utils_setpgid, NULL,
-	                   &pid,
-	                   &error)) {
-		_LOGW ("failed to spawn %s: %s",
-		       progname, error->message);
-		g_clear_error (&error);
-		return 0;
-	}
-
-	_LOGD ("%s started with pid %d", progname, pid);
-	priv->watch_id = g_child_watch_add (pid, (GChildWatchFunc) watch_cb, self);
-	priv->pid = pid;
-	priv->progname = g_steal_pointer (&progname);
-	priv->pidfile = g_strdup (pidfile);
-
-	return pid;
-}
-
-gboolean
-nm_dns_plugin_child_kill (NMDnsPlugin *self)
-{
-	NMDnsPluginPrivate *priv = NM_DNS_PLUGIN_GET_PRIVATE (self);
-
-	nm_clear_g_source (&priv->watch_id);
-	if (priv->pid) {
-		nm_utils_kill_child_sync (priv->pid, SIGTERM, _NMLOG_DOMAIN,
-		                          priv->progname ?: "<dns-process>", NULL, 1000, 0);
-		priv->pid = 0;
-		g_clear_pointer (&priv->progname, g_free);
-	}
-	_clear_pidfile (self);
-
-	return TRUE;
-}
-
-void
-nm_dns_plugin_stop (NMDnsPlugin *self)
-{
-	nm_dns_plugin_child_kill (self);
-}
-
-/********************************************/
-
-static void
-nm_dns_plugin_init (NMDnsPlugin *self)
-{
-}
-
-static void
-dispose (GObject *object)
-{
-	NMDnsPlugin *self = NM_DNS_PLUGIN (object);
-
-	nm_dns_plugin_stop (self);
-
-	G_OBJECT_CLASS (nm_dns_plugin_parent_class)->dispose (object);
-}
-
-static void
-nm_dns_plugin_class_init (NMDnsPluginClass *plugin_class)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (plugin_class);
-
-	g_type_class_add_private (plugin_class, sizeof (NMDnsPluginPrivate));
-
-	/* virtual methods */
-	object_class->dispose = dispose;
-	plugin_class->is_caching = is_caching;
-
-	/* signals */
-	signals[FAILED] =
-	    g_signal_new (NM_DNS_PLUGIN_FAILED,
-	                  G_OBJECT_CLASS_TYPE (object_class),
-	                  G_SIGNAL_RUN_FIRST,
-	                  G_STRUCT_OFFSET (NMDnsPluginClass, failed),
-	                  NULL, NULL,
-	                  g_cclosure_marshal_VOID__VOID,
-	                  G_TYPE_NONE, 0);
-
-	signals[CHILD_QUIT] =
-	    g_signal_new (NM_DNS_PLUGIN_CHILD_QUIT,
-	                  G_OBJECT_CLASS_TYPE (object_class),
-	                  G_SIGNAL_RUN_FIRST,
-	                  G_STRUCT_OFFSET (NMDnsPluginClass, child_quit),
-	                  NULL, NULL,
-	                  g_cclosure_marshal_VOID__INT,
-	                  G_TYPE_NONE, 1, G_TYPE_INT);
-}
-
diff --git a/src/dns-manager/nm-dns-plugin.h b/src/dns-manager/nm-dns-plugin.h
deleted file mode 100644
index e24bc173..00000000
--- a/src/dns-manager/nm-dns-plugin.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2010 Red Hat, Inc.
- */
-
-#ifndef __NETWORKMANAGER_DNS_PLUGIN_H__
-#define __NETWORKMANAGER_DNS_PLUGIN_H__
-
-#include "nm-dns-manager.h"
-#include "nm-config-data.h"
-
-#define NM_TYPE_DNS_PLUGIN            (nm_dns_plugin_get_type ())
-#define NM_DNS_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNS_PLUGIN, NMDnsPlugin))
-#define NM_DNS_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DNS_PLUGIN, NMDnsPluginClass))
-#define NM_IS_DNS_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DNS_PLUGIN))
-#define NM_IS_DNS_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DNS_PLUGIN))
-#define NM_DNS_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNS_PLUGIN, NMDnsPluginClass))
-
-#define NM_DNS_PLUGIN_FAILED "failed"
-#define NM_DNS_PLUGIN_CHILD_QUIT "child-quit"
-
-typedef struct {
-	GObject parent;
-} NMDnsPlugin;
-
-typedef struct {
-	GObjectClass parent;
-
-	/* Methods */
-
-	/* Called when DNS information is changed.  'configs' is an array
-	 * of pointers to NMDnsIPConfigData sorted by priority.
-	 * 'global_config' is the optional global DNS
-	 * configuration.
-	 */
-	gboolean (*update) (NMDnsPlugin *self,
-	                    const NMDnsIPConfigData **configs,
-	                    const NMGlobalDnsConfig *global_config,
-	                    const char *hostname);
-
-	/* Subclasses should override and return TRUE if they start a local
-	 * caching nameserver that listens on localhost and would block any
-	 * other local caching nameserver from operating.
-	 */
-	gboolean (*is_caching) (NMDnsPlugin *self);
-
-	/* Subclasses should override this and return their plugin name */
-	const char *(*get_name) (NMDnsPlugin *self);
-
-	/* Signals */
-
-	/* Emitted by the plugin and consumed by NMDnsManager when
-	 * some error happens with the nameserver subprocess.  Causes NM to fall
-	 * back to writing out a non-local-caching resolv.conf until the next
-	 * DNS update.
-	 */
-	void (*failed) (NMDnsPlugin *self);
-
-	/* Emitted by the plugin base class when the nameserver subprocess
-	 * quits.  This signal is consumed by the plugin subclasses and not
-	 * by NMDnsManager.  If the subclass decides the exit status (as returned
-	 * by waitpid(2)) is fatal it should then emit the 'failed' signal.
-	 */
-	void (*child_quit) (NMDnsPlugin *self, gint status);
-} NMDnsPluginClass;
-
-GType nm_dns_plugin_get_type (void);
-
-gboolean nm_dns_plugin_is_caching (NMDnsPlugin *self);
-
-const char *nm_dns_plugin_get_name (NMDnsPlugin *self);
-
-gboolean nm_dns_plugin_update (NMDnsPlugin *self,
-                               const NMDnsIPConfigData **configs,
-                               const NMGlobalDnsConfig *global_config,
-                               const char *hostname);
-
-void nm_dns_plugin_stop (NMDnsPlugin *self);
-
-/* For subclasses/plugins */
-
-/* Spawn a child process and watch for it to quit.  'argv' is the NULL-terminated
- * argument vector to spawn the child with, where argv[0] is the full path to
- * the child's executable.  If 'pidfile' is given the process owning the PID
- * contained in 'pidfile' will be killed if its command line matches 'kill_match'
- * and the pidfile will be deleted.
- */
-GPid nm_dns_plugin_child_spawn (NMDnsPlugin *self,
-                                const char **argv,
-                                const char *pidfile,
-                                const char *kill_match);
-
-GPid nm_dns_plugin_child_pid (NMDnsPlugin *self);
-
-gboolean nm_dns_plugin_child_kill (NMDnsPlugin *self);
-
-#endif /* __NETWORKMANAGER_DNS_PLUGIN_H__ */
-
diff --git a/src/dns-manager/nm-dns-unbound.c b/src/dns-manager/nm-dns-unbound.c
deleted file mode 100644
index 66a287fd..00000000
--- a/src/dns-manager/nm-dns-unbound.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2014 Red Hat, Inc.
- * Author: Pavel Šimerda <psimerda@redhat.com>
- */
-#include "nm-default.h"
-
-#include "nm-dns-unbound.h"
-#include "NetworkManagerUtils.h"
-
-G_DEFINE_TYPE (NMDnsUnbound, nm_dns_unbound, NM_TYPE_DNS_PLUGIN)
-
-/*******************************************/
-
-static gboolean
-update (NMDnsPlugin *plugin,
-        const NMDnsIPConfigData **configs,
-        const NMGlobalDnsConfig *global_config,
-        const char *hostname)
-{
-	/* TODO: We currently call a script installed with the dnssec-trigger
-	 * package that queries all information itself. Later, the dependency
-	 * on that package will be optional and the only hard dependency will
-	 * be unbound.
-	 *
-	 * Unbound configuration should be later handled by this plugin directly,
-	 * without calling custom scripts. The dnssec-trigger functionality
-	 * may be eventually merged into NetworkManager.
-	 */
-	return nm_spawn_process (DNSSEC_TRIGGER_SCRIPT " --async --update", NULL) == 0;
-}
-
-static gboolean
-is_caching (NMDnsPlugin *plugin)
-{
-	return TRUE;
-}
-
-static const char *
-get_name (NMDnsPlugin *plugin)
-{
-	return "unbound";
-}
-
-/****************************************************************/
-
-NMDnsPlugin *
-nm_dns_unbound_new (void)
-{
-	return g_object_new (NM_TYPE_DNS_UNBOUND, NULL);
-}
-
-static void
-nm_dns_unbound_init (NMDnsUnbound *unbound)
-{
-}
-
-static void
-nm_dns_unbound_class_init (NMDnsUnboundClass *klass)
-{
-	NMDnsPluginClass *plugin_class = NM_DNS_PLUGIN_CLASS (klass);
-
-	plugin_class->update = update;
-	plugin_class->is_caching = is_caching;
-	plugin_class->get_name = get_name;
-}
diff --git a/src/dns-manager/nm-dns-unbound.h b/src/dns-manager/nm-dns-unbound.h
deleted file mode 100644
index abc056b9..00000000
--- a/src/dns-manager/nm-dns-unbound.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2014 Red Hat, Inc.
- */
-#ifndef __NETWORKMANAGER_DNS_UNBOUND_H__
-#define __NETWORKMANAGER_DNS_UNBOUND_H__
-
-#include "nm-dns-plugin.h"
-
-#define NM_TYPE_DNS_UNBOUND            (nm_dns_unbound_get_type ())
-#define NM_DNS_UNBOUND(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNS_UNBOUND, NMDnsUnbound))
-#define NM_DNS_UNBOUND_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DNS_UNBOUND, NMDnsUnboundClass))
-#define NM_IS_DNS_UNBOUND(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DNS_UNBOUND))
-#define NM_IS_DNS_UNBOUND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DNS_UNBOUND))
-#define NM_DNS_UNBOUND_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNS_UNBOUND, NMDnsUnboundClass))
-
-typedef struct {
-	NMDnsPlugin parent;
-} NMDnsUnbound;
-
-typedef struct {
-	NMDnsPluginClass parent;
-} NMDnsUnboundClass;
-
-GType nm_dns_unbound_get_type (void);
-
-NMDnsPlugin *nm_dns_unbound_new (void);
-
-#endif /* __NETWORKMANAGER_DNS_UNBOUND_H__ */