From 5c79b900b59a5ad162ecc836e424468207ff031e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 6 Aug 2019 22:46:20 +0200 Subject: New upstream version 1.20.0 --- libnm-core/nm-utils.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libnm-core/nm-utils.c') diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 55b004c8..c16c9004 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -5989,10 +5989,12 @@ _nm_utils_bridge_vlans_from_dbus (NMSetting *setting, if (vid_start > vid_end) continue; - g_variant_lookup (vlan_var, "pvid", "b", &pvid); + if (!g_variant_lookup (vlan_var, "pvid", "b", &pvid)) + pvid = FALSE; if (pvid && vid_start != vid_end) continue; - g_variant_lookup (vlan_var, "untagged", "b", &untagged); + if (!g_variant_lookup (vlan_var, "untagged", "b", &untagged)) + untagged = FALSE; vlan = nm_bridge_vlan_new (vid_start, vid_end); nm_bridge_vlan_set_untagged (vlan, untagged); -- cgit 1.3.0-6-gf8a5