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

wifi: merge branch 'georgmu/NetworkManager-ap-disable-wps'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/756
This commit is contained in:
Beniamino Galvani 2021-02-19 15:26:57 +01:00
commit 933e6c140e
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/supplicant/nm-supplicant-config.c
View file

@ -815,7 +815,7 @@ nm_supplicant_config_add_setting_wireless_security(NMSupplicantConfig *
nm_auto_free_gstring GString *key_mgmt_conf = NULL;
const char * key_mgmt, *auth_alg;
const char * psk;
gboolean set_pmf;
gboolean set_pmf, wps_disabled;
g_return_val_if_fail(NM_IS_SUPPLICANT_CONFIG(self), FALSE);
g_return_val_if_fail(setting != NULL, FALSE);
@ -1102,6 +1102,13 @@ nm_supplicant_config_add_setting_wireless_security(NMSupplicantConfig *
}
}
wps_disabled = (nm_setting_wireless_security_get_wps_method(setting)
== NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DISABLED);
if (wps_disabled) {
if (!nm_supplicant_config_add_option(self, "wps_disabled", "1", 1, NULL, error))
return FALSE;
}
return TRUE;
}

1
src/core/supplicant/nm-supplicant-settings-verify.c
View file

@ -144,6 +144,7 @@ static const struct Opt opt_table[] = {
OPT_BYTES("wep_key2", 0),
OPT_BYTES("wep_key3", 0),
OPT_INT("wep_tx_keyidx", 0, 3),
OPT_INT("wps_disabled", 0, 1),
};
static gboolean