dns: consider the dns-type and the priority when hashing DNS configsbg/dns-1.40

The dns-type must be included in the hash because it contributes to
the generated composite configuration. Without this, when the type of
a configuration changes (e.g. from DEFAULT to BEST), the DNS manager
would determine that there was no change and it wouldn't call
update_dns().

https://bugzilla.redhat.com/show_bug.cgi?id=2161957

Fixes: 8995d44a0bae ('core: compare the DNS configurations before updating DNS')
(cherry picked from commit 46ccc82a81146132e4bc9c6cc96d7b8b2305f85f)
(cherry picked from commit 2a0f41af0356abdc6e91be24ea7b5ad51d1bc314)

3 files changed, 45 insertions, 8 deletions

diff --git a/src/core/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c
index 5bba561a54..416a9bf915 100644
--- a/src/core/dns/nm-dns-manager.c
+++ b/src/core/dns/nm-dns-manager.c
@@ -1207,8 +1207,12 @@ compute_hash(NMDnsManager *self, const NMGlobalDnsConfig *global, guint8 buffer[
         /* FIXME(ip-config-checksum): this relies on the fact that an IP
          * configuration without DNS parameters gives a zero checksum. */
         head = _mgr_get_ip_data_lst_head(self);
-        c_list_for_each_entry (ip_data, head, ip_data_lst)
-            nm_l3_config_data_hash_dns(ip_data->l3cd, sum, ip_data->addr_family);
+        c_list_for_each_entry (ip_data, head, ip_data_lst) {
+            nm_l3_config_data_hash_dns(ip_data->l3cd,
+                                       sum,
+                                       ip_data->addr_family,
+                                       ip_data->ip_config_type);
+        }
     }
 
     nm_utils_checksum_get_digest_len(sum, buffer, HASH_LEN);
diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c
index f7ec43a5ef..19f1d79930 100644
--- a/src/core/nm-l3-config-data.c
+++ b/src/core/nm-l3-config-data.c
@@ -3023,7 +3023,10 @@ nm_l3_config_data_new_from_platform(NMDedupMultiIndex        *multi_idx,
 /*****************************************************************************/
 
 void
-nm_l3_config_data_hash_dns(const NML3ConfigData *l3cd, GChecksum *sum, int addr_family)
+nm_l3_config_data_hash_dns(const NML3ConfigData *l3cd,
+                           GChecksum            *sum,
+                           int                   addr_family,
+                           NMDnsIPConfigType     dns_ip_config_type)
 {
     guint              i;
     int                val;
@@ -3037,6 +3040,7 @@ nm_l3_config_data_hash_dns(const NML3ConfigData *l3cd, GChecksum *sum, int addr_
     guint              num_domains;
     guint              num_searches;
     guint              num_options;
+    gboolean           empty = TRUE;
 
     g_return_if_fail(l3cd);
     g_return_if_fail(sum);
@@ -3046,40 +3050,66 @@ nm_l3_config_data_hash_dns(const NML3ConfigData *l3cd, GChecksum *sum, int addr_
         g_checksum_update(sum,
                           nameservers,
                           num_nameservers * nm_utils_addr_family_to_size(addr_family));
+        empty = FALSE;
     }
 
     if (addr_family == AF_INET) {
         wins = nm_l3_config_data_get_wins(l3cd, &num_wins);
-        for (i = 0; i < num_wins; i++)
+        for (i = 0; i < num_wins; i++) {
             g_checksum_update(sum, (guint8 *) &wins[i], 4);
+            empty = FALSE;
+        }
     }
 
     domains = nm_l3_config_data_get_domains(l3cd, addr_family, &num_domains);
     for (i = 0; i < num_domains; i++) {
         g_checksum_update(sum, (const guint8 *) domains[i], strlen(domains[i]));
+        empty = FALSE;
     }
 
     searches = nm_l3_config_data_get_searches(l3cd, addr_family, &num_searches);
     for (i = 0; i < num_searches; i++) {
         g_checksum_update(sum, (const guint8 *) searches[i], strlen(searches[i]));
+        empty = FALSE;
     }
 
     options = nm_l3_config_data_get_dns_options(l3cd, addr_family, &num_options);
     for (i = 0; i < num_options; i++) {
         g_checksum_update(sum, (const guint8 *) options[i], strlen(options[i]));
+        empty = FALSE;
     }
 
     val = nm_l3_config_data_get_mdns(l3cd);
-    if (val != NM_SETTING_CONNECTION_MDNS_DEFAULT)
+    if (val != NM_SETTING_CONNECTION_MDNS_DEFAULT) {
         g_checksum_update(sum, (const guint8 *) &val, sizeof(val));
+        empty = FALSE;
+    }
 
     val = nm_l3_config_data_get_llmnr(l3cd);
-    if (val != NM_SETTING_CONNECTION_LLMNR_DEFAULT)
+    if (val != NM_SETTING_CONNECTION_LLMNR_DEFAULT) {
         g_checksum_update(sum, (const guint8 *) &val, sizeof(val));
+        empty = FALSE;
+    }
 
     val = nm_l3_config_data_get_dns_over_tls(l3cd);
-    if (val != NM_SETTING_CONNECTION_DNS_OVER_TLS_DEFAULT)
+    if (val != NM_SETTING_CONNECTION_DNS_OVER_TLS_DEFAULT) {
         g_checksum_update(sum, (const guint8 *) &val, sizeof(val));
+        empty = FALSE;
+    }
+
+    if (!empty) {
+        int prio = 0;
+
+        /* In the DNS manager we rely on the fact that an empty (i.e. without
+         * any name server, domain, option, etc. parameters) configuration
+         * has a zero checksum. This is needed to avoid rewriting resolv.conf
+         * when not needed. Since the dns-type and the priority are always
+         * present, hash them only when the rest of configuration is not empty.
+         */
+        g_checksum_update(sum, (const guint8 *) &dns_ip_config_type, sizeof(dns_ip_config_type));
+        nm_l3_config_data_get_dns_priority(l3cd, addr_family, &prio);
+        g_checksum_update(sum, (const guint8 *) &prio, sizeof(prio));
+    }
 
     /* FIXME(ip-config-checksum): the DNS priority should be considered relevant
      * and added into the checksum as well, but this can't be done right now
diff --git a/src/core/nm-l3-config-data.h b/src/core/nm-l3-config-data.h
index 1da5d701d2..01735125dc 100644
--- a/src/core/nm-l3-config-data.h
+++ b/src/core/nm-l3-config-data.h
@@ -600,6 +600,9 @@ nmtst_l3_config_data_get_best_gateway(const NML3ConfigData *self, int addr_famil
     return nm_platform_ip_route_get_gateway(addr_family, NMP_OBJECT_CAST_IP_ROUTE(rt));
 }
 
-void nm_l3_config_data_hash_dns(const NML3ConfigData *l3cd, GChecksum *sum, int addr_family);
+void nm_l3_config_data_hash_dns(const NML3ConfigData *l3cd,
+                                GChecksum            *sum,
+                                int                   addr_family,
+                                NMDnsIPConfigType     dns_ip_config_type);
 
 #endif /* __NM_L3_CONFIG_DATA_H__ */