fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-01 09:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: set wep-key-type properly in nmcli con edit (rh #1003945)

Browse source 
Accept both [0,1,2] and [unknown,key,passphrase] as wep-key-type values and
set the property value correctly.

https://bugzilla.redhat.com/show_bug.cgi?id=1003945
This commit is contained in:
Jiří Klimeš 2013-09-10 16:14:10 +02:00
parent 555e5b401c
commit b62856a0bb
1 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
cli/src/settings.c
View file

@ -3399,24 +3399,41 @@ nmc_property_wifi_set_wep_key (NMSetting *setting, const char *prop, const char
static gboolean
nmc_property_wifi_set_wep_key_type (NMSetting *setting, const char *prop, const char *val, GError **error)
{
const char *valid_wep_types[] = { "key", "passphrase", NULL };
const char *type_str;
unsigned long type_int;
const char *valid_wep_types[] = { "unknown", "key", "passphrase", NULL };
const char *type_str = NULL;
NMWepKeyType type = NM_WEP_KEY_TYPE_UNKNOWN;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
if (!(type_str = nmc_string_is_valid (val, valid_wep_types, error)))
return FALSE;
if (type_str == valid_wep_types[0])
type = NM_WEP_KEY_TYPE_KEY;
else if (type_str == valid_wep_types[1])
type = NM_WEP_KEY_TYPE_PASSPHRASE;
if (!nmc_string_to_uint (val, TRUE, 0, 2, &type_int)) {
if (!(type_str = nmc_string_is_valid (val, valid_wep_types, NULL))) {
g_set_error (error, 1, 0, _("'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"), val);
return FALSE;
}
if (type_str == valid_wep_types[1])
type = NM_WEP_KEY_TYPE_KEY;
else if (type_str == valid_wep_types[2])
type = NM_WEP_KEY_TYPE_PASSPHRASE;
} else
type = (NMWepKeyType) type_int;
g_object_set (setting, prop, type, NULL);
return TRUE;
}
static const char *
nmc_property_wifi_describe_wep_key_type (NMSetting *setting, const char *prop)
{
static char *desc = NULL;
if (G_UNLIKELY (desc == NULL)) {
desc = g_strdup_printf (_("Enter the type of WEP keys. The accepted values are: "
"0 or unknown, 1 or key, and 2 or passphrase.\n"));
}
return desc;
}
/* 'psk' */
static gboolean
nmc_property_wifi_set_psk (NMSetting *setting, const char *prop, const char *val, GError **error)
@ -4657,7 +4674,7 @@ nmc_properties_init (void)
nmc_property_wifi_sec_get_wep_key_type,
nmc_property_wifi_set_wep_key_type,
NULL,
NULL,
nmc_property_wifi_describe_wep_key_type,
NULL);
nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, PSK),
nmc_property_wifi_sec_get_psk,