diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
| commit | 96642ebde58e1eea692aea6a92d33f45452fa9c0 (patch) | |
| tree | 106ddfa2180b3997e8965787b5cb122982ebab9d /libnm-core/nm-setting.c | |
| parent | 8f6881ac06714ef99cc470a03e7ac0ce1af49a16 (diff) | |
| parent | d460892bbfece74fb6d3cd846bf6ef548290be41 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latestt pu
Diffstat (limited to 'libnm-core/nm-setting.c')
| -rw-r--r-- | libnm-core/nm-setting.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index b7be9c65..a75302f0 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -151,15 +151,18 @@ _nm_setting_slave_type_is_valid (const char *slave_type, const char **out_port_t if (!slave_type) found = FALSE; - else if (!strcmp (slave_type, NM_SETTING_BOND_SETTING_NAME)) - ; - else if (!strcmp (slave_type, NM_SETTING_BRIDGE_SETTING_NAME)) + else if (NM_IN_STRSET (slave_type, + NM_SETTING_BOND_SETTING_NAME, + NM_SETTING_VRF_SETTING_NAME)) { + /* pass */ + } + else if (nm_streq (slave_type, NM_SETTING_BRIDGE_SETTING_NAME)) port_type = NM_SETTING_BRIDGE_PORT_SETTING_NAME; - else if (!strcmp (slave_type, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) + else if (nm_streq (slave_type, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) port_type = NM_SETTING_OVS_PORT_SETTING_NAME; - else if (!strcmp (slave_type, NM_SETTING_OVS_PORT_SETTING_NAME)) + else if (nm_streq (slave_type, NM_SETTING_OVS_PORT_SETTING_NAME)) port_type = NM_SETTING_OVS_INTERFACE_SETTING_NAME; - else if (!strcmp (slave_type, NM_SETTING_TEAM_SETTING_NAME)) + else if (nm_streq (slave_type, NM_SETTING_TEAM_SETTING_NAME)) port_type = NM_SETTING_TEAM_PORT_SETTING_NAME; else found = FALSE; |