From 50f6b47074e01dffb8dc536c0a20961dcf28ae9b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 7 Feb 2018 02:39:23 +0100 Subject: New upstream version 1.10.4 --- libnm-util/nm-setting-vpn.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'libnm-util') diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c index f0d7ecf5..e47fe394 100644 --- a/libnm-util/nm-setting-vpn.c +++ b/libnm-util/nm-setting-vpn.c @@ -616,17 +616,15 @@ need_secrets (NMSetting *setting) } static gboolean -compare_one_secret (NMSettingVPN *a, - NMSettingVPN *b, - NMSettingCompareFlags flags) +_compare_secrets (NMSettingVPN *a, + NMSettingVPN *b, + NMSettingCompareFlags flags) { - GHashTable *a_secrets, *b_secrets; + GHashTable *a_secrets; GHashTableIter iter; const char *key, *val; a_secrets = NM_SETTING_VPN_GET_PRIVATE (a)->secrets; - b_secrets = NM_SETTING_VPN_GET_PRIVATE (b)->secrets; - g_hash_table_iter_init (&iter, a_secrets); while (g_hash_table_iter_next (&iter, (gpointer) &key, (gpointer) &val)) { NMSettingSecretFlags a_secret_flags = NM_SETTING_SECRET_FLAG_NONE; @@ -655,6 +653,19 @@ compare_one_secret (NMSettingVPN *a, return TRUE; } +static gboolean +compare_one_secret (NMSettingVPN *a, + NMSettingVPN *b, + NMSettingCompareFlags flags) +{ + if (!_compare_secrets (a, b, flags)) + return FALSE; + if (!_compare_secrets (b, a, flags)) + return FALSE; + + return TRUE; +} + static gboolean compare_property (NMSetting *setting, NMSetting *other, -- cgit 1.3.0-6-gf8a5