diff options
| author | Michael Biebl <biebl@debian.org> | 2019-08-06 22:47:09 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-08-06 22:47:09 +0200 |
| commit | 665270502c3d7c0d002ad76fefb1b7699794cd49 (patch) | |
| tree | 9bc6f4f79278c2a719e1839188f763655a6370ca /libnm-core/nm-utils.c | |
| parent | 3192a21b21d4a9d276a7f2ef4e4b0fcf3165d9eb (diff) | |
| parent | 5c79b900b59a5ad162ecc836e424468207ff031e (diff) | |
Update upstream source from tag 'upstream/1.20.0'
Update to upstream version '1.20.0' with Debian dir 832bc2b5ac5f253004165f6354c938efbe172206
Diffstat (limited to 'libnm-core/nm-utils.c')
| -rw-r--r-- | libnm-core/nm-utils.c | 6 |
1 files changed, 4 insertions, 2 deletions
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); |