From fd496fd887be2de50954e5654c35607159583a21 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 3 Apr 2016 14:34:58 +0200 Subject: [PATCH] dns-manager: fix compute_hash() to skip over duplicate other configs Fixes: f76aa4f77c8b6ca7f532b6e6e698844127671ae7 --- src/dns-manager/nm-dns-manager.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index ec83e600d5..8f325c91a9 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -748,10 +748,10 @@ compute_hash (NMDnsManager *self, const NMGlobalDnsConfig *global, guint8 buffer /* add any other configs we know about */ for (iter = priv->configs; iter; iter = g_slist_next (iter)) { - if ( (iter->data == priv->ip4_vpn_config) - && (iter->data == priv->ip4_device_config) - && (iter->data == priv->ip6_vpn_config) - && (iter->data == priv->ip6_device_config)) + if (NM_IN_SET (iter->data, priv->ip4_vpn_config, + priv->ip4_device_config, + priv->ip6_vpn_config, + priv->ip6_device_config)) continue; if (NM_IS_IP4_CONFIG (iter->data))