From 20eb6df2158490bed4efc53d14cf72eabf015051 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 4 Jan 2022 19:05:21 +0100
Subject: [PATCH] core: simplify code in nm_dns_manager_set_hostname()

---
 src/core/dns/nm-dns-manager.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/core/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c
index 4e7a4a5424..8a8ab9eb06 100644
--- a/src/core/dns/nm-dns-manager.c
+++ b/src/core/dns/nm-dns-manager.c
@@ -2001,22 +2001,18 @@ nm_dns_manager_set_initial_hostname(NMDnsManager *self, const char *hostname)
 void
 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);
 
     /* 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;
-    }
+        /* pass */
+    } else
+        hostname = NULL;
 
-    if ((!priv->hostname && !filtered)
-        || (priv->hostname && filtered && !strcmp(priv->hostname, filtered)))
+    if (!nm_strdup_reset(&priv->hostname, hostname))
         return;
 
-    g_free(priv->hostname);
-    priv->hostname = g_strdup(filtered);
-
     if (skip_update)
         return;