diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-04-28 13:18:35 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-04-28 13:28:09 +0200 |
| commit | 47427c91ea95a496edee52fd9216b8a0e7334c4d (patch) | |
| tree | 1ec9c6496f2f53eafc1d5777785aa906480a5ee7 /libnm-core/nm-setting-wireless-security.c | |
| parent | 19b7c124b3670d4370685408a4c058323efa981e (diff) | |
| download | NetworkManager-th/ifcfg-enum.tar.gz | |
libnm: make NMSettingWirelessSecurity's PMF property signedth/ifcfg-enum
The PMF property is really an enum (GEnum, not GFlags). We only
make the property of plain integer type to allow for future extensions.
But commonly, enums are signed int, while flags are unsigned. Change
the property to be signed for consistency.
Diffstat (limited to 'libnm-core/nm-setting-wireless-security.c')
| -rw-r--r-- | libnm-core/nm-setting-wireless-security.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c index dd5e9b5a9f..af0ede2a7f 100644 --- a/libnm-core/nm-setting-wireless-security.c +++ b/libnm-core/nm-setting-wireless-security.c @@ -65,7 +65,7 @@ typedef struct { GSList *proto; /* GSList of strings */ GSList *pairwise; /* GSList of strings */ GSList *group; /* GSList of strings */ - guint pmf; + NMSettingWirelessSecurityPmf pmf; /* LEAP */ char *leap_username; @@ -1031,7 +1031,8 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } } - if (priv->pmf > NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED) { + if ( !NM_GREATER_EQUAL_ZERO (priv->pmf) + || priv->pmf > NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED) { g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -1241,7 +1242,7 @@ set_property (GObject *object, guint prop_id, priv->group = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE); break; case PROP_PMF: - priv->pmf = g_value_get_uint (value); + priv->pmf = g_value_get_int (value); break; case PROP_LEAP_USERNAME: g_free (priv->leap_username); @@ -1316,7 +1317,7 @@ get_property (GObject *object, guint prop_id, g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->group, TRUE)); break; case PROP_PMF: - g_value_set_uint (value, nm_setting_wireless_security_get_pmf (setting)); + g_value_set_int (value, nm_setting_wireless_security_get_pmf (setting)); break; case PROP_LEAP_USERNAME: g_value_set_string (value, priv->leap_username); @@ -1539,12 +1540,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting */ g_object_class_install_property (object_class, PROP_PMF, - g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_PMF, "", "", - 0, G_MAXUINT32, 0, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - NM_SETTING_PARAM_FUZZY_IGNORE | - G_PARAM_STATIC_STRINGS)); + g_param_spec_int (NM_SETTING_WIRELESS_SECURITY_PMF, "", "", + 0, G_MAXINT32, 0, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_FUZZY_IGNORE | + G_PARAM_STATIC_STRINGS)); /** * NMSettingWirelessSecurity:leap-username: |