diff options
| author | Michael Biebl <biebl@debian.org> | 2020-04-11 21:30:33 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-04-11 21:30:33 +0200 |
| commit | f914c41532a9e4f2bb44be074466b62e4cac8db3 (patch) | |
| tree | 046e8e7a186afecf299cd80d62fa1c93903dbecf /libnm-core/nm-setting.c | |
| parent | 19e73abd360f0198f94ce49f36ddf009056f6324 (diff) | |
| parent | 1e5977b62f896e844b548c3007ace9e1dfa7f9ed (diff) | |
Update upstream source from tag 'upstream/1.23.90'
Update to upstream version '1.23.90' with Debian dir 38c3873648b51c73a9e448ccb2ac18152c2b3f85
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; |