summaryrefslogtreecommitdiff
path: root/libnm-util/nm-setting-8021x.c
diff options
context:
space:
mode:
authorjvoisin <julien.voisin@dustri.org>2013-09-18 19:17:34 +0100
committerDan Williams <dcbw@redhat.com>2013-10-23 21:07:30 -0500
commit00ffb78c8d4c63513a1c51ef61d32f0143ec78e2 (patch)
treefdb1a278e496e833acc469775d1017714497613a /libnm-util/nm-setting-8021x.c
parentecd49fb435cd15aafb9a46c85ed5c42c525d0c15 (diff)
downloadNetworkManager-00ffb78c8d4c63513a1c51ef61d32f0143ec78e2.tar.gz
core: add support for EAP-PWD authentication
Diffstat (limited to 'libnm-util/nm-setting-8021x.c')
-rw-r--r--libnm-util/nm-setting-8021x.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 58b2a4491a..55644e00b8 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -2395,6 +2395,7 @@ typedef struct {
static EAPMethodsTable eap_methods_table[] = {
{ "leap", need_secrets_password, verify_identity },
+ { "pwd", need_secrets_password, verify_identity },
{ "md5", need_secrets_password, verify_identity },
{ "pap", need_secrets_password, verify_identity },
{ "chap", need_secrets_password, verify_identity },
@@ -2520,7 +2521,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
{
NMSetting8021x *self = NM_SETTING_802_1X (setting);
NMSetting8021xPrivate *priv = NM_SETTING_802_1X_GET_PRIVATE (self);
- const char *valid_eap[] = { "leap", "md5", "tls", "peap", "ttls", "sim", "fast", NULL };
+ const char *valid_eap[] = { "leap", "md5", "tls", "peap", "ttls", "sim", "fast", "pwd", NULL };
const char *valid_phase1_peapver[] = { "0", "1", NULL };
const char *valid_phase1_peaplabel[] = { "0", "1", NULL };
const char *valid_phase1_fast_pac[] = { "0", "1", "2", "3", NULL };
@@ -3024,7 +3025,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
* NMSetting8021x:eap:
*
* The allowed EAP method to be used when authenticating to the network with
- * 802.1x. Valid methods are: "leap", "md5", "tls", "peap", "ttls", and
+ * 802.1x. Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd" and
* "fast". Each method requires different configuration using the
* properties of this object; refer to wpa_supplicant documentation for the
* allowed combinations.
@@ -3036,7 +3037,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
"The allowed EAP method to be used when "
"authenticating to the network with 802.1x. "
"Valid methods are: 'leap', 'md5', 'tls', 'peap', "
- "'ttls', and 'fast'. Each method requires "
+ "'ttls', 'pwd', and 'fast'. Each method requires "
"different configuration using the properties of "
"this setting; refer to wpa_supplicant "
"documentation for the allowed combinations.",