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

nmcli: avoid message about guessed wep-key-type when setting WEP password

Browse source 
$ nmcli --offline connection add type wifi con-name hotspot ssid hotspot-ssid wifi.mode ap wifi-sec.key-mgmt none wifi-sec.wep-key-type 1 wifi-sec.wep-key0 1234567890

would previously always print a message

  Info: WEP key is guessed to be of '1 (key)'

At least, when we explicitly set the key-type, this message is bogus.
Suppress it.

It's anyway questionable whether printing such warnings does anything good.
We would still get the warning with the arguments swapped, which seems wrong:

  $ nmcli --offline connection add type wifi con-name hotspot ssid hotspot-ssid wifi.mode ap wifi-sec.key-mgmt none wifi-sec.wep-key0 1234567890 wifi-sec.wep-key-type 1
  Info: WEP key is guessed to be of '1 (key)'

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1497
This commit is contained in:
Thomas Haller 2023-01-11 08:43:04 +01:00
parent 3b7e0ae083
commit 4721f83003
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/libnmc-setting/nm-meta-setting-desc.c
View file

@ -4320,7 +4320,7 @@ _get_fcn_wireless_security_wep_key(ARGS_GET_FCN)
static gboolean
_set_fcn_wireless_wep_key(ARGS_SET_FCN)
{
NMWepKeyType guessed_type = NM_WEP_KEY_TYPE_UNKNOWN;
NMWepKeyType guessed_type;
NMWepKeyType type;
guint32 prev_idx, idx;
@ -4339,14 +4339,15 @@ _set_fcn_wireless_wep_key(ARGS_SET_FCN)
guessed_type = NM_WEP_KEY_TYPE_KEY;
else if (nm_utils_wep_key_valid(value, NM_WEP_KEY_TYPE_PASSPHRASE))
guessed_type = NM_WEP_KEY_TYPE_PASSPHRASE;
if (guessed_type == NM_WEP_KEY_TYPE_UNKNOWN) {
else {
nm_utils_error_set(error, NM_UTILS_ERROR_UNKNOWN, _("'%s' is not valid"), value);
return FALSE;
}
if (type != NM_WEP_KEY_TYPE_UNKNOWN && type != guessed_type) {
if (nm_utils_wep_key_valid(value, type))
if (type != guessed_type) {
if (type == NM_WEP_KEY_TYPE_UNKNOWN) {
/* pass */
} else if (nm_utils_wep_key_valid(value, type))
guessed_type = type;
else {
nm_utils_error_set(
@ -4364,11 +4365,13 @@ _set_fcn_wireless_wep_key(ARGS_SET_FCN)
prev_idx =
nm_setting_wireless_security_get_wep_tx_keyidx(NM_SETTING_WIRELESS_SECURITY(setting));
idx = property_info->property_name[strlen(property_info->property_name) - 1] - '0';
_env_warn_fcn(environment,
environment_user_data,
NM_META_ENV_WARN_LEVEL_INFO,
N_("WEP key is guessed to be of '%s'"),
wep_key_type_to_string(guessed_type));
if (type == NM_WEP_KEY_TYPE_UNKNOWN) {
_env_warn_fcn(environment,
environment_user_data,
NM_META_ENV_WARN_LEVEL_INFO,
N_("WEP key is guessed to be of %s"),
wep_key_type_to_string(guessed_type));
}
if (idx != prev_idx) {
_env_warn_fcn(environment,
environment_user_data,