diff options
Diffstat (limited to 'src/libnm-core-impl')
| -rw-r--r-- | src/libnm-core-impl/nm-setting-bond.c | 4 | ||||
| -rw-r--r-- | src/libnm-core-impl/nm-setting-connection.c | 2 | ||||
| -rw-r--r-- | src/libnm-core-impl/nm-setting-ip-config.c | 20 | ||||
| -rw-r--r-- | src/libnm-core-impl/nm-setting-wireless-security.c | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/libnm-core-impl/nm-setting-bond.c b/src/libnm-core-impl/nm-setting-bond.c index 2984e6fc22..48a2438b18 100644 --- a/src/libnm-core-impl/nm-setting-bond.c +++ b/src/libnm-core-impl/nm-setting-bond.c @@ -335,11 +335,11 @@ _bond_get_option_normalized(NMSettingBond *self, const char *option, gboolean ge value = _bond_get_option(self, NM_SETTING_BOND_OPTION_NUM_GRAT_ARP); if (!value) value = _bond_get_option(self, NM_SETTING_BOND_OPTION_NUM_UNSOL_NA); - } else if (NM_IN_STRSET(option, NM_SETTING_BOND_OPTION_ACTIVE_SLAVE)) { + } else if (nm_streq(option, NM_SETTING_BOND_OPTION_ACTIVE_SLAVE)) { /* "active_slave" is deprecated, and an alias for "primary". The property * itself always normalizes to %NULL. */ value = NULL; - } else if (NM_IN_STRSET(option, NM_SETTING_BOND_OPTION_PRIMARY)) { + } else if (nm_streq(option, NM_SETTING_BOND_OPTION_PRIMARY)) { /* "active_slave" is deprecated, and an alias for "primary". */ value = _bond_get_option(self, NM_SETTING_BOND_OPTION_PRIMARY); if (!value) diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c index 987c4fa041..1d126016d5 100644 --- a/src/libnm-core-impl/nm-setting-connection.c +++ b/src/libnm-core-impl/nm-setting-connection.c @@ -1258,7 +1258,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (connection) goto after_interface_name; iface_type = NMU_IFACE_ANY; - } else if (NM_IN_STRSET(ovs_iface_type, "patch")) { + } else if (nm_streq(ovs_iface_type, "patch")) { /* this interface type is internal to OVS. */ iface_type = NMU_IFACE_OVS; } else { diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c index ab760c4e5f..26ea2785ca 100644 --- a/src/libnm-core-impl/nm-setting-ip-config.c +++ b/src/libnm-core-impl/nm-setting-ip-config.c @@ -3417,7 +3417,7 @@ nm_ip_routing_rule_from_string(const char *str, /* iproute2 matches keywords with any partial prefix. We don't allow * for that flexibility. */ - if (NM_IN_STRSET(word0, "from")) { + if (nm_streq(word0, "from")) { if (!word1) continue; if (word_from) @@ -3425,7 +3425,7 @@ nm_ip_routing_rule_from_string(const char *str, word_from = word1; goto next_words_consumed; } - if (NM_IN_STRSET(word0, "to")) { + if (nm_streq(word0, "to")) { if (!word1) continue; if (word_to) @@ -3433,7 +3433,7 @@ nm_ip_routing_rule_from_string(const char *str, word_to = word1; goto next_words_consumed; } - if (NM_IN_STRSET(word0, "not")) { + if (nm_streq(word0, "not")) { /* we accept multiple "not" specifiers. "not not" still means * not. */ val_invert = TRUE; @@ -3477,7 +3477,7 @@ nm_ip_routing_rule_from_string(const char *str, goto next_fail_word1_invalid_value; goto next_words_consumed; } - if (NM_IN_STRSET(word0, "ipproto")) { + if (nm_streq(word0, "ipproto")) { if (!word1) continue; if (i64_ipproto != -1) @@ -3487,7 +3487,7 @@ nm_ip_routing_rule_from_string(const char *str, goto next_fail_word1_invalid_value; goto next_words_consumed; } - if (NM_IN_STRSET(word0, "sport")) { + if (nm_streq(word0, "sport")) { if (!word1) continue; if (i64_sport_start != -1) @@ -3496,7 +3496,7 @@ nm_ip_routing_rule_from_string(const char *str, goto next_fail_word1_invalid_value; goto next_words_consumed; } - if (NM_IN_STRSET(word0, "dport")) { + if (nm_streq(word0, "dport")) { if (!word1) continue; if (i64_dport_start != -1) @@ -3505,7 +3505,7 @@ nm_ip_routing_rule_from_string(const char *str, goto next_fail_word1_invalid_value; goto next_words_consumed; } - if (NM_IN_STRSET(word0, "fwmark")) { + if (nm_streq(word0, "fwmark")) { if (!word1) continue; if (i64_fwmark != -1) @@ -3532,7 +3532,7 @@ nm_ip_routing_rule_from_string(const char *str, word_iifname = word1; goto next_words_consumed; } - if (NM_IN_STRSET(word0, "oif")) { + if (nm_streq(word0, "oif")) { if (!word1) continue; if (word_oifname) @@ -3550,7 +3550,7 @@ nm_ip_routing_rule_from_string(const char *str, goto next_fail_word1_invalid_value; goto next_words_consumed; } - if (NM_IN_STRSET(word0, "uidrange")) { + if (nm_streq(word0, "uidrange")) { if (!word1) continue; if (uid_range_has) @@ -3572,7 +3572,7 @@ nm_ip_routing_rule_from_string(const char *str, uid_range_has = TRUE; goto next_words_consumed; } - if (NM_IN_STRSET(word0, "type")) { + if (nm_streq(word0, "type")) { if (!word1) continue; if (i_action >= 0) diff --git a/src/libnm-core-impl/nm-setting-wireless-security.c b/src/libnm-core-impl/nm-setting-wireless-security.c index d9c5afb873..73609584b8 100644 --- a/src/libnm-core-impl/nm-setting-wireless-security.c +++ b/src/libnm-core-impl/nm-setting-wireless-security.c @@ -934,7 +934,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) return FALSE; } - if (NM_IN_STRSET(wifi_mode, NM_SETTING_WIRELESS_MODE_MESH) + if (nm_streq(wifi_mode, NM_SETTING_WIRELESS_MODE_MESH) && !NM_IN_STRSET(priv->key_mgmt, "none", "sae")) { g_set_error(error, NM_CONNECTION_ERROR, |