New upstream version 1.27.90 upstream/1.27.90

1 files changed, 2060 insertions, 2017 deletions

diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
index 666bad60..87187d69 100644
--- a/src/dns/nm-dns-manager.c
+++ b/src/dns/nm-dns-manager.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2004 - 2005 Colin Walters <walters@redhat.com>
  * Copyright (C) 2004 - 2017 Red Hat, Inc.
@@ -19,7 +19,7 @@
 #include <linux/fs.h>
 
 #if WITH_LIBPSL
-#include <libpsl.h>
+    #include <libpsl.h>
 #endif
 
 #include "nm-utils.h"
@@ -38,2405 +38,2448 @@
 #include "nm-dns-systemd-resolved.h"
 #include "nm-dns-unbound.h"
 
-#define HASH_LEN   NM_UTILS_CHECKSUM_LENGTH_SHA1
+#define HASH_LEN NM_UTILS_CHECKSUM_LENGTH_SHA1
 
 #ifndef RESOLVCONF_PATH
-#define RESOLVCONF_PATH "/sbin/resolvconf"
+    #define RESOLVCONF_PATH "/sbin/resolvconf"
+    #define HAS_RESOLVCONF  0
+#else
+    #define HAS_RESOLVCONF 1
 #endif
 
 #ifndef NETCONFIG_PATH
-#define NETCONFIG_PATH "/sbin/netconfig"
+    #define NETCONFIG_PATH "/sbin/netconfig"
+    #define HAS_NETCONFIG  0
+#else
+    #define HAS_NETCONFIG 1
 #endif
 
 /*****************************************************************************/
 
-typedef enum {
-	SR_SUCCESS,
-	SR_NOTFOUND,
-	SR_ERROR
-} SpawnResult;
+typedef enum { SR_SUCCESS, SR_NOTFOUND, SR_ERROR } SpawnResult;
 
 typedef struct {
-	GPtrArray *nameservers;
-	GPtrArray *searches;
-	GPtrArray *options;
-	const char *nis_domain;
-	GPtrArray *nis_servers;
-	NMTernary has_trust_ad;
+    GPtrArray * nameservers;
+    GPtrArray * searches;
+    GPtrArray * options;
+    const char *nis_domain;
+    GPtrArray * nis_servers;
+    NMTernary   has_trust_ad;
 } NMResolvConfData;
 
 /*****************************************************************************/
 
 enum {
-	CONFIG_CHANGED,
+    CONFIG_CHANGED,
 
-	LAST_SIGNAL
+    LAST_SIGNAL
 };
 
-NM_GOBJECT_PROPERTIES_DEFINE (NMDnsManager,
-	PROP_MODE,
-	PROP_RC_MANAGER,
-	PROP_CONFIGURATION,
-);
+NM_GOBJECT_PROPERTIES_DEFINE(NMDnsManager, PROP_MODE, PROP_RC_MANAGER, PROP_CONFIGURATION, );
 
-static guint signals[LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = {0};
 
 typedef struct {
-	GHashTable *configs;
-	CList ip_config_lst_head;
-	GVariant *config_variant;
+    GHashTable *configs;
+    CList       ip_config_lst_head;
+    GVariant *  config_variant;
 
-	NMDnsIPConfigData *best_ip_config_4;
-	NMDnsIPConfigData *best_ip_config_6;
+    NMDnsIPConfigData *best_ip_config_4;
+    NMDnsIPConfigData *best_ip_config_6;
 
-	bool ip_config_lst_need_sort:1;
+    bool ip_config_lst_need_sort : 1;
 
-	bool dns_touched:1;
-	bool is_stopped:1;
+    bool dns_touched : 1;
+    bool is_stopped : 1;
 
-	char *hostname;
-	guint updates_queue;
+    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 */
+    guint8 hash[HASH_LEN];      /* SHA1 hash of current DNS config */
+    guint8 prev_hash[HASH_LEN]; /* Hash when begin_updates() was called */
 
-	NMDnsManagerResolvConfManager rc_manager;
-	char *mode;
-	NMDnsPlugin *sd_resolve_plugin;
-	NMDnsPlugin *plugin;
+    NMDnsManagerResolvConfManager rc_manager;
+    char *                        mode;
+    NMDnsPlugin *                 sd_resolve_plugin;
+    NMDnsPlugin *                 plugin;
 
-	NMConfig *config;
+    NMConfig *config;
 
-	struct {
-		guint64 ts;
-		guint num_restarts;
-		guint timer;
-	} plugin_ratelimit;
+    struct {
+        guint64 ts;
+        guint   num_restarts;
+        guint   timer;
+    } plugin_ratelimit;
 } NMDnsManagerPrivate;
 
 struct _NMDnsManager {
-	NMDBusObject parent;
-	NMDnsManagerPrivate _priv;
+    NMDBusObject        parent;
+    NMDnsManagerPrivate _priv;
 };
 
 struct _NMDnsManagerClass {
-	NMDBusObjectClass parent;
+    NMDBusObjectClass parent;
 };
 
-G_DEFINE_TYPE (NMDnsManager, nm_dns_manager, NM_TYPE_DBUS_OBJECT)
+G_DEFINE_TYPE(NMDnsManager, nm_dns_manager, NM_TYPE_DBUS_OBJECT)
 
 #define NM_DNS_MANAGER_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDnsManager, NM_IS_DNS_MANAGER)
 
-NM_DEFINE_SINGLETON_GETTER (NMDnsManager, nm_dns_manager_get, NM_TYPE_DNS_MANAGER);
+NM_DEFINE_SINGLETON_GETTER(NMDnsManager, nm_dns_manager_get, NM_TYPE_DNS_MANAGER);
 
 /*****************************************************************************/
 
-#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, NULL, NULL, \
-                     "%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
+#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,                                               \
+                    NULL,                                            \
+                    NULL,                                            \
+                    "%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
 
 /*****************************************************************************/
 
-static void _ip_config_dns_priority_changed (gpointer config,
-                                             GParamSpec *pspec,
-                                             NMDnsIPConfigData *ip_data);
+static void
+_ip_config_dns_priority_changed(gpointer config, GParamSpec *pspec, NMDnsIPConfigData *ip_data);
 
 /*****************************************************************************/
 
 static gboolean
-domain_is_valid (const char *domain, gboolean check_public_suffix)
+domain_is_valid(const char *domain, gboolean check_public_suffix)
 {
-	if (*domain == '\0')
-		return FALSE;
+    if (*domain == '\0')
+        return FALSE;
 #if WITH_LIBPSL
-	if (check_public_suffix && psl_is_public_suffix (psl_builtin (), domain))
-		return FALSE;
+    if (check_public_suffix && psl_is_public_suffix(psl_builtin(), domain))
+        return FALSE;
 #endif
-	return TRUE;
+    return TRUE;
 }
 
 static gboolean
-domain_is_routing (const char *domain)
+domain_is_routing(const char *domain)
 {
-	return domain[0] == '~';
+    return domain[0] == '~';
 }
 
 /*****************************************************************************/
 
-static
-NM_UTILS_LOOKUP_STR_DEFINE (_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"),
-);
-
-static
-NM_UTILS_LOOKUP_STR_DEFINE (_config_type_to_string, NMDnsIPConfigType,
-	NM_UTILS_LOOKUP_DEFAULT_WARN ("<unknown>"),
-	NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_IP_CONFIG_TYPE_REMOVED, "removed"),
-	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 NM_UTILS_LOOKUP_STR_DEFINE(
+    _rc_manager_to_string,
+    NMDnsManagerResolvConfManager,
+    NM_UTILS_LOOKUP_DEFAULT_WARN(NULL),
+    NM_UTILS_LOOKUP_STR_ITEM(NM_DNS_MANAGER_RESOLV_CONF_MAN_AUTO, "auto"),
+    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"), );
+
+static NM_UTILS_LOOKUP_STR_DEFINE(
+    _config_type_to_string,
+    NMDnsIPConfigType,
+    NM_UTILS_LOOKUP_DEFAULT_WARN("<unknown>"),
+    NM_UTILS_LOOKUP_STR_ITEM(NM_DNS_IP_CONFIG_TYPE_REMOVED, "removed"),
+    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 void
-_ASSERT_config_data (const NMDnsConfigData *data)
+_ASSERT_config_data(const NMDnsConfigData *data)
 {
-	nm_assert (data);
-	nm_assert (NM_IS_DNS_MANAGER (data->self));
-	nm_assert (data->ifindex > 0);
+    nm_assert(data);
+    nm_assert(NM_IS_DNS_MANAGER(data->self));
+    nm_assert(data->ifindex > 0);
 }
 
 static void
-_ASSERT_ip_config_data (const NMDnsIPConfigData *ip_data)
+_ASSERT_ip_config_data(const NMDnsIPConfigData *ip_data)
 {
-	nm_assert (ip_data);
-	_ASSERT_config_data (ip_data->data);
-	nm_assert (NM_IS_IP_CONFIG (ip_data->ip_config, AF_UNSPEC));
-	nm_assert (c_list_contains (&ip_data->data->data_lst_head, &ip_data->data_lst));
-	nm_assert (ip_data->data->ifindex == nm_ip_config_get_ifindex (ip_data->ip_config));
+    nm_assert(ip_data);
+    _ASSERT_config_data(ip_data->data);
+    nm_assert(NM_IS_IP_CONFIG(ip_data->ip_config));
+    nm_assert(c_list_contains(&ip_data->data->data_lst_head, &ip_data->data_lst));
+    nm_assert(ip_data->data->ifindex == nm_ip_config_get_ifindex(ip_data->ip_config));
 }
 
 static NMDnsIPConfigData *
-_ip_config_data_new (NMDnsConfigData *data,
-                     NMIPConfig *ip_config,
-                     NMDnsIPConfigType ip_config_type)
+_ip_config_data_new(NMDnsConfigData *data, NMIPConfig *ip_config, NMDnsIPConfigType ip_config_type)
 {
-	NMDnsIPConfigData *ip_data;
-
-	_ASSERT_config_data (data);
-	nm_assert (NM_IS_IP_CONFIG (ip_config, AF_UNSPEC));
-	nm_assert (ip_config_type != NM_DNS_IP_CONFIG_TYPE_REMOVED);
-
-	ip_data = g_slice_new0 (NMDnsIPConfigData);
-	ip_data->data = data;
-	ip_data->ip_config = g_object_ref (ip_config);
-	ip_data->ip_config_type = ip_config_type;
-	c_list_link_tail (&data->data_lst_head, &ip_data->data_lst);
-	c_list_link_tail (&NM_DNS_MANAGER_GET_PRIVATE (data->self)->ip_config_lst_head, &ip_data->ip_config_lst);
-
-	g_signal_connect (ip_config,
-	                  NM_IS_IP4_CONFIG (ip_config)
-	                    ? "notify::" NM_IP4_CONFIG_DNS_PRIORITY
-	                    : "notify::" NM_IP6_CONFIG_DNS_PRIORITY,
-	                  (GCallback) _ip_config_dns_priority_changed, ip_data);
-
-	_ASSERT_ip_config_data (ip_data);
-	return ip_data;
+    NMDnsIPConfigData *ip_data;
+
+    _ASSERT_config_data(data);
+    nm_assert(NM_IS_IP_CONFIG(ip_config));
+    nm_assert(ip_config_type != NM_DNS_IP_CONFIG_TYPE_REMOVED);
+
+    ip_data                 = g_slice_new0(NMDnsIPConfigData);
+    ip_data->data           = data;
+    ip_data->ip_config      = g_object_ref(ip_config);
+    ip_data->ip_config_type = ip_config_type;
+    c_list_link_tail(&data->data_lst_head, &ip_data->data_lst);
+    c_list_link_tail(&NM_DNS_MANAGER_GET_PRIVATE(data->self)->ip_config_lst_head,
+                     &ip_data->ip_config_lst);
+
+    g_signal_connect(ip_config,
+                     NM_IS_IP4_CONFIG(ip_config) ? "notify::" NM_IP4_CONFIG_DNS_PRIORITY
+                                                 : "notify::" NM_IP6_CONFIG_DNS_PRIORITY,
+                     (GCallback) _ip_config_dns_priority_changed,
+                     ip_data);
+
+    _ASSERT_ip_config_data(ip_data);
+    return ip_data;
 }
 
 static void
-_ip_config_data_free (NMDnsIPConfigData *ip_data)
+_ip_config_data_free(NMDnsIPConfigData *ip_data)
 {
-	_ASSERT_ip_config_data (ip_data);
+    _ASSERT_ip_config_data(ip_data);
 
-	c_list_unlink_stale (&ip_data->data_lst);
-	c_list_unlink_stale (&ip_data->ip_config_lst);
+    c_list_unlink_stale(&ip_data->data_lst);
+    c_list_unlink_stale(&ip_data->ip_config_lst);
 
-	g_free (ip_data->domains.search);
-	g_strfreev (ip_data->domains.reverse);
+    g_free(ip_data->domains.search);
+    g_strfreev(ip_data->domains.reverse);
 
-	g_signal_handlers_disconnect_by_func (ip_data->ip_config,
-	                                      _ip_config_dns_priority_changed,
-	                                      ip_data);
+    g_signal_handlers_disconnect_by_func(ip_data->ip_config,
+                                         _ip_config_dns_priority_changed,
+                                         ip_data);
 
-	g_object_unref (ip_data->ip_config);
-	g_slice_free (NMDnsIPConfigData, ip_data);
+    g_object_unref(ip_data->ip_config);
+    g_slice_free(NMDnsIPConfigData, ip_data);
 }
 
 static NMDnsIPConfigData *
-_config_data_find_ip_config (NMDnsConfigData *data,
-                             NMIPConfig *ip_config)
+_config_data_find_ip_config(NMDnsConfigData *data, NMIPConfig *ip_config)
 {
-	NMDnsIPConfigData *ip_data;
+    NMDnsIPConfigData *ip_data;
 
-	_ASSERT_config_data (data);
+    _ASSERT_config_data(data);
 
-	c_list_for_each_entry (ip_data, &data->data_lst_head, data_lst) {
-		_ASSERT_ip_config_data (ip_data);
+    c_list_for_each_entry (ip_data, &data->data_lst_head, data_lst) {
+        _ASSERT_ip_config_data(ip_data);
 
-		if (ip_data->ip_config == ip_config)
-			return ip_data;
-	}
-	return NULL;
+        if (ip_data->ip_config == ip_config)
+            return ip_data;
+    }
+    return NULL;
 }
 
 static void
-_config_data_free (NMDnsConfigData *data)
+_config_data_free(NMDnsConfigData *data)
 {
-	_ASSERT_config_data (data);
+    _ASSERT_config_data(data);
 
-	nm_assert (c_list_is_empty (&data->data_lst_head));
-	g_slice_free (NMDnsConfigData, data);
+    nm_assert(c_list_is_empty(&data->data_lst_head));
+    g_slice_free(NMDnsConfigData, data);
 }
 
 static int
-_ip_config_lst_cmp (const CList *a_lst,
-                    const CList *b_lst,
-                    const void *user_data)
+_ip_config_lst_cmp(const CList *a_lst, const CList *b_lst, const void *user_data)
 {
-	const NMDnsIPConfigData *a = c_list_entry (a_lst, NMDnsIPConfigData, ip_config_lst);
-	const NMDnsIPConfigData *b = c_list_entry (b_lst, NMDnsIPConfigData, ip_config_lst);
+    const NMDnsIPConfigData *a = c_list_entry(a_lst, NMDnsIPConfigData, ip_config_lst);
+    const NMDnsIPConfigData *b = c_list_entry(b_lst, NMDnsIPConfigData, ip_config_lst);
 
-	/* Configurations with lower priority value first */
-	NM_CMP_DIRECT (nm_ip_config_get_dns_priority (a->ip_config),
-	               nm_ip_config_get_dns_priority (b->ip_config));
+    /* Configurations with lower priority value first */
+    NM_CMP_DIRECT(nm_ip_config_get_dns_priority(a->ip_config),
+                  nm_ip_config_get_dns_priority(b->ip_config));
 
-	/* Sort according to type (descendingly) */
-	NM_CMP_FIELD (b, a, ip_config_type);
+    /* Sort according to type (descendingly) */
+    NM_CMP_FIELD(b, a, ip_config_type);
 
-	return 0;
+    return 0;
 }
 
 static CList *
-_ip_config_lst_head (NMDnsManager *self)
+_ip_config_lst_head(NMDnsManager *self)
 {
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
+    NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE(self);
 
-	if (priv->ip_config_lst_need_sort) {
-		priv->ip_config_lst_need_sort = FALSE;
-		c_list_sort (&priv->ip_config_lst_head, _ip_config_lst_cmp, NULL);
-	}
+    if (priv->ip_config_lst_need_sort) {
+        priv->ip_config_lst_need_sort = FALSE;
+        c_list_sort(&priv->ip_config_lst_head, _ip_config_lst_cmp, NULL);
+    }
 
-	return &priv->ip_config_lst_head;
+    return &priv->ip_config_lst_head;
 }
 
 /*****************************************************************************/
 
 gboolean
-nm_dns_manager_has_systemd_resolved (NMDnsManager *self)
+nm_dns_manager_has_systemd_resolved(NMDnsManager *self)
 {
-	NMDnsManagerPrivate *priv;
-	NMDnsSystemdResolved *plugin = NULL;
+    NMDnsManagerPrivate * priv;
+    NMDnsSystemdResolved *plugin = NULL;
 
-	g_return_val_if_fail (NM_IS_DNS_MANAGER (self), FALSE);
+    g_return_val_if_fail(NM_IS_DNS_MANAGER(self), FALSE);
 
-	priv = NM_DNS_MANAGER_GET_PRIVATE (self);
+    priv = NM_DNS_MANAGER_GET_PRIVATE(self);
 
-	if (priv->sd_resolve_plugin) {
-		nm_assert (!NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin));
-		plugin = NM_DNS_SYSTEMD_RESOLVED (priv->sd_resolve_plugin);
-	} else if (NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin))
-		plugin = NM_DNS_SYSTEMD_RESOLVED (priv->plugin);
+    if (priv->sd_resolve_plugin) {
+        nm_assert(!NM_IS_DNS_SYSTEMD_RESOLVED(priv->plugin));
+        plugin = NM_DNS_SYSTEMD_RESOLVED(priv->sd_resolve_plugin);
+    } else if (NM_IS_DNS_SYSTEMD_RESOLVED(priv->plugin))
+        plugin = NM_DNS_SYSTEMD_RESOLVED(priv->plugin);
 
-	return    plugin
-	       && nm_dns_systemd_resolved_is_running (plugin);
+    return plugin && nm_dns_systemd_resolved_is_running(plugin);
 }
 
 /*****************************************************************************/
 
 static void
-add_string_item (GPtrArray *array, const char *str, gboolean dup)
+add_string_item(GPtrArray *array, const char *str, gboolean dup)
 {
-	int i;
+    int i;
 
-	g_return_if_fail (array != NULL);
-	g_return_if_fail (str != NULL);
+    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);
+    /* 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;
-	}
+        if (candidate && !strcmp(candidate, str))
+            return;
+    }
 
-	/* No dupes, add the new item */
-	g_ptr_array_add (array, dup ? g_strdup (str): (gpointer) str);
+    /* No dupes, add the new item */
+    g_ptr_array_add(array, dup ? g_strdup(str) : (gpointer) str);
 }
 
 static void
-add_dns_option_item (GPtrArray *array, const char *str)
+add_dns_option_item(GPtrArray *array, const char *str)
 {
-	if (_nm_utils_dns_option_find_idx (array, str) < 0)
-		g_ptr_array_add (array, g_strdup (str));
+    if (_nm_utils_dns_option_find_idx(array, str) < 0)
+        g_ptr_array_add(array, g_strdup(str));
 }
 
 static void
-add_dns_domains (GPtrArray *array, const NMIPConfig *ip_config,
-                 gboolean include_routing, gboolean dup)
+add_dns_domains(GPtrArray *       array,
+                const NMIPConfig *ip_config,
+                gboolean          include_routing,
+                gboolean          dup)
 {
-	guint num_domains, num_searches, i;
-	const char *str;
-
-	num_domains = nm_ip_config_get_num_domains (ip_config);
-	num_searches = nm_ip_config_get_num_searches (ip_config);
-
-	for (i = 0; i < num_searches; i++) {
-		str = nm_ip_config_get_search (ip_config, i);
-		if (!include_routing && domain_is_routing (str))
-			continue;
-		if (!domain_is_valid (nm_utils_parse_dns_domain (str, NULL), FALSE))
-			continue;
-		add_string_item (array, str, dup);
-	}
-	if (num_domains > 1 || !num_searches) {
-		for (i = 0; i < num_domains; i++) {
-			str = nm_ip_config_get_domain (ip_config, i);
-			if (!include_routing && domain_is_routing (str))
-				continue;
-			if (!domain_is_valid (nm_utils_parse_dns_domain (str, NULL), FALSE))
-				continue;
-			add_string_item (array, str, dup);
-		}
-	}
+    guint       num_domains, num_searches, i;
+    const char *str;
+
+    num_domains  = nm_ip_config_get_num_domains(ip_config);
+    num_searches = nm_ip_config_get_num_searches(ip_config);
+
+    for (i = 0; i < num_searches; i++) {
+        str = nm_ip_config_get_search(ip_config, i);
+        if (!include_routing && domain_is_routing(str))
+            continue;
+        if (!domain_is_valid(nm_utils_parse_dns_domain(str, NULL), FALSE))
+            continue;
+        add_string_item(array, str, dup);
+    }
+    if (num_domains > 1 || !num_searches) {
+        for (i = 0; i < num_domains; i++) {
+            str = nm_ip_config_get_domain(ip_config, i);
+            if (!include_routing && domain_is_routing(str))
+                continue;
+            if (!domain_is_valid(nm_utils_parse_dns_domain(str, NULL), FALSE))
+                continue;
+            add_string_item(array, str, dup);
+        }
+    }
 }
 
 static void
-merge_one_ip_config (NMResolvConfData *rc,
-                     int ifindex,
-                     const NMIPConfig *ip_config)
+merge_one_ip_config(NMResolvConfData *rc, int ifindex, const NMIPConfig *ip_config)
 {
-	int addr_family;
-	char buf[NM_UTILS_INET_ADDRSTRLEN + 50];
-	gboolean has_trust_ad;
-	guint num_nameservers;
-	guint num;
-	guint i;
-
-	addr_family = nm_ip_config_get_addr_family (ip_config);
-
-	nm_assert_addr_family (addr_family);
-	nm_assert (ifindex > 0);
-	nm_assert (ifindex == nm_ip_config_get_ifindex (ip_config));
-
-	num_nameservers = nm_ip_config_get_num_nameservers (ip_config);
-	for (i = 0; i < num_nameservers; i++) {
-		const NMIPAddr *addr;
-
-		addr = nm_ip_config_get_nameserver (ip_config, i);
-		if (addr_family == AF_INET)
-			nm_utils_inet_ntop (addr_family, addr, buf);
-		else if (IN6_IS_ADDR_V4MAPPED (addr))
-			_nm_utils_inet4_ntop (addr->addr6.s6_addr32[3], buf);
-		else {
-			_nm_utils_inet6_ntop (&addr->addr6, buf);
-			if (IN6_IS_ADDR_LINKLOCAL (addr)) {
-				const char *ifname;
-
-				ifname = nm_platform_link_get_name (NM_PLATFORM_GET, ifindex);
-				if (ifname) {
-					g_strlcat (buf, "%", sizeof (buf));
-					g_strlcat (buf, ifname, sizeof (buf));
-				}
-			}
-		}
-
-		add_string_item (rc->nameservers, buf, TRUE);
-	}
-
-	add_dns_domains (rc->searches, ip_config, FALSE, TRUE);
-
-	has_trust_ad = FALSE;
-	num = nm_ip_config_get_num_dns_options (ip_config);
-	for (i = 0; i < num; i++) {
-		const char *option = nm_ip_config_get_dns_option (ip_config, i);
-
-		if (nm_streq (option, NM_SETTING_DNS_OPTION_TRUST_AD)) {
-			has_trust_ad = TRUE;
-			continue;
-		}
-		add_dns_option_item (rc->options,
-		                     nm_ip_config_get_dns_option (ip_config, i));
-	}
-	if (num_nameservers == 0) {
-		/* If the @ip_config contributes no DNS servers, ignore whether trust-ad is set or unset
-		 * for this @ip_config. */
-	} else if (has_trust_ad) {
-		/* We only set has_trust_ad to TRUE, if all IP configs agree (or don't contribute).
-		 * Once set to FALSE, it doesn't get reset. */
-		if (rc->has_trust_ad == NM_TERNARY_DEFAULT)
-			rc->has_trust_ad = NM_TERNARY_TRUE;
-	} else
-		rc->has_trust_ad = NM_TERNARY_FALSE;
-
-	if (addr_family == AF_INET) {
-		const NMIP4Config *ip4_config = (const NMIP4Config *) ip_config;
-
-		/* NIS stuff */
-		num = nm_ip4_config_get_num_nis_servers (ip4_config);
-		for (i = 0; i < num; i++) {
-			add_string_item (rc->nis_servers,
-			                 _nm_utils_inet4_ntop (nm_ip4_config_get_nis_server (ip4_config, i), buf),
-			                 TRUE);
-		}
-
-		if (nm_ip4_config_get_nis_domain (ip4_config)) {
-			/* FIXME: handle multiple domains */
-			if (!rc->nis_domain)
-				rc->nis_domain = nm_ip4_config_get_nis_domain (ip4_config);
-		}
-	}
+    int      addr_family;
+    char     buf[NM_UTILS_INET_ADDRSTRLEN + 50];
+    gboolean has_trust_ad;
+    guint    num_nameservers;
+    guint    num;
+    guint    i;
+
+    addr_family = nm_ip_config_get_addr_family(ip_config);
+
+    nm_assert_addr_family(addr_family);
+    nm_assert(ifindex > 0);
+    nm_assert(ifindex == nm_ip_config_get_ifindex(ip_config));
+
+    num_nameservers = nm_ip_config_get_num_nameservers(ip_config);
+    for (i = 0; i < num_nameservers; i++) {
+        const NMIPAddr *addr;
+
+        addr = nm_ip_config_get_nameserver(ip_config, i);
+        if (addr_family == AF_INET)
+            nm_utils_inet_ntop(addr_family, addr, buf);
+        else if (IN6_IS_ADDR_V4MAPPED(addr))
+            _nm_utils_inet4_ntop(addr->addr6.s6_addr32[3], buf);
+        else {
+            _nm_utils_inet6_ntop(&addr->addr6, buf);
+            if (IN6_IS_ADDR_LINKLOCAL(addr)) {
+                const char *ifname;
+
+                ifname = nm_platform_link_get_name(NM_PLATFORM_GET, ifindex);
+                if (ifname) {
+                    g_strlcat(buf, "%", sizeof(buf));
+                    g_strlcat(buf, ifname, sizeof(buf));
+                }
+            }
+        }
+
+        add_string_item(rc->nameservers, buf, TRUE);
+    }
+
+    add_dns_domains(rc->searches, ip_config, FALSE, TRUE);
+
+    has_trust_ad = FALSE;
+    num          = nm_ip_config_get_num_dns_options(ip_config);
+    for (i = 0; i < num; i++) {
+        const char *option = nm_ip_config_get_dns_option(ip_config, i);
+
+        if (nm_streq(option, NM_SETTING_DNS_OPTION_TRUST_AD)) {
+            has_trust_ad = TRUE;
+            continue;
+        }
+        add_dns_option_item(rc->options, nm_ip_config_get_dns_option(ip_config, i));
+    }
+    if (num_nameservers == 0) {
+        /* If the @ip_config contributes no DNS servers, ignore whether trust-ad is set or unset
+         * for this @ip_config. */
+    } else if (has_trust_ad) {
+        /* We only set has_trust_ad to TRUE, if all IP configs agree (or don't contribute).
+         * Once set to FALSE, it doesn't get reset. */
+        if (rc->has_trust_ad == NM_TERNARY_DEFAULT)
+            rc->has_trust_ad = NM_TERNARY_TRUE;
+    } else
+        rc->has_trust_ad = NM_TERNARY_FALSE;
+
+    if (addr_family == AF_INET) {
+        const NMIP4Config *ip4_config = (const NMIP4Config *) ip_config;
+
+        /* NIS stuff */
+        num = nm_ip4_config_get_num_nis_servers(ip4_config);
+        for (i = 0; i < num; i++) {
+            add_string_item(rc->nis_servers,
+                            _nm_utils_inet4_ntop(nm_ip4_config_get_nis_server(ip4_config, i), buf),
+                            TRUE);
+        }
+
+        if (nm_ip4_config_get_nis_domain(ip4_config)) {
+            /* FIXME: handle multiple domains */
+            if (!rc->nis_domain)
+                rc->nis_domain = nm_ip4_config_get_nis_domain(ip4_config);
+        }
+    }
 }
 
 static GPid
-run_netconfig (NMDnsManager *self, GError **error, int *stdin_fd)
+run_netconfig(NMDnsManager *self, GError **error, int *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;
+    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
-netconfig_construct_str (NMDnsManager *self, GString *str, const char *key, const char *value)
+netconfig_construct_str(NMDnsManager *self, GString *str, const char *key, const char *value)
 {
-	if (value) {
-		_LOGD ("writing to netconfig: %s='%s'", key, value);
-		g_string_append_printf (str, "%s='%s'\n", key, value);
-	}
+    if (value) {
+        _LOGD("writing to netconfig: %s='%s'", key, value);
+        g_string_append_printf(str, "%s='%s'\n", key, value);
+    }
 }
 
 static void
-netconfig_construct_strv (NMDnsManager *self, GString *str, const char *key, const char *const*values)
+netconfig_construct_strv(NMDnsManager *     self,
+                         GString *          str,
+                         const char *       key,
+                         const char *const *values)
 {
-	if (values) {
-		gs_free char *value = NULL;
+    if (values) {
+        gs_free char *value = NULL;
 
-		value = g_strjoinv (" ", (char **) values);
-		netconfig_construct_str (self, str, key, value);
-	}
+        value = g_strjoinv(" ", (char **) values);
+        netconfig_construct_str(self, str, key, value);
+    }
 }
 
 static SpawnResult
-dispatch_netconfig (NMDnsManager *self,
-                    const char *const*searches,
-                    const char *const*nameservers,
-                    const char *nis_domain,
-                    const char *const*nis_servers,
-                    GError **error)
+dispatch_netconfig(NMDnsManager *     self,
+                   const char *const *searches,
+                   const char *const *nameservers,
+                   const char *       nis_domain,
+                   const char *const *nis_servers,
+                   GError **          error)
 {
-	GPid pid;
-	int fd;
-	int errsv;
-	int status;
-	gssize l;
-	nm_auto_free_gstring GString *str = NULL;
-
-	pid = run_netconfig (self, error, &fd);
-	if (pid <= 0)
-		return SR_NOTFOUND;
-
-	str = g_string_new ("");
-
-	/* NM is writing already-merged DNS information to netconfig, so it
-	 * does not apply to a specific network interface.
-	 */
-	netconfig_construct_str (self, str, "INTERFACE", "NetworkManager");
-	netconfig_construct_strv (self, str, "DNSSEARCH", searches);
-	netconfig_construct_strv (self, str, "DNSSERVERS", nameservers);
-	netconfig_construct_str (self, str, "NISDOMAIN", nis_domain);
-	netconfig_construct_strv (self, str, "NISSERVERS", nis_servers);
+    GPid                 pid;
+    int                  fd;
+    int                  errsv;
+    int                  status;
+    gssize               l;
+    nm_auto_free_gstring GString *str = NULL;
+
+    pid = run_netconfig(self, error, &fd);
+    if (pid <= 0)
+        return SR_NOTFOUND;
+
+    str = g_string_new("");
+
+    /* NM is writing already-merged DNS information to netconfig, so it
+     * does not apply to a specific network interface.
+     */
+    netconfig_construct_str(self, str, "INTERFACE", "NetworkManager");
+    netconfig_construct_strv(self, str, "DNSSEARCH", searches);
+    netconfig_construct_strv(self, str, "DNSSERVERS", nameservers);
+    netconfig_construct_str(self, str, "NISDOMAIN", nis_domain);
+    netconfig_construct_strv(self, str, "NISSERVERS", nis_servers);
 
 again:
-	l = write (fd, str->str, str->len);
-	if (l == -1)  {
-		if (errno == EINTR)
-			goto again;
-	}
-
-	nm_close (fd);
-
-	/* Wait until the process exits */
-	if (!nm_utils_kill_child_sync (pid, 0, LOGD_DNS, "netconfig", &status, 1000, 0)) {
-		errsv = errno;
-		g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_FAILED,
-		             "Error waiting for netconfig to exit: %s",
-		             nm_strerror_native (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;
+    l = write(fd, str->str, str->len);
+    if (l == -1) {
+        if (errno == EINTR)
+            goto again;
+    }
+
+    nm_close(fd);
+
+    /* FIXME: don't write to netconfig synchronously. */
+
+    /* Wait until the process exits */
+    if (!nm_utils_kill_child_sync(pid, 0, LOGD_DNS, "netconfig", &status, 1000, 0)) {
+        errsv = errno;
+        g_set_error(error,
+                    NM_MANAGER_ERROR,
+                    NM_MANAGER_ERROR_FAILED,
+                    "Error waiting for netconfig to exit: %s",
+                    nm_strerror_native(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 (const char *const*searches,
-                    const char *const*nameservers,
-                    const char *const*options)
+create_resolv_conf(const char *const *searches,
+                   const char *const *nameservers,
+                   const char *const *options)
 {
-	GString *str;
-	gsize i;
-
-	str = g_string_new_len (NULL, 245);
-
-	g_string_append (str, "# Generated by NetworkManager\n");
-
-	if (searches && searches[0]) {
-		gsize search_base_idx;
-
-		g_string_append (str, "search");
-		search_base_idx = str->len;
-
-		for (i = 0; searches[i]; i++) {
-			const char *s = searches[i];
-			gsize l = strlen (s);
-
-			if (   l == 0
-			    || NM_STRCHAR_ANY (s, ch, NM_IN_SET (ch, ' ', '\t', '\n'))) {
-				/* there should be no such characters in the search entry. Also,
-				 * because glibc parser would treat them as line/word separator.
-				 *
-				 * Skip the value silently. */
-				continue;
-			}
-
-			if (search_base_idx > 0) {
-				if (str->len - search_base_idx + 1 + l > 254) {
-					/* this entry crosses the 256 character boundery. Older glibc versions
-					 * would truncate the entry at this point.
-					 *
-					 * Fill the line with spaces to cross the 256 char boundary and continue
-					 * afterwards. This way, the truncation happens between two search entries. */
-					while (str->len - search_base_idx < 257)
-						g_string_append_c (str, ' ');
-					search_base_idx = 0;
-				}
-			}
-
-			g_string_append_c (str, ' ');
-			g_string_append_len (str, s, l);
-		}
-		g_string_append_c (str, '\n');
-	}
-
-	if (nameservers && nameservers[0]) {
-		for (i = 0; nameservers[i]; i++) {
-			if (i == 3) {
-				g_string_append (str, "# NOTE: the libc resolver may not support more than 3 nameservers.\n");
-				g_string_append (str, "# The nameservers listed below may not be recognized.\n");
-			}
-			g_string_append (str, "nameserver ");
-			g_string_append (str, nameservers[i]);
-			g_string_append_c (str, '\n');
-		}
-	}
-
-	if (options && options[0]) {
-		g_string_append (str, "options");
-		for (i = 0; options[i]; i++) {
-			g_string_append_c (str, ' ');
-			g_string_append (str, options[i]);
-		}
-		g_string_append_c (str, '\n');
-	}
-
-	return g_string_free (str, FALSE);
+    GString *str;
+    gsize    i;
+
+    str = g_string_new_len(NULL, 245);
+
+    g_string_append(str, "# Generated by NetworkManager\n");
+
+    if (searches && searches[0]) {
+        gsize search_base_idx;
+
+        g_string_append(str, "search");
+        search_base_idx = str->len;
+
+        for (i = 0; searches[i]; i++) {
+            const char *s = searches[i];
+            gsize       l = strlen(s);
+
+            if (l == 0 || NM_STRCHAR_ANY(s, ch, NM_IN_SET(ch, ' ', '\t', '\n'))) {
+                /* there should be no such characters in the search entry. Also,
+                 * because glibc parser would treat them as line/word separator.
+                 *
+                 * Skip the value silently. */
+                continue;
+            }
+
+            if (search_base_idx > 0) {
+                if (str->len - search_base_idx + 1 + l > 254) {
+                    /* this entry crosses the 256 character boundary. Older glibc versions
+                     * would truncate the entry at this point.
+                     *
+                     * Fill the line with spaces to cross the 256 char boundary and continue
+                     * afterwards. This way, the truncation happens between two search entries. */
+                    while (str->len - search_base_idx < 257)
+                        g_string_append_c(str, ' ');
+                    search_base_idx = 0;
+                }
+            }
+
+            g_string_append_c(str, ' ');
+            g_string_append_len(str, s, l);
+        }
+        g_string_append_c(str, '\n');
+    }
+
+    if (nameservers && nameservers[0]) {
+        for (i = 0; nameservers[i]; i++) {
+            if (i == 3) {
+                g_string_append(
+                    str,
+                    "# NOTE: the libc resolver may not support more than 3 nameservers.\n");
+                g_string_append(str, "# The nameservers listed below may not be recognized.\n");
+            }
+            g_string_append(str, "nameserver ");
+            g_string_append(str, nameservers[i]);
+            g_string_append_c(str, '\n');
+        }
+    }
+
+    if (options && options[0]) {
+        g_string_append(str, "options");
+        for (i = 0; options[i]; i++) {
+            g_string_append_c(str, ' ');
+            g_string_append(str, options[i]);
+        }
+        g_string_append_c(str, '\n');
+    }
+
+    return g_string_free(str, FALSE);
 }
 
 char *
-nmtst_dns_create_resolv_conf (const char *const*searches,
-                              const char *const*nameservers,
-                              const char *const*options)
+nmtst_dns_create_resolv_conf(const char *const *searches,
+                             const char *const *nameservers,
+                             const char *const *options)
 {
-	return create_resolv_conf (searches, nameservers, options);
+    return create_resolv_conf(searches, nameservers, options);
 }
 
 static gboolean
-write_resolv_conf_contents (FILE *f,
-                            const char *content,
-                            GError **error)
+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",
-		             nm_strerror_native (errsv));
-		errno = errsv;
-		return FALSE;
-	}
-
-	return TRUE;
+    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",
+                    nm_strerror_native(errsv));
+        errno = errsv;
+        return FALSE;
+    }
+
+    return TRUE;
 }
 
 static gboolean
-write_resolv_conf (FILE *f,
-                   const char *const*searches,
-                   const char *const*nameservers,
-                   const char *const*options,
-                   GError **error)
+write_resolv_conf(FILE *             f,
+                  const char *const *searches,
+                  const char *const *nameservers,
+                  const char *const *options,
+                  GError **          error)
 {
-	gs_free char *content = NULL;
+    gs_free char *content = NULL;
 
-	content = create_resolv_conf (searches, nameservers, options);
-	return write_resolv_conf_contents (f, content, error);
+    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)
+dispatch_resolvconf(NMDnsManager *self,
+                    char **       searches,
+                    char **       nameservers,
+                    char **       options,
+                    GError **     error)
 {
-	gs_free char *cmd = NULL;
-	FILE *f;
-	gboolean success = FALSE;
-	int errsv;
-	int err;
-	char *argv[] = { RESOLVCONF_PATH, "-d", "NetworkManager", NULL };
-	int status;
-
-	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);
-
-		if (!g_spawn_sync ("/", argv, NULL, 0, NULL, NULL, NULL, NULL, &status, error))
-			return SR_ERROR;
-
-		if (status != 0) {
-			g_set_error (error,
-			             NM_MANAGER_ERROR,
-			             NM_MANAGER_ERROR_FAILED,
-			             "%s returned error code",
-			             RESOLVCONF_PATH);
-			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) {
-		errsv = errno;
-		g_set_error (error,
-		             NM_MANAGER_ERROR,
-		             NM_MANAGER_ERROR_FAILED,
-		             "Could not write to %s: %s",
-		             RESOLVCONF_PATH,
-		             nm_strerror_native (errsv));
-		return SR_ERROR;
-	}
-
-	success = write_resolv_conf (f,
-	                             NM_CAST_STRV_CC (searches),
-	                             NM_CAST_STRV_CC (nameservers),
-	                             NM_CAST_STRV_CC (options),
-	                             error);
-	err = pclose (f);
-	if (err < 0) {
-		errsv = errno;
-		g_clear_error (error);
-		g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-		             "Failed to close pipe to resolvconf: %d", errsv);
-		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;
+    gs_free char *cmd = NULL;
+    FILE *        f;
+    gboolean      success = FALSE;
+    int           errsv;
+    int           err;
+    char *        argv[] = {RESOLVCONF_PATH, "-d", "NetworkManager", NULL};
+    int           status;
+
+    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);
+
+        if (!g_spawn_sync("/", argv, NULL, 0, NULL, NULL, NULL, NULL, &status, error))
+            return SR_ERROR;
+
+        if (status != 0) {
+            g_set_error(error,
+                        NM_MANAGER_ERROR,
+                        NM_MANAGER_ERROR_FAILED,
+                        "%s returned error code",
+                        RESOLVCONF_PATH);
+            return SR_ERROR;
+        }
+
+        return SR_SUCCESS;
+    }
+
+    _LOGI("Writing DNS information to %s", RESOLVCONF_PATH);
+
+    /* FIXME: don't write to resolvconf synchronously. */
+
+    cmd = g_strconcat(RESOLVCONF_PATH, " -a ", "NetworkManager", NULL);
+    if ((f = popen(cmd, "w")) == NULL) {
+        errsv = errno;
+        g_set_error(error,
+                    NM_MANAGER_ERROR,
+                    NM_MANAGER_ERROR_FAILED,
+                    "Could not write to %s: %s",
+                    RESOLVCONF_PATH,
+                    nm_strerror_native(errsv));
+        return SR_ERROR;
+    }
+
+    success = write_resolv_conf(f,
+                                NM_CAST_STRV_CC(searches),
+                                NM_CAST_STRV_CC(nameservers),
+                                NM_CAST_STRV_CC(options),
+                                error);
+    err     = pclose(f);
+    if (err < 0) {
+        errsv = errno;
+        g_clear_error(error);
+        g_set_error(error,
+                    G_IO_ERROR,
+                    g_io_error_from_errno(errsv),
+                    "Failed to close pipe to resolvconf: %d",
+                    errsv);
+        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;
 }
 
 static const char *
-_read_link_cached (const char *path, gboolean *is_cached, char **cached)
+_read_link_cached(const char *path, gboolean *is_cached, char **cached)
 {
-	nm_assert (is_cached);
-	nm_assert (cached);
+    nm_assert(is_cached);
+    nm_assert(cached);
 
-	if (*is_cached)
-		return *cached;
+    if (*is_cached)
+        return *cached;
 
-	nm_assert (!*cached);
-	*is_cached = TRUE;
-	return (*cached = g_file_read_link (path, NULL));
+    nm_assert(!*cached);
+    *is_cached = TRUE;
+    return (*cached = g_file_read_link(path, NULL));
 }
 
-#define MY_RESOLV_CONF             NMRUNDIR"/resolv.conf"
-#define MY_RESOLV_CONF_TMP         MY_RESOLV_CONF".tmp"
-#define RESOLV_CONF_TMP            "/etc/.resolv.conf.NetworkManager"
+#define MY_RESOLV_CONF     NMRUNDIR "/resolv.conf"
+#define MY_RESOLV_CONF_TMP MY_RESOLV_CONF ".tmp"
+#define RESOLV_CONF_TMP    "/etc/.resolv.conf.NetworkManager"
 
-#define NO_STUB_RESOLV_CONF        NMRUNDIR "/no-stub-resolv.conf"
+#define NO_STUB_RESOLV_CONF NMRUNDIR "/no-stub-resolv.conf"
 
 static void
-update_resolv_conf_no_stub (NMDnsManager *self,
-                            const char *const*searches,
-                            const char *const*nameservers,
-                            const char *const*options)
+update_resolv_conf_no_stub(NMDnsManager *     self,
+                           const char *const *searches,
+                           const char *const *nameservers,
+                           const char *const *options)
 {
-	gs_free char *content = NULL;
-	GError *local = NULL;
-
-	content = create_resolv_conf (searches, nameservers, options);
-
-	if (!g_file_set_contents (NO_STUB_RESOLV_CONF,
-	                          content,
-	                          -1,
-	                          &local)) {
-		_LOGD ("update-resolv-no-stub: failure to write file: %s",
-		       local->message);
-		g_error_free (local);
-		return;
-	}
-
-	_LOGT ("update-resolv-no-stub: '%s' successfully written",
-	       NO_STUB_RESOLV_CONF);
+    gs_free char *content = NULL;
+    GError *      local   = NULL;
+
+    content = create_resolv_conf(searches, nameservers, options);
+
+    if (!g_file_set_contents(NO_STUB_RESOLV_CONF, content, -1, &local)) {
+        _LOGD("update-resolv-no-stub: failure to write file: %s", local->message);
+        g_error_free(local);
+        return;
+    }
+
+    _LOGT("update-resolv-no-stub: '%s' successfully written", NO_STUB_RESOLV_CONF);
 }
 
 static SpawnResult
-update_resolv_conf (NMDnsManager *self,
-                    const char *const*searches,
-                    const char *const*nameservers,
-                    const char *const*options,
-                    GError **error,
-                    NMDnsManagerResolvConfManager rc_manager)
+update_resolv_conf(NMDnsManager *                self,
+                   const char *const *           searches,
+                   const char *const *           nameservers,
+                   const char *const *           options,
+                   GError **                     error,
+                   NMDnsManagerResolvConfManager rc_manager)
 {
-	FILE *f;
-	gboolean success;
-	gs_free char *content = NULL;
-	SpawnResult write_file_result = SR_SUCCESS;
-	int errsv;
-	gboolean resconf_link_cached = FALSE;
-	gs_free char *resconf_link = NULL;
-
-	content = create_resolv_conf (searches, nameservers, options);
-
-	if (   rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE
-	    || (   rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK
-	        && !_read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link))) {
-		gs_free char *rc_path_syml = NULL;
-		nm_auto_free char *rc_path_real = NULL;
-		const char *rc_path = _PATH_RESCONF;
-		GError *local = NULL;
-
-		if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE) {
-			rc_path_real = realpath (_PATH_RESCONF, NULL);
-			if (rc_path_real)
-				rc_path = rc_path_real;
-			else {
-				/* realpath did not resolve a path-name. That either means,
-				 * _PATH_RESCONF:
-				 *   - does not exist
-				 *   - is a plain file
-				 *   - is a dangling symlink
-				 *
-				 * Handle the case, where it is a dangling symlink... */
-				rc_path_syml = nm_utils_read_link_absolute (_PATH_RESCONF, NULL);
-				if (rc_path_syml)
-					rc_path = rc_path_syml;
-			}
-		}
-
-		/* 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);
-			g_propagate_error (error, local);
-			/* clear @error, so that we don't try reset it. This is the error
-			 * we want to propagate to the caller. */
-			error = NULL;
-			write_file_result = SR_ERROR;
-		} 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,
-		             nm_strerror_native (errsv));
-		_LOGT ("update-resolv-conf: open temporary file %s failed (%s)",
-		       MY_RESOLV_CONF_TMP, nm_strerror_native (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, nm_strerror_native (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,
-			             nm_strerror_native (errsv));
-			_LOGT ("update-resolv-conf: close temporary file %s failed (%s)",
-			       MY_RESOLV_CONF_TMP, nm_strerror_native (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,
-		             nm_strerror_native (errsv));
-		_LOGT ("update-resolv-conf: failed to rename temporary file %s to %s (%s)",
-		       MY_RESOLV_CONF_TMP, MY_RESOLV_CONF, nm_strerror_native (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)",
-		       MY_RESOLV_CONF, _rc_manager_to_string (rc_manager));
-		return write_file_result;
-	}
-
-	if (   rc_manager != NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK
-	    || !_read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link)) {
-		_LOGT ("update-resolv-conf: write internal file %s succeeded", MY_RESOLV_CONF);
-		return write_file_result;
-	}
-
-	if (!nm_streq0 (_read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link),
-	                MY_RESOLV_CONF)) {
-		_LOGT ("update-resolv-conf: write internal file %s succeeded (don't touch symlink %s linking to %s)",
-		       MY_RESOLV_CONF, _PATH_RESCONF,
-		       _read_link_cached (_PATH_RESCONF, &resconf_link_cached, &resconf_link));
-		return write_file_result;
-	}
-
-	/* By this point, /etc/resolv.conf exists and is a symlink to our internal
-	 * resolv.conf. We update the symlink so that applications get an inotify
-	 * notification.
-	 */
-	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,
-		             nm_strerror_native (errsv));
-		_LOGT ("update-resolv-conf: write internal file %s succeeded "
-		       "but canot delete temporary file %s: %s",
-		       MY_RESOLV_CONF, RESOLV_CONF_TMP, nm_strerror_native (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,
-		             nm_strerror_native (errsv));
-		_LOGT ("update-resolv-conf: write internal file %s succeeded "
-		       "but failed to symlink %s: %s",
-		       MY_RESOLV_CONF, RESOLV_CONF_TMP, nm_strerror_native (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,
-		             nm_strerror_native (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, nm_strerror_native (errsv));
-		return SR_ERROR;
-	}
-
-	_LOGT ("update-resolv-conf: write internal file %s succeeded and update symlink %s",
-	       MY_RESOLV_CONF, _PATH_RESCONF);
-	return write_file_result;
+    FILE *        f;
+    gboolean      success;
+    gs_free char *content           = NULL;
+    SpawnResult   write_file_result = SR_SUCCESS;
+    int           errsv;
+    gboolean      resconf_link_cached = FALSE;
+    gs_free char *resconf_link        = NULL;
+
+    content = create_resolv_conf(searches, nameservers, options);
+
+    if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE
+        || (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK
+            && !_read_link_cached(_PATH_RESCONF, &resconf_link_cached, &resconf_link))) {
+        gs_free char *     rc_path_syml = NULL;
+        nm_auto_free char *rc_path_real = NULL;
+        const char *       rc_path      = _PATH_RESCONF;
+        GError *           local        = NULL;
+
+        if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE) {
+            rc_path_real = realpath(_PATH_RESCONF, NULL);
+            if (rc_path_real)
+                rc_path = rc_path_real;
+            else {
+                /* realpath did not resolve a path-name. That either means,
+                 * _PATH_RESCONF:
+                 *   - does not exist
+                 *   - is a plain file
+                 *   - is a dangling symlink
+                 *
+                 * Handle the case, where it is a dangling symlink... */
+                rc_path_syml = nm_utils_read_link_absolute(_PATH_RESCONF, NULL);
+                if (rc_path_syml)
+                    rc_path = rc_path_syml;
+            }
+        }
+
+        /* 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);
+            g_propagate_error(error, local);
+            /* clear @error, so that we don't try reset it. This is the error
+             * we want to propagate to the caller. */
+            error             = NULL;
+            write_file_result = SR_ERROR;
+        } 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,
+                    nm_strerror_native(errsv));
+        _LOGT("update-resolv-conf: open temporary file %s failed (%s)",
+              MY_RESOLV_CONF_TMP,
+              nm_strerror_native(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,
+              nm_strerror_native(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,
+                        nm_strerror_native(errsv));
+            _LOGT("update-resolv-conf: close temporary file %s failed (%s)",
+                  MY_RESOLV_CONF_TMP,
+                  nm_strerror_native(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,
+                    nm_strerror_native(errsv));
+        _LOGT("update-resolv-conf: failed to rename temporary file %s to %s (%s)",
+              MY_RESOLV_CONF_TMP,
+              MY_RESOLV_CONF,
+              nm_strerror_native(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)",
+              MY_RESOLV_CONF,
+              _rc_manager_to_string(rc_manager));
+        return write_file_result;
+    }
+
+    if (rc_manager != NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK
+        || !_read_link_cached(_PATH_RESCONF, &resconf_link_cached, &resconf_link)) {
+        _LOGT("update-resolv-conf: write internal file %s succeeded", MY_RESOLV_CONF);
+        return write_file_result;
+    }
+
+    if (!nm_streq0(_read_link_cached(_PATH_RESCONF, &resconf_link_cached, &resconf_link),
+                   MY_RESOLV_CONF)) {
+        _LOGT("update-resolv-conf: write internal file %s succeeded (don't touch symlink %s "
+              "linking to %s)",
+              MY_RESOLV_CONF,
+              _PATH_RESCONF,
+              _read_link_cached(_PATH_RESCONF, &resconf_link_cached, &resconf_link));
+        return write_file_result;
+    }
+
+    /* By this point, /etc/resolv.conf exists and is a symlink to our internal
+     * resolv.conf. We update the symlink so that applications get an inotify
+     * notification.
+     */
+    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,
+                    nm_strerror_native(errsv));
+        _LOGT("update-resolv-conf: write internal file %s succeeded "
+              "but cannot delete temporary file %s: %s",
+              MY_RESOLV_CONF,
+              RESOLV_CONF_TMP,
+              nm_strerror_native(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,
+                    nm_strerror_native(errsv));
+        _LOGT("update-resolv-conf: write internal file %s succeeded "
+              "but failed to symlink %s: %s",
+              MY_RESOLV_CONF,
+              RESOLV_CONF_TMP,
+              nm_strerror_native(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,
+                    nm_strerror_native(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,
+              nm_strerror_native(errsv));
+        return SR_ERROR;
+    }
+
+    _LOGT("update-resolv-conf: write internal file %s succeeded and update symlink %s",
+          MY_RESOLV_CONF,
+          _PATH_RESCONF);
+    return write_file_result;
 }
 
 static void
-compute_hash (NMDnsManager *self, const NMGlobalDnsConfig *global, guint8 buffer[HASH_LEN])
+compute_hash(NMDnsManager *self, const NMGlobalDnsConfig *global, guint8 buffer[HASH_LEN])
 {
-	nm_auto_free_checksum GChecksum *sum = NULL;
-	NMDnsIPConfigData *ip_data;
+    nm_auto_free_checksum GChecksum *sum = NULL;
+    NMDnsIPConfigData *              ip_data;
 
-	sum = g_checksum_new (G_CHECKSUM_SHA1);
-	nm_assert (HASH_LEN == g_checksum_type_get_length (G_CHECKSUM_SHA1));
+    sum = g_checksum_new(G_CHECKSUM_SHA1);
+    nm_assert(HASH_LEN == g_checksum_type_get_length(G_CHECKSUM_SHA1));
 
-	if (global)
-		nm_global_dns_config_update_checksum (global, sum);
-	else {
-		const CList *head;
+    if (global)
+        nm_global_dns_config_update_checksum(global, sum);
+    else {
+        const CList *head;
 
-		/* FIXME(ip-config-checksum): this relies on the fact that an IP
-		 * configuration without DNS parameters gives a zero checksum. */
-		head = _ip_config_lst_head (self);
-		c_list_for_each_entry (ip_data, head, ip_config_lst)
-			nm_ip_config_hash (ip_data->ip_config, sum, TRUE);
-	}
+        /* FIXME(ip-config-checksum): this relies on the fact that an IP
+         * configuration without DNS parameters gives a zero checksum. */
+        head = _ip_config_lst_head(self);
+        c_list_for_each_entry (ip_data, head, ip_config_lst)
+            nm_ip_config_hash(ip_data->ip_config, sum, TRUE);
+    }
 
-	nm_utils_checksum_get_digest_len (sum, buffer, HASH_LEN);
+    nm_utils_checksum_get_digest_len(sum, buffer, HASH_LEN);
 }
 
 static gboolean
-merge_global_dns_config (NMResolvConfData *rc, NMGlobalDnsConfig *global_conf)
+merge_global_dns_config(NMResolvConfData *rc, NMGlobalDnsConfig *global_conf)
 {
-	NMGlobalDnsDomain *default_domain;
-	const char *const *searches;
-	const char *const *options;
-	const char *const *servers;
-	guint i;
-
-	if (!global_conf)
-		return FALSE;
-
-	searches = nm_global_dns_config_get_searches (global_conf);
-	if (searches) {
-		for (i = 0; searches[i]; i++) {
-			if (domain_is_routing (searches[i]))
-				continue;
-			if (!domain_is_valid (searches[i], FALSE))
-				continue;
-			add_string_item (rc->searches, searches[i], TRUE);
-		}
-	}
-
-	options = nm_global_dns_config_get_options (global_conf);
-	if (options) {
-		for (i = 0; options[i]; i++)
-			add_string_item (rc->options, options[i], TRUE);
-	}
-
-	default_domain = nm_global_dns_config_lookup_domain (global_conf, "*");
-	nm_assert (default_domain);
-
-	servers = nm_global_dns_domain_get_servers (default_domain);
-	if (servers) {
-		for (i = 0; servers[i]; i++)
-			add_string_item (rc->nameservers, servers[i], TRUE);
-	}
-
-	return TRUE;
+    NMGlobalDnsDomain *default_domain;
+    const char *const *searches;
+    const char *const *options;
+    const char *const *servers;
+    guint              i;
+
+    if (!global_conf)
+        return FALSE;
+
+    searches = nm_global_dns_config_get_searches(global_conf);
+    if (searches) {
+        for (i = 0; searches[i]; i++) {
+            if (domain_is_routing(searches[i]))
+                continue;
+            if (!domain_is_valid(searches[i], FALSE))
+                continue;
+            add_string_item(rc->searches, searches[i], TRUE);
+        }
+    }
+
+    options = nm_global_dns_config_get_options(global_conf);
+    if (options) {
+        for (i = 0; options[i]; i++)
+            add_string_item(rc->options, options[i], TRUE);
+    }
+
+    default_domain = nm_global_dns_config_lookup_domain(global_conf, "*");
+    nm_assert(default_domain);
+
+    servers = nm_global_dns_domain_get_servers(default_domain);
+    if (servers) {
+        for (i = 0; servers[i]; i++)
+            add_string_item(rc->nameservers, servers[i], TRUE);
+    }
+
+    return TRUE;
 }
 
 static const char *
-get_nameserver_list (const NMIPConfig *config, GString **str)
+get_nameserver_list(const NMIPConfig *config, GString **str)
 {
-	guint num, i;
-	char buf[NM_UTILS_INET_ADDRSTRLEN];
-	int addr_family;
-
-	if (*str)
-		g_string_truncate (*str, 0);
-	else
-		*str = g_string_sized_new (64);
-
-	addr_family = nm_ip_config_get_addr_family (config);
-	num = nm_ip_config_get_num_nameservers (config);
-	for (i = 0; i < num; i++) {
-		nm_utils_inet_ntop (addr_family,
-		                    nm_ip_config_get_nameserver (config, i),
-		                    buf);
-		if (i > 0)
-			g_string_append_c (*str, ' ');
-		g_string_append (*str, buf);
-	}
-
-	return (*str)->str;
+    guint num, i;
+    char  buf[NM_UTILS_INET_ADDRSTRLEN];
+    int   addr_family;
+
+    if (*str)
+        g_string_truncate(*str, 0);
+    else
+        *str = g_string_sized_new(64);
+
+    addr_family = nm_ip_config_get_addr_family(config);
+    num         = nm_ip_config_get_num_nameservers(config);
+    for (i = 0; i < num; i++) {
+        nm_utils_inet_ntop(addr_family, nm_ip_config_get_nameserver(config, i), buf);
+        if (i > 0)
+            g_string_append_c(*str, ' ');
+        g_string_append(*str, buf);
+    }
+
+    return (*str)->str;
 }
 
 static char **
-_ptrarray_to_strv (GPtrArray *parray)
+_ptrarray_to_strv(GPtrArray *parray)
 {
-	if (parray->len > 0)
-		g_ptr_array_add (parray, NULL);
-	return (char **) g_ptr_array_free (parray, parray->len == 0);
+    if (parray->len > 0)
+        g_ptr_array_add(parray, NULL);
+    return (char **) g_ptr_array_free(parray, parray->len == 0);
 }
 
 static void
-_collect_resolv_conf_data (NMDnsManager *self,
-                           NMGlobalDnsConfig *global_config,
-                           char ***out_searches,
-                           char ***out_options,
-                           char ***out_nameservers,
-                           char ***out_nis_servers,
-                           const char **out_nis_domain)
+_collect_resolv_conf_data(NMDnsManager *     self,
+                          NMGlobalDnsConfig *global_config,
+                          char ***           out_searches,
+                          char ***           out_options,
+                          char ***           out_nameservers,
+                          char ***           out_nis_servers,
+                          const char **      out_nis_domain)
 {
-	NMDnsManagerPrivate *priv;
-	NMResolvConfData rc = {
-		.nameservers  = g_ptr_array_new (),
-		.searches     = g_ptr_array_new (),
-		.options      = g_ptr_array_new (),
-		.nis_domain   = NULL,
-		.nis_servers  = g_ptr_array_new (),
-		.has_trust_ad = NM_TERNARY_DEFAULT,
-	};
-
-	priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-
-	if (global_config)
-		merge_global_dns_config (&rc, global_config);
-	else {
-		nm_auto_free_gstring GString *tmp_gstring = NULL;
-		int prio, first_prio = 0;
-		const NMDnsIPConfigData *ip_data;
-		const CList *head;
-		gboolean is_first = TRUE;
-
-		head = _ip_config_lst_head (self);
-		c_list_for_each_entry (ip_data, head, ip_config_lst) {
-			gboolean skip = FALSE;
-
-			_ASSERT_ip_config_data (ip_data);
-
-			prio = nm_ip_config_get_dns_priority (ip_data->ip_config);
-
-			if (is_first) {
-				is_first = FALSE;
-				first_prio = prio;
-			} else if (   first_prio < 0
-			           && first_prio != prio)
-				skip = TRUE;
-
-			if (nm_ip_config_get_num_nameservers (ip_data->ip_config)) {
-				_LOGT ("config: %8d %-7s v%c %-5d %s: %s",
-				       prio,
-				       _config_type_to_string (ip_data->ip_config_type),
-				       nm_utils_addr_family_to_char (nm_ip_config_get_addr_family (ip_data->ip_config)),
-				       ip_data->data->ifindex,
-				       skip ? "<SKIP>" : "",
-				       get_nameserver_list (ip_data->ip_config, &tmp_gstring));
-			}
-
-			if (!skip)
-				merge_one_ip_config (&rc, ip_data->data->ifindex, ip_data->ip_config);
-		}
-	}
-
-	/* 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_is_valid (AF_UNSPEC, priv->hostname)) {
-			hostdomain++;
-			if (domain_is_valid (hostdomain, TRUE))
-				add_string_item (rc.searches, hostdomain, TRUE);
-			else if (domain_is_valid (priv->hostname, TRUE))
-				add_string_item (rc.searches, priv->hostname, TRUE);
-		}
-	}
-
-	if (rc.has_trust_ad == NM_TERNARY_TRUE)
-		g_ptr_array_add (rc.options, g_strdup (NM_SETTING_DNS_OPTION_TRUST_AD));
-
-	*out_searches = _ptrarray_to_strv (rc.searches);
-	*out_options = _ptrarray_to_strv (rc.options);
-	*out_nameservers = _ptrarray_to_strv (rc.nameservers);
-	*out_nis_servers = _ptrarray_to_strv (rc.nis_servers);
-	*out_nis_domain = rc.nis_domain;
+    NMDnsManagerPrivate *priv;
+    NMResolvConfData     rc = {
+        .nameservers  = g_ptr_array_new(),
+        .searches     = g_ptr_array_new(),
+        .options      = g_ptr_array_new(),
+        .nis_domain   = NULL,
+        .nis_servers  = g_ptr_array_new(),
+        .has_trust_ad = NM_TERNARY_DEFAULT,
+    };
+
+    priv = NM_DNS_MANAGER_GET_PRIVATE(self);
+
+    if (global_config)
+        merge_global_dns_config(&rc, global_config);
+    else {
+        nm_auto_free_gstring GString *tmp_gstring = NULL;
+        int                           prio, first_prio = 0;
+        const NMDnsIPConfigData *     ip_data;
+        const CList *                 head;
+        gboolean                      is_first = TRUE;
+
+        head = _ip_config_lst_head(self);
+        c_list_for_each_entry (ip_data, head, ip_config_lst) {
+            gboolean skip = FALSE;
+
+            _ASSERT_ip_config_data(ip_data);
+
+            prio = nm_ip_config_get_dns_priority(ip_data->ip_config);
+
+            if (is_first) {
+                is_first   = FALSE;
+                first_prio = prio;
+            } else if (first_prio < 0 && first_prio != prio)
+                skip = TRUE;
+
+            if (nm_ip_config_get_num_nameservers(ip_data->ip_config)) {
+                _LOGT(
+                    "config: %8d %-7s v%c %-5d %s: %s",
+                    prio,
+                    _config_type_to_string(ip_data->ip_config_type),
+                    nm_utils_addr_family_to_char(nm_ip_config_get_addr_family(ip_data->ip_config)),
+                    ip_data->data->ifindex,
+                    skip ? "<SKIP>" : "",
+                    get_nameserver_list(ip_data->ip_config, &tmp_gstring));
+            }
+
+            if (!skip)
+                merge_one_ip_config(&rc, ip_data->data->ifindex, ip_data->ip_config);
+        }
+    }
+
+    /* 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_is_valid(AF_UNSPEC, priv->hostname)) {
+            hostdomain++;
+            if (domain_is_valid(hostdomain, TRUE))
+                add_string_item(rc.searches, hostdomain, TRUE);
+            else if (domain_is_valid(priv->hostname, TRUE))
+                add_string_item(rc.searches, priv->hostname, TRUE);
+        }
+    }
+
+    if (rc.has_trust_ad == NM_TERNARY_TRUE)
+        g_ptr_array_add(rc.options, g_strdup(NM_SETTING_DNS_OPTION_TRUST_AD));
+
+    *out_searches    = _ptrarray_to_strv(rc.searches);
+    *out_options     = _ptrarray_to_strv(rc.options);
+    *out_nameservers = _ptrarray_to_strv(rc.nameservers);
+    *out_nis_servers = _ptrarray_to_strv(rc.nis_servers);
+    *out_nis_domain  = rc.nis_domain;
 }
 
 static char **
-get_ip_rdns_domains (NMIPConfig *ip_config)
+get_ip_rdns_domains(NMIPConfig *ip_config)
 {
-	int addr_family = nm_ip_config_get_addr_family (ip_config);
-	char **strv;
-	GPtrArray *domains = NULL;
-	NMDedupMultiIter ipconf_iter;
+    int              addr_family = nm_ip_config_get_addr_family(ip_config);
+    char **          strv;
+    GPtrArray *      domains = NULL;
+    NMDedupMultiIter ipconf_iter;
 
-	nm_assert_addr_family (addr_family);
+    nm_assert_addr_family(addr_family);
 
-	domains = g_ptr_array_sized_new (5);
+    domains = g_ptr_array_sized_new(5);
 
-	if (addr_family == AF_INET) {
-		NMIP4Config *ip4 = (gpointer) ip_config;
-		const NMPlatformIP4Address *address;
-		const NMPlatformIP4Route *route;
+    if (addr_family == AF_INET) {
+        NMIP4Config *               ip4 = (gpointer) ip_config;
+        const NMPlatformIP4Address *address;
+        const NMPlatformIP4Route *  route;
 
-		nm_ip_config_iter_ip4_address_for_each (&ipconf_iter, ip4, &address)
-			nm_utils_get_reverse_dns_domains_ip4 (address->address, address->plen, domains);
+        nm_ip_config_iter_ip4_address_for_each (&ipconf_iter, ip4, &address)
+            nm_utils_get_reverse_dns_domains_ip4(address->address, address->plen, domains);
 
-		nm_ip_config_iter_ip4_route_for_each (&ipconf_iter, ip4, &route) {
-			if (!NM_PLATFORM_IP_ROUTE_IS_DEFAULT (route))
-				nm_utils_get_reverse_dns_domains_ip4 (route->network, route->plen, domains);
-		}
-	} else {
-		NMIP6Config *ip6 = (gpointer) ip_config;
-		const NMPlatformIP6Address *address;
-		const NMPlatformIP6Route *route;
+        nm_ip_config_iter_ip4_route_for_each (&ipconf_iter, ip4, &route) {
+            if (!NM_PLATFORM_IP_ROUTE_IS_DEFAULT(route))
+                nm_utils_get_reverse_dns_domains_ip4(route->network, route->plen, domains);
+        }
+    } else {
+        NMIP6Config *               ip6 = (gpointer) ip_config;
+        const NMPlatformIP6Address *address;
+        const NMPlatformIP6Route *  route;
 
-		nm_ip_config_iter_ip6_address_for_each (&ipconf_iter, ip6, &address)
-			nm_utils_get_reverse_dns_domains_ip6 (&address->address, address->plen, domains);
+        nm_ip_config_iter_ip6_address_for_each (&ipconf_iter, ip6, &address)
+            nm_utils_get_reverse_dns_domains_ip6(&address->address, address->plen, domains);
 
-		nm_ip_config_iter_ip6_route_for_each (&ipconf_iter, ip6, &route) {
-			if (!NM_PLATFORM_IP_ROUTE_IS_DEFAULT (route))
-				nm_utils_get_reverse_dns_domains_ip6 (&route->network, route->plen, domains);
-		}
-	}
+        nm_ip_config_iter_ip6_route_for_each (&ipconf_iter, ip6, &route) {
+            if (!NM_PLATFORM_IP_ROUTE_IS_DEFAULT(route))
+                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);
+    /* 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));
+    /* 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);
+    return _nm_utils_strv_cleanup(strv, FALSE, FALSE, TRUE);
 }
 
 /* Check if the domain is shadowed by a parent domain with more negative priority */
 static gboolean
-domain_is_shadowed (GHashTable *ht,
-                    const char *domain,
-                    int priority,
-                    const char **out_parent,
-                    int *out_parent_priority)
+domain_is_shadowed(GHashTable * ht,
+                   const char * domain,
+                   int          priority,
+                   const char **out_parent,
+                   int *        out_parent_priority)
 {
-	char *parent;
-	int parent_priority;
-
-	if (!ht)
-		return FALSE;
-
-	nm_assert (!g_hash_table_contains (ht, domain));
-
-	parent_priority = GPOINTER_TO_INT (g_hash_table_lookup (ht, ""));
-	if (   parent_priority < 0
-	    && parent_priority < priority) {
-		*out_parent = "";
-		*out_parent_priority = parent_priority;
-		return TRUE;
-	}
-
-	parent = strchr (domain, '.');
-	while (   parent
-	       && parent[1]) {
-		parent++;
-		parent_priority = GPOINTER_TO_INT (g_hash_table_lookup (ht, parent));
-		if (   parent_priority < 0
-		    && parent_priority < priority) {
-			*out_parent = parent;
-			*out_parent_priority = parent_priority;
-			return TRUE;
-		}
-		parent = strchr (parent, '.');
-	}
-
-	return FALSE;
+    char *parent;
+    int   parent_priority;
+
+    if (!ht)
+        return FALSE;
+
+    nm_assert(!g_hash_table_contains(ht, domain));
+
+    parent_priority = GPOINTER_TO_INT(g_hash_table_lookup(ht, ""));
+    if (parent_priority < 0 && parent_priority < priority) {
+        *out_parent          = "";
+        *out_parent_priority = parent_priority;
+        return TRUE;
+    }
+
+    parent = strchr(domain, '.');
+    while (parent && parent[1]) {
+        parent++;
+        parent_priority = GPOINTER_TO_INT(g_hash_table_lookup(ht, parent));
+        if (parent_priority < 0 && parent_priority < priority) {
+            *out_parent          = parent;
+            *out_parent_priority = parent_priority;
+            return TRUE;
+        }
+        parent = strchr(parent, '.');
+    }
+
+    return FALSE;
 }
 
 static void
-rebuild_domain_lists (NMDnsManager *self)
+rebuild_domain_lists(NMDnsManager *self)
 {
-	NMDnsIPConfigData *ip_data;
-	gs_unref_hashtable GHashTable *ht = NULL;
-	gboolean default_route_found = FALSE;
-	CList *head;
-
-	head = _ip_config_lst_head (self);
-	c_list_for_each_entry (ip_data, head, ip_config_lst) {
-		NMIPConfig *ip_config = ip_data->ip_config;
-
-		if (!nm_ip_config_get_num_nameservers (ip_config))
-			continue;
-		if (nm_ip_config_best_default_route_get (ip_config)) {
-			default_route_found = TRUE;
-			break;
-		}
-	}
-
-	c_list_for_each_entry (ip_data, head, ip_config_lst) {
-		NMIPConfig *ip_config = ip_data->ip_config;
-		int priority;
-		const char **domains;
-		guint n_searches;
-		guint n_domains;
-		guint num_dom1;
-		guint num_dom2;
-		guint cap_dom;
-		guint i;
-
-		if (!nm_ip_config_get_num_nameservers (ip_config))
-			continue;
-
-		n_searches = nm_ip_config_get_num_searches (ip_config);
-		n_domains = nm_ip_config_get_num_domains (ip_config);
-
-		priority = nm_ip_config_get_dns_priority (ip_config);
-		nm_assert (priority != 0);
-
-		cap_dom = 2u + NM_MAX (n_domains, n_searches);
-
-		g_free (ip_data->domains.search);
-		domains = g_new (const char *, cap_dom);
-		ip_data->domains.search = domains;
-
-		num_dom1 = 0;
-
-		/* Add wildcard lookup domain to connections with the default route.
-		 * If there is no default route, add the wildcard domain to all non-VPN
-		 * connections */
-		if (default_route_found) {
-			/* FIXME: this heuristic of which device has a default route does
-			 * not work with policy routing (as used by default with WireGuard).
-			 * We should have a more stable mechanism where an NMIPConfig indicates
-			 * whether it is suitable for certain operations (like having an automatically
-			 * added "~" domain). */
-			if (nm_ip_config_best_default_route_get (ip_config))
-				domains[num_dom1++] = "~";
-		} else {
-			if (ip_data->ip_config_type != NM_DNS_IP_CONFIG_TYPE_VPN)
-				domains[num_dom1++] = "~";
-		}
-
-		/* searches are preferred over domains */
-		if (n_searches > 0) {
-			for (i = 0; i < n_searches; i++)
-				domains[num_dom1++] = nm_ip_config_get_search (ip_config, i);
-		} else {
-			for (i = 0; i < n_domains; i++)
-				domains[num_dom1++] = nm_ip_config_get_domain (ip_config, i);
-		}
-
-		nm_assert (num_dom1 < cap_dom);
-
-		num_dom2 = 0;
-		for (i = 0; i < num_dom1; i++) {
-			const char *domain_clean;
-			const char *parent;
-			int old_priority;
-			int parent_priority;
-
-			domain_clean = nm_utils_parse_dns_domain (domains[i], NULL);
-
-			/* Remove domains with lower priority */
-			old_priority = GPOINTER_TO_INT (nm_g_hash_table_lookup (ht, domain_clean));
-			if (old_priority != 0) {
-				if (old_priority < priority) {
-					_LOGT ("plugin: drop domain '%s' (i=%d, p=%d) because it already exists with p=%d",
-					       domains[i], ip_data->data->ifindex,
-					       priority, old_priority);
-					continue;
-				}
-			} else if (domain_is_shadowed (ht, domain_clean, priority, &parent, &parent_priority)) {
-				_LOGT ("plugin: drop domain '%s' (i=%d, p=%d) shadowed by '%s' (p=%d)",
-				       domains[i],
-				       ip_data->data->ifindex, priority,
-				       parent, parent_priority);
-				continue;
-			}
-
-			_LOGT ("plugin: add domain '%s' (i=%d, p=%d)", domains[i], ip_data->data->ifindex, priority);
-			if (!ht)
-				ht = g_hash_table_new (nm_str_hash, g_str_equal);
-			g_hash_table_insert (ht, (gpointer) domain_clean, GINT_TO_POINTER (priority));
-			domains[num_dom2++] = domains[i];
-		}
-		nm_assert (num_dom2 < cap_dom);
-		domains[num_dom2] = NULL;
-
-		g_strfreev (ip_data->domains.reverse);
-		ip_data->domains.reverse = get_ip_rdns_domains (ip_config);
-	}
+    NMDnsIPConfigData *ip_data;
+    gs_unref_hashtable GHashTable *ht                  = NULL;
+    gboolean                       default_route_found = FALSE;
+    CList *                        head;
+
+    head = _ip_config_lst_head(self);
+    c_list_for_each_entry (ip_data, head, ip_config_lst) {
+        NMIPConfig *ip_config = ip_data->ip_config;
+
+        if (!nm_ip_config_get_num_nameservers(ip_config))
+            continue;
+        if (nm_ip_config_best_default_route_get(ip_config)) {
+            default_route_found = TRUE;
+            break;
+        }
+    }
+
+    c_list_for_each_entry (ip_data, head, ip_config_lst) {
+        NMIPConfig * ip_config = ip_data->ip_config;
+        int          priority;
+        const char **domains;
+        guint        n_searches;
+        guint        n_domains;
+        guint        num_dom1;
+        guint        num_dom2;
+        guint        cap_dom;
+        guint        i;
+
+        if (!nm_ip_config_get_num_nameservers(ip_config))
+            continue;
+
+        n_searches = nm_ip_config_get_num_searches(ip_config);
+        n_domains  = nm_ip_config_get_num_domains(ip_config);
+
+        priority = nm_ip_config_get_dns_priority(ip_config);
+        nm_assert(priority != 0);
+
+        cap_dom = 2u + NM_MAX(n_domains, n_searches);
+
+        g_free(ip_data->domains.search);
+        domains                 = g_new(const char *, cap_dom);
+        ip_data->domains.search = domains;
+
+        num_dom1 = 0;
+
+        /* Add wildcard lookup domain to connections with the default route.
+         * If there is no default route, add the wildcard domain to all non-VPN
+         * connections */
+        if (default_route_found) {
+            /* FIXME: this heuristic of which device has a default route does
+             * not work with policy routing (as used by default with WireGuard).
+             * We should have a more stable mechanism where an NMIPConfig indicates
+             * whether it is suitable for certain operations (like having an automatically
+             * added "~" domain). */
+            if (nm_ip_config_best_default_route_get(ip_config))
+                domains[num_dom1++] = "~";
+        } else {
+            if (ip_data->ip_config_type != NM_DNS_IP_CONFIG_TYPE_VPN)
+                domains[num_dom1++] = "~";
+        }
+
+        /* searches are preferred over domains */
+        if (n_searches > 0) {
+            for (i = 0; i < n_searches; i++)
+                domains[num_dom1++] = nm_ip_config_get_search(ip_config, i);
+        } else {
+            for (i = 0; i < n_domains; i++)
+                domains[num_dom1++] = nm_ip_config_get_domain(ip_config, i);
+        }
+
+        nm_assert(num_dom1 < cap_dom);
+
+        num_dom2 = 0;
+        for (i = 0; i < num_dom1; i++) {
+            const char *domain_clean;
+            const char *parent;
+            int         old_priority;
+            int         parent_priority;
+
+            domain_clean = nm_utils_parse_dns_domain(domains[i], NULL);
+
+            /* Remove domains with lower priority */
+            old_priority = GPOINTER_TO_INT(nm_g_hash_table_lookup(ht, domain_clean));
+            if (old_priority != 0) {
+                if (old_priority < priority) {
+                    _LOGT(
+                        "plugin: drop domain '%s' (i=%d, p=%d) because it already exists with p=%d",
+                        domains[i],
+                        ip_data->data->ifindex,
+                        priority,
+                        old_priority);
+                    continue;
+                }
+            } else if (domain_is_shadowed(ht, domain_clean, priority, &parent, &parent_priority)) {
+                _LOGT("plugin: drop domain '%s' (i=%d, p=%d) shadowed by '%s' (p=%d)",
+                      domains[i],
+                      ip_data->data->ifindex,
+                      priority,
+                      parent,
+                      parent_priority);
+                continue;
+            }
+
+            _LOGT("plugin: add domain '%s' (i=%d, p=%d)",
+                  domains[i],
+                  ip_data->data->ifindex,
+                  priority);
+            if (!ht)
+                ht = g_hash_table_new(nm_str_hash, g_str_equal);
+            g_hash_table_insert(ht, (gpointer) domain_clean, GINT_TO_POINTER(priority));
+            domains[num_dom2++] = domains[i];
+        }
+        nm_assert(num_dom2 < cap_dom);
+        domains[num_dom2] = NULL;
+
+        g_strfreev(ip_data->domains.reverse);
+        ip_data->domains.reverse = get_ip_rdns_domains(ip_config);
+    }
 }
 
 static void
-clear_domain_lists (NMDnsManager *self)
+clear_domain_lists(NMDnsManager *self)
 {
-	NMDnsIPConfigData *ip_data;
-	CList *head;
-
-	head = _ip_config_lst_head (self);
-	c_list_for_each_entry (ip_data, head, ip_config_lst) {
-		nm_clear_g_free (&ip_data->domains.search);
-		nm_clear_pointer (&ip_data->domains.reverse, g_strfreev);
-	}
+    NMDnsIPConfigData *ip_data;
+    CList *            head;
+
+    head = _ip_config_lst_head(self);
+    c_list_for_each_entry (ip_data, head, ip_config_lst) {
+        nm_clear_g_free(&ip_data->domains.search);
+        nm_clear_pointer(&ip_data->domains.reverse, g_strfreev);
+    }
 }
 
 static gboolean
-update_dns (NMDnsManager *self,
-            gboolean no_caching,
-            GError **error)
+update_dns(NMDnsManager *self, gboolean no_caching, GError **error)
 {
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-	const char *nis_domain = NULL;
-	gs_strfreev char **searches = NULL;
-	gs_strfreev char **options = NULL;
-	gs_strfreev char **nameservers = NULL;
-	gs_strfreev char **nis_servers = NULL;
-	gboolean caching = FALSE;
-	gboolean do_update = TRUE;
-	gboolean resolv_conf_updated = FALSE;
-	SpawnResult result = SR_SUCCESS;
-	NMConfigData *data;
-	NMGlobalDnsConfig *global_config;
-	gs_free_error GError *local_error = NULL;
-	GError **const p_local_error =   error
-	                               ? &local_error
-	                               : NULL;
-
-	nm_assert (!error || !*error);
-
-	if (priv->is_stopped) {
-		_LOGD ("update-dns: not updating resolv.conf (is stopped)");
-		return TRUE;
-	}
-
-	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)) {
-		do_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);
-
-	/* Update hash with config we're applying */
-	compute_hash (self, global_config, priv->hash);
-
-	_collect_resolv_conf_data (self, global_config,
-	                           &searches, &options, &nameservers,
-	                           &nis_servers, &nis_domain);
-
-	if (priv->plugin || priv->sd_resolve_plugin)
-		rebuild_domain_lists (self);
-
-	if (priv->sd_resolve_plugin) {
-		nm_dns_plugin_update (priv->sd_resolve_plugin,
-		                      global_config,
-		                      _ip_config_lst_head (self),
-		                      priv->hostname,
-		                      NULL);
-	}
-
-	/* Let any plugins do their thing first */
-	if (priv->plugin) {
-		NMDnsPlugin *plugin = priv->plugin;
-		const char *plugin_name = nm_dns_plugin_get_name (plugin);
-		gs_free_error GError *plugin_error = NULL;
-
-		if (nm_dns_plugin_is_caching (plugin)) {
-			if (no_caching) {
-				_LOGD ("update-dns: plugin %s ignored (caching disabled)",
-				       plugin_name);
-				goto plugin_skip;
-			}
-			caching = TRUE;
-		}
-
-		_LOGD ("update-dns: updating plugin %s", plugin_name);
-		if (!nm_dns_plugin_update (plugin,
-		                           global_config,
-		                           _ip_config_lst_head (self),
-		                           priv->hostname,
-		                           &plugin_error)) {
-			_LOGW ("update-dns: plugin %s update failed: %s", plugin_name, plugin_error->message);
-
-			/* If the plugin failed to update, we shouldn't write out a local
-			 * caching DNS configuration to resolv.conf.
-			 */
-			caching = FALSE;
-		}
-
-plugin_skip:
-		;
-	}
-
-	/* Clear the generated search list as it points to
-	 * strings owned by IP configurations and we can't
-	 * guarantee they stay alive. */
-	clear_domain_lists (self);
-
-	update_resolv_conf_no_stub (self,
-	                            NM_CAST_STRV_CC (searches),
-	                            NM_CAST_STRV_CC (nameservers),
-	                            NM_CAST_STRV_CC (options));
-
-	/* 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) {
-		const char *lladdr = "127.0.0.1";
-
-		if (NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) {
-			/* systemd-resolved uses a different link-local address */
-			lladdr = "127.0.0.53";
-		}
-
-		g_strfreev (nameservers);
-		nameservers = g_new0 (char *, 2);
-		nameservers[0] = g_strdup (lladdr);
-	}
-
-	if (do_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,
-			                             NM_CAST_STRV_CC (searches),
-			                             NM_CAST_STRV_CC (nameservers),
-			                             NM_CAST_STRV_CC (options),
-			                             p_local_error,
-			                             priv->rc_manager);
-			resolv_conf_updated = TRUE;
-			/* If we have ended with no nameservers avoid updating again resolv.conf
-			 * on stop, as some external changes may be applied to it in the meanwhile */
-			if (!nameservers && !options)
-				priv->dns_touched = FALSE;
-			break;
-		case NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF:
-			result = dispatch_resolvconf (self,
-			                              searches,
-			                              nameservers,
-			                              options,
-			                              p_local_error);
-			break;
-		case NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG:
-			result = dispatch_netconfig (self,
-			                             (const char *const*) searches,
-			                             (const char *const*) nameservers,
-			                             nis_domain,
-			                             (const char *const*) nis_servers,
-			                             p_local_error);
-			break;
-		default:
-			nm_assert_not_reached ();
-		}
-
-		if (result == SR_NOTFOUND) {
-			_LOGD ("update-dns: program not available, writing to resolv.conf");
-			g_clear_error (&local_error);
-			result = update_resolv_conf (self,
-			                             NM_CAST_STRV_CC (searches),
-			                             NM_CAST_STRV_CC (nameservers),
-			                             NM_CAST_STRV_CC (options),
-			                             p_local_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,
-		                    NM_CAST_STRV_CC (searches),
-		                    NM_CAST_STRV_CC (nameservers),
-		                    NM_CAST_STRV_CC (options),
-		                    NULL,
-		                    NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED);
-	}
-
-	/* signal that resolv.conf was changed */
-	if (   do_update
-	    && result == SR_SUCCESS)
-		g_signal_emit (self, signals[CONFIG_CHANGED], 0);
-
-	nm_clear_pointer (&priv->config_variant, g_variant_unref);
-	_notify (self, PROP_CONFIGURATION);
-
-	if (result != SR_SUCCESS) {
-		if (error)
-			g_propagate_error (error, g_steal_pointer (&local_error));
-		return FALSE;
-	}
-
-	nm_assert (!local_error);
-	return TRUE;
+    NMDnsManagerPrivate *priv                = NM_DNS_MANAGER_GET_PRIVATE(self);
+    const char *         nis_domain          = NULL;
+    gs_strfreev char **  searches            = NULL;
+    gs_strfreev char **  options             = NULL;
+    gs_strfreev char **  nameservers         = NULL;
+    gs_strfreev char **  nis_servers         = NULL;
+    gboolean             caching             = FALSE;
+    gboolean             do_update           = TRUE;
+    gboolean             resolv_conf_updated = FALSE;
+    SpawnResult          result              = SR_SUCCESS;
+    NMConfigData *       data;
+    NMGlobalDnsConfig *  global_config;
+    gs_free_error GError *local_error   = NULL;
+    GError **const        p_local_error = error ? &local_error : NULL;
+
+    nm_assert(!error || !*error);
+
+    if (priv->is_stopped) {
+        _LOGD("update-dns: not updating resolv.conf (is stopped)");
+        return TRUE;
+    }
+
+    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)) {
+        do_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);
+
+    /* Update hash with config we're applying */
+    compute_hash(self, global_config, priv->hash);
+
+    _collect_resolv_conf_data(self,
+                              global_config,
+                              &searches,
+                              &options,
+                              &nameservers,
+                              &nis_servers,
+                              &nis_domain);
+
+    if (priv->plugin || priv->sd_resolve_plugin)
+        rebuild_domain_lists(self);
+
+    if (priv->sd_resolve_plugin) {
+        nm_dns_plugin_update(priv->sd_resolve_plugin,
+                             global_config,
+                             _ip_config_lst_head(self),
+                             priv->hostname,
+                             NULL);
+    }
+
+    /* Let any plugins do their thing first */
+    if (priv->plugin) {
+        NMDnsPlugin * plugin               = priv->plugin;
+        const char *  plugin_name          = nm_dns_plugin_get_name(plugin);
+        gs_free_error GError *plugin_error = NULL;
+
+        if (nm_dns_plugin_is_caching(plugin)) {
+            if (no_caching) {
+                _LOGD("update-dns: plugin %s ignored (caching disabled)", plugin_name);
+                goto plugin_skip;
+            }
+            caching = TRUE;
+        }
+
+        _LOGD("update-dns: updating plugin %s", plugin_name);
+        if (!nm_dns_plugin_update(plugin,
+                                  global_config,
+                                  _ip_config_lst_head(self),
+                                  priv->hostname,
+                                  &plugin_error)) {
+            _LOGW("update-dns: plugin %s update failed: %s", plugin_name, plugin_error->message);
+
+            /* If the plugin failed to update, we shouldn't write out a local
+             * caching DNS configuration to resolv.conf.
+             */
+            caching = FALSE;
+        }
+
+plugin_skip:;
+    }
+
+    /* Clear the generated search list as it points to
+     * strings owned by IP configurations and we can't
+     * guarantee they stay alive. */
+    clear_domain_lists(self);
+
+    update_resolv_conf_no_stub(self,
+                               NM_CAST_STRV_CC(searches),
+                               NM_CAST_STRV_CC(nameservers),
+                               NM_CAST_STRV_CC(options));
+
+    /* 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) {
+        const char *lladdr = "127.0.0.1";
+
+        if (NM_IS_DNS_SYSTEMD_RESOLVED(priv->plugin)) {
+            /* systemd-resolved uses a different link-local address */
+            lladdr = "127.0.0.53";
+        }
+
+        g_strfreev(nameservers);
+        nameservers    = g_new0(char *, 2);
+        nameservers[0] = g_strdup(lladdr);
+    }
+
+    if (do_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,
+                                        NM_CAST_STRV_CC(searches),
+                                        NM_CAST_STRV_CC(nameservers),
+                                        NM_CAST_STRV_CC(options),
+                                        p_local_error,
+                                        priv->rc_manager);
+            resolv_conf_updated = TRUE;
+            /* If we have ended with no nameservers avoid updating again resolv.conf
+             * on stop, as some external changes may be applied to it in the meanwhile */
+            if (!nameservers && !options)
+                priv->dns_touched = FALSE;
+            break;
+        case NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF:
+            result = dispatch_resolvconf(self, searches, nameservers, options, p_local_error);
+            break;
+        case NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG:
+            result = dispatch_netconfig(self,
+                                        (const char *const *) searches,
+                                        (const char *const *) nameservers,
+                                        nis_domain,
+                                        (const char *const *) nis_servers,
+                                        p_local_error);
+            break;
+        default:
+            nm_assert_not_reached();
+        }
+
+        if (result == SR_NOTFOUND) {
+            _LOGD("update-dns: program not available, writing to resolv.conf");
+            g_clear_error(&local_error);
+            result              = update_resolv_conf(self,
+                                        NM_CAST_STRV_CC(searches),
+                                        NM_CAST_STRV_CC(nameservers),
+                                        NM_CAST_STRV_CC(options),
+                                        p_local_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,
+                           NM_CAST_STRV_CC(searches),
+                           NM_CAST_STRV_CC(nameservers),
+                           NM_CAST_STRV_CC(options),
+                           NULL,
+                           NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED);
+    }
+
+    /* signal that resolv.conf was changed */
+    if (do_update && result == SR_SUCCESS)
+        g_signal_emit(self, signals[CONFIG_CHANGED], 0);
+
+    nm_clear_pointer(&priv->config_variant, g_variant_unref);
+    _notify(self, PROP_CONFIGURATION);
+
+    if (result != SR_SUCCESS) {
+        if (error)
+            g_propagate_error(error, g_steal_pointer(&local_error));
+        return FALSE;
+    }
+
+    nm_assert(!local_error);
+    return TRUE;
 }
 
 /*****************************************************************************/
 
 static void
-_ip_config_dns_priority_changed (gpointer config,
-                                 GParamSpec *pspec,
-                                 NMDnsIPConfigData *ip_data)
+_ip_config_dns_priority_changed(gpointer config, GParamSpec *pspec, NMDnsIPConfigData *ip_data)
 {
-	_ASSERT_ip_config_data (ip_data);
+    _ASSERT_ip_config_data(ip_data);
 
-	NM_DNS_MANAGER_GET_PRIVATE (ip_data->data->self)->ip_config_lst_need_sort = TRUE;
+    NM_DNS_MANAGER_GET_PRIVATE(ip_data->data->self)->ip_config_lst_need_sort = TRUE;
 }
 
 gboolean
-nm_dns_manager_set_ip_config (NMDnsManager *self,
-                              NMIPConfig *ip_config,
-                              NMDnsIPConfigType ip_config_type)
+nm_dns_manager_set_ip_config(NMDnsManager *    self,
+                             NMIPConfig *      ip_config,
+                             NMDnsIPConfigType ip_config_type)
 {
-	NMDnsManagerPrivate *priv;
-	NMDnsIPConfigData *ip_data;
-	NMDnsConfigData *data;
-	int ifindex;
-	NMDnsIPConfigData **p_best;
-
-	g_return_val_if_fail (NM_IS_DNS_MANAGER (self), FALSE);
-	g_return_val_if_fail (NM_IS_IP_CONFIG (ip_config, AF_UNSPEC), FALSE);
-
-	ifindex = nm_ip_config_get_ifindex (ip_config);
-	g_return_val_if_fail (ifindex > 0, FALSE);
-
-	priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-
-	data = g_hash_table_lookup (priv->configs, GINT_TO_POINTER (ifindex));
-	if (!data)
-		ip_data = NULL;
-	else
-		ip_data = _config_data_find_ip_config (data, ip_config);
-
-	if (ip_config_type == NM_DNS_IP_CONFIG_TYPE_REMOVED) {
-		if (!ip_data)
-			return FALSE;
-		if (priv->best_ip_config_4 == ip_data)
-			priv->best_ip_config_4 = NULL;
-		if (priv->best_ip_config_6 == ip_data)
-			priv->best_ip_config_6 = NULL;
-		/* deleting a config doesn't invalidate the configs' sort order. */
-		_ip_config_data_free (ip_data);
-		if (c_list_is_empty (&data->data_lst_head))
-			g_hash_table_remove (priv->configs, GINT_TO_POINTER (ifindex));
-		goto changed;
-	}
-
-	if (   ip_data
-	    && ip_data->ip_config_type == ip_config_type) {
-		/* nothing to do. */
-		return FALSE;
-	}
-
-	if (!data) {
-		data = g_slice_new0 (NMDnsConfigData);
-		data->ifindex = ifindex;
-		data->self = self;
-		c_list_init (&data->data_lst_head);
-		_ASSERT_config_data (data);
-		g_hash_table_insert (priv->configs, GINT_TO_POINTER (ifindex), data);
-	}
-
-	if (!ip_data)
-		ip_data = _ip_config_data_new (data, ip_config, ip_config_type);
-	else
-		ip_data->ip_config_type = ip_config_type;
-
-	priv->ip_config_lst_need_sort = TRUE;
-
-	p_best = NM_IS_IP4_CONFIG (ip_config)
-	         ? &priv->best_ip_config_4
-	         : &priv->best_ip_config_6;
-
-	if (ip_config_type == NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE) {
-		/* Only one best-device per IP version is allowed */
-		if (*p_best != ip_data) {
-			if (*p_best)
-				(*p_best)->ip_config_type = NM_DNS_IP_CONFIG_TYPE_DEFAULT;
-			*p_best = ip_data;
-		}
-	} else {
-		if (*p_best == ip_data)
-			*p_best = NULL;
-	}
+    NMDnsManagerPrivate *priv;
+    NMDnsIPConfigData *  ip_data;
+    NMDnsConfigData *    data;
+    int                  ifindex;
+    NMDnsIPConfigData ** p_best;
+
+    g_return_val_if_fail(NM_IS_DNS_MANAGER(self), FALSE);
+    g_return_val_if_fail(NM_IS_IP_CONFIG(ip_config), FALSE);
+
+    ifindex = nm_ip_config_get_ifindex(ip_config);
+    g_return_val_if_fail(ifindex > 0, FALSE);
+
+    priv = NM_DNS_MANAGER_GET_PRIVATE(self);
+
+    data = g_hash_table_lookup(priv->configs, GINT_TO_POINTER(ifindex));
+    if (!data)
+        ip_data = NULL;
+    else
+        ip_data = _config_data_find_ip_config(data, ip_config);
+
+    if (ip_config_type == NM_DNS_IP_CONFIG_TYPE_REMOVED) {
+        if (!ip_data)
+            return FALSE;
+        if (priv->best_ip_config_4 == ip_data)
+            priv->best_ip_config_4 = NULL;
+        if (priv->best_ip_config_6 == ip_data)
+            priv->best_ip_config_6 = NULL;
+        /* deleting a config doesn't invalidate the configs' sort order. */
+        _ip_config_data_free(ip_data);
+        if (c_list_is_empty(&data->data_lst_head))
+            g_hash_table_remove(priv->configs, GINT_TO_POINTER(ifindex));
+        goto changed;
+    }
+
+    if (ip_data && ip_data->ip_config_type == ip_config_type) {
+        /* nothing to do. */
+        return FALSE;
+    }
+
+    if (!data) {
+        data          = g_slice_new0(NMDnsConfigData);
+        data->ifindex = ifindex;
+        data->self    = self;
+        c_list_init(&data->data_lst_head);
+        _ASSERT_config_data(data);
+        g_hash_table_insert(priv->configs, GINT_TO_POINTER(ifindex), data);
+    }
+
+    if (!ip_data)
+        ip_data = _ip_config_data_new(data, ip_config, ip_config_type);
+    else
+        ip_data->ip_config_type = ip_config_type;
+
+    priv->ip_config_lst_need_sort = TRUE;
+
+    p_best = NM_IS_IP4_CONFIG(ip_config) ? &priv->best_ip_config_4 : &priv->best_ip_config_6;
+
+    if (ip_config_type == NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE) {
+        /* Only one best-device per IP version is allowed */
+        if (*p_best != ip_data) {
+            if (*p_best)
+                (*p_best)->ip_config_type = NM_DNS_IP_CONFIG_TYPE_DEFAULT;
+            *p_best = ip_data;
+        }
+    } else {
+        if (*p_best == ip_data)
+            *p_best = NULL;
+    }
 
 changed:
-	if (!priv->updates_queue) {
-		gs_free_error GError *error = NULL;
+    if (!priv->updates_queue) {
+        gs_free_error GError *error = NULL;
 
-		if (!update_dns (self, FALSE, &error))
-			_LOGW ("could not commit DNS changes: %s", error->message);
-	}
+        if (!update_dns(self, FALSE, &error))
+            _LOGW("could not commit DNS changes: %s", error->message);
+    }
 
-	return TRUE;
+    return TRUE;
 }
 
 void
-nm_dns_manager_set_initial_hostname (NMDnsManager *self,
-                                     const char *hostname)
+nm_dns_manager_set_initial_hostname(NMDnsManager *self, const char *hostname)
 {
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
+    NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE(self);
 
-	g_free (priv->hostname);
-	priv->hostname = g_strdup (hostname);
+    g_free(priv->hostname);
+    priv->hostname = g_strdup(hostname);
 }
 
 void
-nm_dns_manager_set_hostname (NMDnsManager *self,
-                             const char *hostname,
-                             gboolean skip_update)
+nm_dns_manager_set_hostname(NMDnsManager *self, const char *hostname, gboolean skip_update)
 {
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-	const char *filtered = NULL;
+    NMDnsManagerPrivate *priv     = NM_DNS_MANAGER_GET_PRIVATE(self);
+    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;
-	}
+    /* 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;
+    if ((!priv->hostname && !filtered)
+        || (priv->hostname && filtered && !strcmp(priv->hostname, filtered)))
+        return;
 
-	g_free (priv->hostname);
-	priv->hostname = g_strdup (filtered);
+    g_free(priv->hostname);
+    priv->hostname = g_strdup(filtered);
 
-	if (skip_update)
-		return;
+    if (skip_update)
+        return;
 
-	if (!priv->updates_queue) {
-		gs_free_error GError *error = NULL;
+    if (!priv->updates_queue) {
+        gs_free_error GError *error = NULL;
 
-		if (!update_dns (self, FALSE, &error))
-			_LOGW ("could not commit DNS changes: %s", error->message);
-	}
+        if (!update_dns(self, FALSE, &error))
+            _LOGW("could not commit DNS changes: %s", error->message);
+    }
 }
 
 void
-nm_dns_manager_begin_updates (NMDnsManager *self, const char *func)
+nm_dns_manager_begin_updates(NMDnsManager *self, const char *func)
 {
-	NMDnsManagerPrivate *priv;
+    NMDnsManagerPrivate *priv;
 
-	g_return_if_fail (self != NULL);
-	priv = NM_DNS_MANAGER_GET_PRIVATE (self);
+    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));
+    /* 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++;
+    priv->updates_queue++;
 
-	_LOGD ("(%s): queueing DNS updates (%d)", func, priv->updates_queue);
+    _LOGD("(%s): queueing DNS updates (%d)", func, priv->updates_queue);
 }
 
 void
-nm_dns_manager_end_updates (NMDnsManager *self, const char *func)
+nm_dns_manager_end_updates(NMDnsManager *self, const char *func)
 {
-	NMDnsManagerPrivate *priv;
-	gs_free_error GError *error = NULL;
-	gboolean changed;
-	guint8 new[HASH_LEN];
+    NMDnsManagerPrivate *priv;
+    gs_free_error GError *error = NULL;
+    gboolean              changed;
+    guint8 new[HASH_LEN];
 
-	g_return_if_fail (self != NULL);
+    g_return_if_fail(self != NULL);
 
-	priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-	g_return_if_fail (priv->updates_queue > 0);
+    priv = NM_DNS_MANAGER_GET_PRIVATE(self);
+    g_return_if_fail(priv->updates_queue > 0);
 
-	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");
+    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;
-	}
+    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);
+    /* 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);
 
-	memset (priv->prev_hash, 0, sizeof (priv->prev_hash));
+    memset(priv->prev_hash, 0, sizeof(priv->prev_hash));
 }
 
 void
-nm_dns_manager_stop (NMDnsManager *self)
+nm_dns_manager_stop(NMDnsManager *self)
 {
-	NMDnsManagerPrivate *priv;
+    NMDnsManagerPrivate *priv;
 
-	priv = NM_DNS_MANAGER_GET_PRIVATE (self);
+    priv = NM_DNS_MANAGER_GET_PRIVATE(self);
 
-	if (priv->is_stopped)
-		g_return_if_reached ();
+    if (priv->is_stopped)
+        g_return_if_reached();
 
-	_LOGT ("stopping...");
+    _LOGT("stopping...");
 
-	/* If we're quitting, leave a valid resolv.conf in place, not one
-	 * pointing to 127.0.0.1 if dnsmasq was active.  But if we haven't
-	 * done any DNS updates yet, there's no reason to touch resolv.conf
-	 * on shutdown.
-	 */
-	if (   priv->dns_touched
-	    && priv->plugin
-	    && NM_IS_DNS_DNSMASQ (priv->plugin)) {
-		gs_free_error GError *error = NULL;
+    /* If we're quitting, leave a valid resolv.conf in place, not one
+     * pointing to 127.0.0.1 if dnsmasq was active.  But if we haven't
+     * done any DNS updates yet, there's no reason to touch resolv.conf
+     * on shutdown.
+     */
+    if (priv->dns_touched && priv->plugin && NM_IS_DNS_DNSMASQ(priv->plugin)) {
+        gs_free_error GError *error = NULL;
 
-		if (!update_dns (self, TRUE, &error))
-			_LOGW ("could not commit DNS changes on shutdown: %s", error->message);
+        if (!update_dns(self, TRUE, &error))
+            _LOGW("could not commit DNS changes on shutdown: %s", error->message);
 
-		priv->dns_touched = FALSE;
-	}
+        priv->dns_touched = FALSE;
+    }
 
-	priv->is_stopped = TRUE;
+    priv->is_stopped = TRUE;
 }
 
 /*****************************************************************************/
 
 static gboolean
-_clear_plugin (NMDnsManager *self)
+_clear_plugin(NMDnsManager *self)
 {
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
+    NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE(self);
 
-	priv->plugin_ratelimit.ts = 0;
-	nm_clear_g_source (&priv->plugin_ratelimit.timer);
+    priv->plugin_ratelimit.ts = 0;
+    nm_clear_g_source(&priv->plugin_ratelimit.timer);
 
-	if (priv->plugin) {
-		nm_dns_plugin_stop (priv->plugin);
-		g_clear_object (&priv->plugin);
-		return TRUE;
-	}
-	return FALSE;
+    if (priv->plugin) {
+        nm_dns_plugin_stop(priv->plugin);
+        g_clear_object(&priv->plugin);
+        return TRUE;
+    }
+    return FALSE;
 }
 
 static NMDnsManagerResolvConfManager
-_check_resconf_immutable (NMDnsManagerResolvConfManager rc_manager)
+_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);
-			nm_close (fd);
-		}
-		return immutable ? NM_DNS_MANAGER_RESOLV_CONF_MAN_IMMUTABLE : 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:
+            case NM_DNS_MANAGER_RESOLV_CONF_MAN_AUTO:
+                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);
+            nm_close(fd);
+        }
+        return immutable ? NM_DNS_MANAGER_RESOLV_CONF_MAN_IMMUTABLE : rc_manager;
+    }
 }
 
 static gboolean
-_resolvconf_resolved_managed (void)
+_resolvconf_resolved_managed(void)
 {
-	static const char *const RESOLVED_PATHS[] = {
-		"../run/systemd/resolve/stub-resolv.conf",
-		"../run/systemd/resolve/resolv.conf",
-		"../lib/systemd/resolv.conf",
-		"../usr/lib/systemd/resolv.conf",
-		"/run/systemd/resolve/stub-resolv.conf",
-		"/run/systemd/resolve/resolv.conf",
-		"/lib/systemd/resolv.conf",
-		"/usr/lib/systemd/resolv.conf",
-	};
-	struct stat st, st_test;
-	guint i;
-
-	if (lstat (_PATH_RESCONF, &st) != 0)
-		return FALSE;
-
-	if (S_ISLNK (st.st_mode)) {
-		gs_free char *full_path = NULL;
-		nm_auto_free char *real_path = NULL;
-
-		/* see if resolv.conf is a symlink with a target that is
-		 * exactly like one of the candidates.
-		 *
-		 * This check will work for symlinks, even if the target
-		 * does not exist and realpath() cannot resolve anything.
-		 *
-		 * We want to handle that, because systemd-resolved might not
-		 * have started yet. */
-		full_path = g_file_read_link (_PATH_RESCONF, NULL);
-		if (nm_utils_strv_find_first ((char **) RESOLVED_PATHS,
-		                              G_N_ELEMENTS (RESOLVED_PATHS),
-		                              full_path) >= 0)
-			return TRUE;
-
-		/* see if resolv.conf is a symlink that resolves exactly one
-		 * of the candidate paths.
-		 *
-		 * This check will work for symlinks that can be resolved
-		 * to a realpath, but the actual file might not exist.
-		 *
-		 * We want to handle that, because systemd-resolved might not
-		 * have started yet. */
-		real_path = realpath (_PATH_RESCONF, NULL);
-		if (nm_utils_strv_find_first ((char **) RESOLVED_PATHS,
-		                              G_N_ELEMENTS (RESOLVED_PATHS),
-		                              real_path) >= 0)
-			return TRUE;
-
-		/* fall-through and resolve the symlink, to check the file
-		 * it points to (below).
-		 *
-		 * This check is the most reliable, but it only works if
-		 * systemd-resolved already started and created the file. */
-		if (stat (_PATH_RESCONF, &st) != 0)
-			return FALSE;
-	}
-
-	/* see if resolv.conf resolves to one of the candidate
-	 * paths (or whether it is hard-linked). */
-	for (i = 0; i < G_N_ELEMENTS (RESOLVED_PATHS); i++) {
-		const char *p = RESOLVED_PATHS[i];
-
-		if (   p[0] == '/'
-		    && stat (p, &st_test) == 0
-		    && st.st_dev == st_test.st_dev
-		    && st.st_ino == st_test.st_ino)
-			return TRUE;
-	}
-
-	return FALSE;
+    static const char *const RESOLVED_PATHS[] = {
+        "../run/systemd/resolve/stub-resolv.conf",
+        "../run/systemd/resolve/resolv.conf",
+        "../lib/systemd/resolv.conf",
+        "../usr/lib/systemd/resolv.conf",
+        "/run/systemd/resolve/stub-resolv.conf",
+        "/run/systemd/resolve/resolv.conf",
+        "/lib/systemd/resolv.conf",
+        "/usr/lib/systemd/resolv.conf",
+    };
+    struct stat st, st_test;
+    guint       i;
+
+    if (lstat(_PATH_RESCONF, &st) != 0)
+        return FALSE;
+
+    if (S_ISLNK(st.st_mode)) {
+        gs_free char *     full_path = NULL;
+        nm_auto_free char *real_path = NULL;
+
+        /* see if resolv.conf is a symlink with a target that is
+         * exactly like one of the candidates.
+         *
+         * This check will work for symlinks, even if the target
+         * does not exist and realpath() cannot resolve anything.
+         *
+         * We want to handle that, because systemd-resolved might not
+         * have started yet. */
+        full_path = g_file_read_link(_PATH_RESCONF, NULL);
+        if (nm_utils_strv_find_first((char **) RESOLVED_PATHS,
+                                     G_N_ELEMENTS(RESOLVED_PATHS),
+                                     full_path)
+            >= 0)
+            return TRUE;
+
+        /* see if resolv.conf is a symlink that resolves exactly one
+         * of the candidate paths.
+         *
+         * This check will work for symlinks that can be resolved
+         * to a realpath, but the actual file might not exist.
+         *
+         * We want to handle that, because systemd-resolved might not
+         * have started yet. */
+        real_path = realpath(_PATH_RESCONF, NULL);
+        if (nm_utils_strv_find_first((char **) RESOLVED_PATHS,
+                                     G_N_ELEMENTS(RESOLVED_PATHS),
+                                     real_path)
+            >= 0)
+            return TRUE;
+
+        /* fall-through and resolve the symlink, to check the file
+         * it points to (below).
+         *
+         * This check is the most reliable, but it only works if
+         * systemd-resolved already started and created the file. */
+        if (stat(_PATH_RESCONF, &st) != 0)
+            return FALSE;
+    }
+
+    /* see if resolv.conf resolves to one of the candidate
+     * paths (or whether it is hard-linked). */
+    for (i = 0; i < G_N_ELEMENTS(RESOLVED_PATHS); i++) {
+        const char *p = RESOLVED_PATHS[i];
+
+        if (p[0] == '/' && stat(p, &st_test) == 0 && st.st_dev == st_test.st_dev
+            && st.st_ino == st_test.st_ino)
+            return TRUE;
+    }
+
+    return FALSE;
 }
 
 static void
-init_resolv_conf_mode (NMDnsManager *self, gboolean force_reload_plugin)
+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 systemd_resolved;
-	gboolean param_changed = FALSE;
-	gboolean plugin_changed = FALSE;
-	gboolean systemd_resolved_changed = FALSE;
-
-	mode = nm_config_data_get_dns_mode (nm_config_get_data (priv->config));
-	systemd_resolved = nm_config_data_get_systemd_resolved (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));
+    NMDnsManagerPrivate *         priv = NM_DNS_MANAGER_GET_PRIVATE(self);
+    NMDnsManagerResolvConfManager rc_manager;
+    const char *                  mode;
+    gboolean                      systemd_resolved;
+    gboolean                      param_changed            = FALSE;
+    gboolean                      plugin_changed           = FALSE;
+    gboolean                      systemd_resolved_changed = FALSE;
+    gboolean                      rc_manager_was_auto      = FALSE;
+
+    mode             = nm_config_data_get_dns_mode(nm_config_get_data(priv->config));
+    systemd_resolved = nm_config_data_get_systemd_resolved(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_MAIN_RC_MANAGER);
-			}
-			man = ""NM_CONFIG_DEFAULT_MAIN_RC_MANAGER;
-			rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK;
-			goto again;
-		}
-	}
-
-	rc_manager = _check_resconf_immutable (rc_manager);
-
-	if (   (!mode && _resolvconf_resolved_managed ())
-	    || nm_streq0 (mode, "systemd-resolved")) {
-		if (   force_reload_plugin
-		    || !NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) {
-			_clear_plugin (self);
-			priv->plugin = nm_dns_systemd_resolved_new ();
-			plugin_changed = TRUE;
-		}
-		mode = "systemd-resolved";
-		systemd_resolved = FALSE;
-	} else 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;
-	}
-
-	/* The systemd-resolved plugin is special. We typically always want to keep
-	 * systemd-resolved up to date even if the configured plugin is different. */
-	if (systemd_resolved) {
-		if (!priv->sd_resolve_plugin) {
-			priv->sd_resolve_plugin = nm_dns_systemd_resolved_new ();
-			systemd_resolved_changed = TRUE;
-		}
-	} else if (nm_clear_g_object (&priv->sd_resolve_plugin))
-		systemd_resolved_changed = TRUE;
-
-	g_object_freeze_notify (G_OBJECT (self));
-
-	if (!nm_streq0 (priv->mode, mode)) {
-		g_free (priv->mode);
-		priv->mode = g_strdup (mode);
-		param_changed = TRUE;
-		_notify (self, PROP_MODE);
-	}
-
-	if (priv->rc_manager != rc_manager) {
-		priv->rc_manager = rc_manager;
-		param_changed = TRUE;
-		_notify (self, PROP_RC_MANAGER);
-	}
-
-	if (param_changed || plugin_changed || systemd_resolved_changed) {
-		_LOGI ("init: dns=%s%s rc-manager=%s%s%s%s",
-		       mode,
-		       (systemd_resolved ? ",systemd-resolved" : ""),
-		       _rc_manager_to_string (rc_manager),
-		       NM_PRINT_FMT_QUOTED (priv->plugin, ", plugin=",
-		                            nm_dns_plugin_get_name (priv->plugin), "", ""));
-	}
-
-	g_object_thaw_notify (G_OBJECT (self));
+        if (!man) {
+            /* nop */
+        } else if (nm_streq(man, "auto"))
+            rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_AUTO;
+        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_MAIN_RC_MANAGER);
+            }
+            man        = "" NM_CONFIG_DEFAULT_MAIN_RC_MANAGER;
+            rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_AUTO;
+            goto again;
+        }
+    }
+
+    rc_manager = _check_resconf_immutable(rc_manager);
+
+    if ((!mode && _resolvconf_resolved_managed()) || nm_streq0(mode, "systemd-resolved")) {
+        if (force_reload_plugin || !NM_IS_DNS_SYSTEMD_RESOLVED(priv->plugin)) {
+            _clear_plugin(self);
+            priv->plugin   = nm_dns_systemd_resolved_new();
+            plugin_changed = TRUE;
+        }
+        mode             = "systemd-resolved";
+        systemd_resolved = FALSE;
+    } else 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 (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_AUTO) {
+        rc_manager_was_auto = TRUE;
+        if (nm_streq(mode, "systemd-resolved"))
+            rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED;
+        else if (HAS_RESOLVCONF && g_file_test(RESOLVCONF_PATH, G_FILE_TEST_IS_EXECUTABLE)) {
+            /* We detect /sbin/resolvconf only at this stage. That means, if you install
+             * or uninstall openresolv afterwards, you need to reload the DNS settings
+             * (with SIGHUP or `systemctl reload NetworkManager.service`).
+             *
+             * We only accept resolvconf if NetworkManager was built with --with-resolvconf.
+             * For example, on Fedora the systemd package provides a compat resolvconf
+             * implementation for systemd-resolved. But using that never makes sense, because
+             * there we either use full systemd-resolved mode or not. In no case does it
+             * make sense to call that resolvconf implementation. */
+            rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF;
+        } else if (HAS_NETCONFIG && g_file_test(NETCONFIG_PATH, G_FILE_TEST_IS_EXECUTABLE)) {
+            /* Like for resolvconf, we detect only once. We only autoenable this
+             * option, if NetworkManager was built with netconfig explicitly enabled. */
+            rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG;
+        } else
+            rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK;
+    }
+
+    /* The systemd-resolved plugin is special. We typically always want to keep
+     * systemd-resolved up to date even if the configured plugin is different. */
+    if (systemd_resolved) {
+        if (!priv->sd_resolve_plugin) {
+            priv->sd_resolve_plugin  = nm_dns_systemd_resolved_new();
+            systemd_resolved_changed = TRUE;
+        }
+    } else if (nm_clear_g_object(&priv->sd_resolve_plugin))
+        systemd_resolved_changed = TRUE;
+
+    g_object_freeze_notify(G_OBJECT(self));
+
+    if (!nm_streq0(priv->mode, mode)) {
+        g_free(priv->mode);
+        priv->mode    = g_strdup(mode);
+        param_changed = TRUE;
+        _notify(self, PROP_MODE);
+    }
+
+    if (priv->rc_manager != rc_manager) {
+        priv->rc_manager = rc_manager;
+        param_changed    = TRUE;
+        _notify(self, PROP_RC_MANAGER);
+    }
+
+    if (param_changed || plugin_changed || systemd_resolved_changed) {
+        _LOGI("init: dns=%s%s rc-manager=%s%s%s%s%s",
+              mode,
+              (systemd_resolved ? ",systemd-resolved" : ""),
+              _rc_manager_to_string(rc_manager),
+              rc_manager_was_auto ? " (auto)" : "",
+              NM_PRINT_FMT_QUOTED(priv->plugin,
+                                  ", plugin=",
+                                  nm_dns_plugin_get_name(priv->plugin),
+                                  "",
+                                  ""));
+    }
+
+    g_object_thaw_notify(G_OBJECT(self));
 }
 
 static void
-config_changed_cb (NMConfig *config,
-                   NMConfigData *config_data,
-                   NMConfigChangeFlags changes,
-                   NMConfigData *old_data,
-                   NMDnsManager *self)
+config_changed_cb(NMConfig *          config,
+                  NMConfigData *      config_data,
+                  NMConfigChangeFlags changes,
+                  NMConfigData *      old_data,
+                  NMDnsManager *      self)
 {
-	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)) {
-		gs_free_error GError *error = NULL;
-
-		if (!update_dns (self, FALSE, &error))
-			_LOGW ("could not commit DNS changes: %s", error->message);
-	}
+    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)) {
+        gs_free_error GError *error = NULL;
+
+        if (!update_dns(self, FALSE, &error))
+            _LOGW("could not commit DNS changes: %s", error->message);
+    }
 }
 
 static GVariant *
-_get_global_config_variant (NMGlobalDnsConfig *global)
+_get_global_config_variant(NMGlobalDnsConfig *global)
 {
-	NMGlobalDnsDomain *domain;
-	GVariantBuilder builder;
-	guint i, num;
-
-	g_variant_builder_init (&builder, G_VARIANT_TYPE ("aa{sv}"));
-	num = nm_global_dns_config_get_num_domains (global);
-	for (i = 0; i < num; i++) {
-		GVariantBuilder conf_builder;
-		GVariantBuilder item_builder;
-		const char *domain_name;
-		const char * const *servers;
-
-		g_variant_builder_init (&conf_builder, G_VARIANT_TYPE ("a{sv}"));
-
-		domain = nm_global_dns_config_get_domain (global, i);
-		domain_name = nm_global_dns_domain_get_name (domain);
-
-		if (domain_name && !nm_streq0 (domain_name, "*")) {
-			g_variant_builder_init (&item_builder, G_VARIANT_TYPE ("as"));
-			g_variant_builder_add (&item_builder,
-			                       "s",
-			                       domain_name);
-			g_variant_builder_add (&conf_builder,
-			                       "{sv}",
-			                       "domains",
-			                       g_variant_builder_end (&item_builder));
-		}
-
-		g_variant_builder_init (&item_builder, G_VARIANT_TYPE ("as"));
-		for (servers = nm_global_dns_domain_get_servers (domain); *servers; servers++) {
-			g_variant_builder_add (&item_builder,
-			                       "s",
-			                       *servers);
-		}
-		g_variant_builder_add (&conf_builder,
-		                       "{sv}",
-		                       "nameservers",
-		                       g_variant_builder_end (&item_builder));
-
-		g_variant_builder_add (&conf_builder,
-		                       "{sv}",
-		                       "priority",
-		                       g_variant_new_int32 (NM_DNS_PRIORITY_DEFAULT_NORMAL));
-
-		g_variant_builder_add (&builder, "a{sv}", &conf_builder);
-	}
-
-	return g_variant_ref_sink (g_variant_builder_end (&builder));
+    NMGlobalDnsDomain *domain;
+    GVariantBuilder    builder;
+    guint              i, num;
+
+    g_variant_builder_init(&builder, G_VARIANT_TYPE("aa{sv}"));
+    num = nm_global_dns_config_get_num_domains(global);
+    for (i = 0; i < num; i++) {
+        GVariantBuilder    conf_builder;
+        GVariantBuilder    item_builder;
+        const char *       domain_name;
+        const char *const *servers;
+
+        g_variant_builder_init(&conf_builder, G_VARIANT_TYPE("a{sv}"));
+
+        domain      = nm_global_dns_config_get_domain(global, i);
+        domain_name = nm_global_dns_domain_get_name(domain);
+
+        if (domain_name && !nm_streq0(domain_name, "*")) {
+            g_variant_builder_init(&item_builder, G_VARIANT_TYPE("as"));
+            g_variant_builder_add(&item_builder, "s", domain_name);
+            g_variant_builder_add(&conf_builder,
+                                  "{sv}",
+                                  "domains",
+                                  g_variant_builder_end(&item_builder));
+        }
+
+        g_variant_builder_init(&item_builder, G_VARIANT_TYPE("as"));
+        for (servers = nm_global_dns_domain_get_servers(domain); *servers; servers++) {
+            g_variant_builder_add(&item_builder, "s", *servers);
+        }
+        g_variant_builder_add(&conf_builder,
+                              "{sv}",
+                              "nameservers",
+                              g_variant_builder_end(&item_builder));
+
+        g_variant_builder_add(&conf_builder,
+                              "{sv}",
+                              "priority",
+                              g_variant_new_int32(NM_DNS_PRIORITY_DEFAULT_NORMAL));
+
+        g_variant_builder_add(&builder, "a{sv}", &conf_builder);
+    }
+
+    return g_variant_ref_sink(g_variant_builder_end(&builder));
 }
 
 static GVariant *
-_get_config_variant (NMDnsManager *self)
+_get_config_variant(NMDnsManager *self)
 {
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-	NMGlobalDnsConfig *global_config;
-	gs_free char *str = NULL;
-	GVariantBuilder builder;
-	NMDnsIPConfigData *ip_data;
-	const CList *head;
-	gs_unref_ptrarray GPtrArray *array_domains = NULL;
-
-	if (priv->config_variant)
-		return priv->config_variant;
-
-	global_config = nm_config_data_get_global_dns_config (nm_config_get_data (priv->config));
-	if (global_config) {
-		priv->config_variant = _get_global_config_variant (global_config);
-		_LOGT ("current configuration: %s", (str = g_variant_print (priv->config_variant, TRUE)));
-		return priv->config_variant;
-	}
-
-	g_variant_builder_init (&builder, G_VARIANT_TYPE ("aa{sv}"));
-
-	head = _ip_config_lst_head (self);
-	c_list_for_each_entry (ip_data, head, ip_config_lst) {
-		const NMIPConfig *ip_config = ip_data->ip_config;
-		GVariantBuilder entry_builder;
-		GVariantBuilder strv_builder;
-		guint i, num;
-		const int addr_family = nm_ip_config_get_addr_family (ip_config);
-		char buf[NM_UTILS_INET_ADDRSTRLEN];
-		const NMIPAddr *addr;
-		const char *ifname;
-
-		num = nm_ip_config_get_num_nameservers (ip_config);
-		if (!num)
-			continue;
-
-		g_variant_builder_init (&entry_builder, G_VARIANT_TYPE ("a{sv}"));
-
-		g_variant_builder_init (&strv_builder, G_VARIANT_TYPE ("as"));
-		for (i = 0; i < num; i++) {
-			addr = nm_ip_config_get_nameserver (ip_config, i);
-			g_variant_builder_add (&strv_builder,
-			                       "s",
-			                       nm_utils_inet_ntop (addr_family, addr, buf));
-		}
-		g_variant_builder_add (&entry_builder,
-		                       "{sv}",
-		                       "nameservers",
-		                       g_variant_builder_end (&strv_builder));
-
-		num = nm_ip_config_get_num_domains (ip_config);
-		num += nm_ip_config_get_num_searches (ip_config);
-		if (num > 0) {
-			if (!array_domains)
-				array_domains = g_ptr_array_sized_new (num);
-			else
-				g_ptr_array_set_size (array_domains, 0);
-
-			add_dns_domains (array_domains, ip_config, TRUE, FALSE);
-			if (array_domains->len) {
-				g_variant_builder_init (&strv_builder, G_VARIANT_TYPE ("as"));
-				for (i = 0; i < array_domains->len; i++) {
-					g_variant_builder_add (&strv_builder,
-					                       "s",
-					                       array_domains->pdata[i]);
-				}
-				g_variant_builder_add (&entry_builder,
-				                       "{sv}",
-				                       "domains",
-				                       g_variant_builder_end (&strv_builder));
-			}
-		}
-
-		ifname = nm_platform_link_get_name (NM_PLATFORM_GET, ip_data->data->ifindex);
-		if (ifname) {
-			g_variant_builder_add (&entry_builder,
-			                       "{sv}",
-			                       "interface",
-			                       g_variant_new_string (ifname));
-		}
-
-		g_variant_builder_add (&entry_builder,
-		                       "{sv}",
-		                       "priority",
-		                       g_variant_new_int32 (nm_ip_config_get_dns_priority (ip_config)));
-
-		g_variant_builder_add (&entry_builder,
-		                       "{sv}",
-		                       "vpn",
-		                       g_variant_new_boolean (ip_data->ip_config_type == NM_DNS_IP_CONFIG_TYPE_VPN));
-
-		g_variant_builder_add (&builder, "a{sv}", &entry_builder);
-	}
-
-	priv->config_variant = g_variant_ref_sink (g_variant_builder_end (&builder));
-	_LOGT ("current configuration: %s", (str = g_variant_print (priv->config_variant, TRUE)));
-
-	return priv->config_variant;
+    NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE(self);
+    NMGlobalDnsConfig *  global_config;
+    gs_free char *       str = NULL;
+    GVariantBuilder      builder;
+    NMDnsIPConfigData *  ip_data;
+    const CList *        head;
+    gs_unref_ptrarray GPtrArray *array_domains = NULL;
+
+    if (priv->config_variant)
+        return priv->config_variant;
+
+    global_config = nm_config_data_get_global_dns_config(nm_config_get_data(priv->config));
+    if (global_config) {
+        priv->config_variant = _get_global_config_variant(global_config);
+        _LOGT("current configuration: %s", (str = g_variant_print(priv->config_variant, TRUE)));
+        return priv->config_variant;
+    }
+
+    g_variant_builder_init(&builder, G_VARIANT_TYPE("aa{sv}"));
+
+    head = _ip_config_lst_head(self);
+    c_list_for_each_entry (ip_data, head, ip_config_lst) {
+        const NMIPConfig *ip_config = ip_data->ip_config;
+        GVariantBuilder   entry_builder;
+        GVariantBuilder   strv_builder;
+        guint             i, num;
+        const int         addr_family = nm_ip_config_get_addr_family(ip_config);
+        char              buf[NM_UTILS_INET_ADDRSTRLEN];
+        const NMIPAddr *  addr;
+        const char *      ifname;
+
+        num = nm_ip_config_get_num_nameservers(ip_config);
+        if (!num)
+            continue;
+
+        g_variant_builder_init(&entry_builder, G_VARIANT_TYPE("a{sv}"));
+
+        g_variant_builder_init(&strv_builder, G_VARIANT_TYPE("as"));
+        for (i = 0; i < num; i++) {
+            addr = nm_ip_config_get_nameserver(ip_config, i);
+            g_variant_builder_add(&strv_builder, "s", nm_utils_inet_ntop(addr_family, addr, buf));
+        }
+        g_variant_builder_add(&entry_builder,
+                              "{sv}",
+                              "nameservers",
+                              g_variant_builder_end(&strv_builder));
+
+        num = nm_ip_config_get_num_domains(ip_config);
+        num += nm_ip_config_get_num_searches(ip_config);
+        if (num > 0) {
+            if (!array_domains)
+                array_domains = g_ptr_array_sized_new(num);
+            else
+                g_ptr_array_set_size(array_domains, 0);
+
+            add_dns_domains(array_domains, ip_config, TRUE, FALSE);
+            if (array_domains->len) {
+                g_variant_builder_init(&strv_builder, G_VARIANT_TYPE("as"));
+                for (i = 0; i < array_domains->len; i++) {
+                    g_variant_builder_add(&strv_builder, "s", array_domains->pdata[i]);
+                }
+                g_variant_builder_add(&entry_builder,
+                                      "{sv}",
+                                      "domains",
+                                      g_variant_builder_end(&strv_builder));
+            }
+        }
+
+        ifname = nm_platform_link_get_name(NM_PLATFORM_GET, ip_data->data->ifindex);
+        if (ifname) {
+            g_variant_builder_add(&entry_builder,
+                                  "{sv}",
+                                  "interface",
+                                  g_variant_new_string(ifname));
+        }
+
+        g_variant_builder_add(&entry_builder,
+                              "{sv}",
+                              "priority",
+                              g_variant_new_int32(nm_ip_config_get_dns_priority(ip_config)));
+
+        g_variant_builder_add(
+            &entry_builder,
+            "{sv}",
+            "vpn",
+            g_variant_new_boolean(ip_data->ip_config_type == NM_DNS_IP_CONFIG_TYPE_VPN));
+
+        g_variant_builder_add(&builder, "a{sv}", &entry_builder);
+    }
+
+    priv->config_variant = g_variant_ref_sink(g_variant_builder_end(&builder));
+    _LOGT("current configuration: %s", (str = g_variant_print(priv->config_variant, TRUE)));
+
+    return priv->config_variant;
 }
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-	NMDnsManager *self = NM_DNS_MANAGER (object);
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-
-	switch (prop_id) {
-	case PROP_MODE:
-		g_value_set_string (value, priv->mode);
-		break;
-	case PROP_RC_MANAGER:
-		g_value_set_string (value, _rc_manager_to_string (priv->rc_manager));
-		break;
-	case PROP_CONFIGURATION:
-		g_value_set_variant (value, _get_config_variant (self));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+    NMDnsManager *       self = NM_DNS_MANAGER(object);
+    NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE(self);
+
+    switch (prop_id) {
+    case PROP_MODE:
+        g_value_set_string(value, priv->mode);
+        break;
+    case PROP_RC_MANAGER:
+        g_value_set_string(value, _rc_manager_to_string(priv->rc_manager));
+        break;
+    case PROP_CONFIGURATION:
+        g_value_set_variant(value, _get_config_variant(self));
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        break;
+    }
 }
 
 static void
-nm_dns_manager_init (NMDnsManager *self)
+nm_dns_manager_init(NMDnsManager *self)
 {
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
+    NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE(self);
 
-	_LOGT ("creating...");
+    _LOGT("creating...");
 
-	c_list_init (&priv->ip_config_lst_head);
+    c_list_init(&priv->ip_config_lst_head);
 
-	priv->config = g_object_ref (nm_config_get ());
+    priv->config = g_object_ref(nm_config_get());
 
-	priv->configs = g_hash_table_new_full (nm_direct_hash, NULL,
-	                                       NULL, (GDestroyNotify) _config_data_free);
+    priv->configs =
+        g_hash_table_new_full(nm_direct_hash, NULL, NULL, (GDestroyNotify) _config_data_free);
 
-	/* Set the initial hash */
-	compute_hash (self, NULL, NM_DNS_MANAGER_GET_PRIVATE (self)->hash);
+    /* 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);
+    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)
+dispose(GObject *object)
 {
-	NMDnsManager *self = NM_DNS_MANAGER (object);
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
-	NMDnsIPConfigData *ip_data, *ip_data_safe;
+    NMDnsManager *       self = NM_DNS_MANAGER(object);
+    NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE(self);
+    NMDnsIPConfigData *  ip_data, *ip_data_safe;
 
-	_LOGT ("disposing");
+    _LOGT("disposing");
 
-	if (!priv->is_stopped)
-		nm_dns_manager_stop (self);
+    if (!priv->is_stopped)
+        nm_dns_manager_stop(self);
 
-	if (priv->config)
-		g_signal_handlers_disconnect_by_func (priv->config, config_changed_cb, self);
+    if (priv->config)
+        g_signal_handlers_disconnect_by_func(priv->config, config_changed_cb, self);
 
-	g_clear_object (&priv->sd_resolve_plugin);
-	_clear_plugin (self);
+    g_clear_object(&priv->sd_resolve_plugin);
+    _clear_plugin(self);
 
-	priv->best_ip_config_4 = NULL;
-	priv->best_ip_config_6 = NULL;
+    priv->best_ip_config_4 = NULL;
+    priv->best_ip_config_6 = NULL;
 
-	c_list_for_each_entry_safe (ip_data, ip_data_safe, &priv->ip_config_lst_head, ip_config_lst)
-		_ip_config_data_free (ip_data);
+    c_list_for_each_entry_safe (ip_data, ip_data_safe, &priv->ip_config_lst_head, ip_config_lst)
+        _ip_config_data_free(ip_data);
 
-	nm_clear_pointer (&priv->configs, g_hash_table_destroy);
+    nm_clear_pointer(&priv->configs, g_hash_table_destroy);
 
-	nm_clear_g_source (&priv->plugin_ratelimit.timer);
+    nm_clear_g_source(&priv->plugin_ratelimit.timer);
 
-	g_clear_object (&priv->config);
+    g_clear_object(&priv->config);
 
-	G_OBJECT_CLASS (nm_dns_manager_parent_class)->dispose (object);
+    G_OBJECT_CLASS(nm_dns_manager_parent_class)->dispose(object);
 
-	nm_clear_pointer (&priv->config_variant, g_variant_unref);
+    nm_clear_pointer(&priv->config_variant, g_variant_unref);
 }
 
 static void
-finalize (GObject *object)
+finalize(GObject *object)
 {
-	NMDnsManager *self = NM_DNS_MANAGER (object);
-	NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self);
+    NMDnsManager *       self = NM_DNS_MANAGER(object);
+    NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE(self);
 
-	g_free (priv->hostname);
-	g_free (priv->mode);
+    g_free(priv->hostname);
+    g_free(priv->mode);
 
-	G_OBJECT_CLASS (nm_dns_manager_parent_class)->finalize (object);
+    G_OBJECT_CLASS(nm_dns_manager_parent_class)->finalize(object);
 }
 
 static const NMDBusInterfaceInfoExtended interface_info_dns_manager = {
-	.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT (
-		NM_DBUS_INTERFACE_DNS_MANAGER,
-		.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS (
-			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Mode",          "s",      NM_DNS_MANAGER_MODE),
-			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("RcManager",     "s",      NM_DNS_MANAGER_RC_MANAGER),
-			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("Configuration", "aa{sv}", NM_DNS_MANAGER_CONFIGURATION),
-		),
-	),
+    .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
+        NM_DBUS_INTERFACE_DNS_MANAGER,
+        .properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
+            NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Mode", "s", NM_DNS_MANAGER_MODE),
+            NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("RcManager",
+                                                             "s",
+                                                             NM_DNS_MANAGER_RC_MANAGER),
+            NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L("Configuration",
+                                                             "aa{sv}",
+                                                             NM_DNS_MANAGER_CONFIGURATION), ), ),
 };
 
 static void
-nm_dns_manager_class_init (NMDnsManagerClass *klass)
+nm_dns_manager_class_init(NMDnsManagerClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	NMDBusObjectClass *dbus_object_class = NM_DBUS_OBJECT_CLASS (klass);
-
-	object_class->dispose = dispose;
-	object_class->finalize = finalize;
-	object_class->get_property = get_property;
-
-	dbus_object_class->export_path = NM_DBUS_EXPORT_PATH_STATIC (NM_DBUS_PATH "/DnsManager");
-	dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_dns_manager);
-	dbus_object_class->export_on_construction = TRUE;
-
-	obj_properties[PROP_MODE] =
-	    g_param_spec_string (NM_DNS_MANAGER_MODE, "", "",
-	                         NULL,
-	                         G_PARAM_READABLE |
-	                         G_PARAM_STATIC_STRINGS);
-
-	obj_properties[PROP_RC_MANAGER] =
-	    g_param_spec_string (NM_DNS_MANAGER_RC_MANAGER, "", "",
-	                         NULL,
-	                         G_PARAM_READABLE |
-	                         G_PARAM_STATIC_STRINGS);
-
-	obj_properties[PROP_CONFIGURATION] =
-	    g_param_spec_variant (NM_DNS_MANAGER_CONFIGURATION, "", "",
-	                          G_VARIANT_TYPE ("aa{sv}"),
-	                          NULL,
-	                          G_PARAM_READABLE |
-	                          G_PARAM_STATIC_STRINGS);
-
-	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
-
-	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);
+    GObjectClass *     object_class      = G_OBJECT_CLASS(klass);
+    NMDBusObjectClass *dbus_object_class = NM_DBUS_OBJECT_CLASS(klass);
+
+    object_class->dispose      = dispose;
+    object_class->finalize     = finalize;
+    object_class->get_property = get_property;
+
+    dbus_object_class->export_path     = NM_DBUS_EXPORT_PATH_STATIC(NM_DBUS_PATH "/DnsManager");
+    dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS(&interface_info_dns_manager);
+    dbus_object_class->export_on_construction = TRUE;
+
+    obj_properties[PROP_MODE] = g_param_spec_string(NM_DNS_MANAGER_MODE,
+                                                    "",
+                                                    "",
+                                                    NULL,
+                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+    obj_properties[PROP_RC_MANAGER] =
+        g_param_spec_string(NM_DNS_MANAGER_RC_MANAGER,
+                            "",
+                            "",
+                            NULL,
+                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+    obj_properties[PROP_CONFIGURATION] =
+        g_param_spec_variant(NM_DNS_MANAGER_CONFIGURATION,
+                             "",
+                             "",
+                             G_VARIANT_TYPE("aa{sv}"),
+                             NULL,
+                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+    g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
+
+    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);
 }