summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-02-19 19:47:37 +0000
committerThierry Vignaud <tv@mageia.org>2013-02-19 19:47:37 +0000
commit0517b0caba92886a1f2652e8f5b951dc2ebe20d1 (patch)
tree63eb4e8b8a88e024fd2f587ab32761f7a9b4b30a
parent3b674adaeee147def38a782274200580f7274ee1 (diff)
downloaddrakx-net-0517b0caba92886a1f2652e8f5b951dc2ebe20d1.tar
drakx-net-0517b0caba92886a1f2652e8f5b951dc2ebe20d1.tar.gz
drakx-net-0517b0caba92886a1f2652e8f5b951dc2ebe20d1.tar.bz2
drakx-net-0517b0caba92886a1f2652e8f5b951dc2ebe20d1.tar.xz
drakx-net-0517b0caba92886a1f2652e8f5b951dc2ebe20d1.zip
add support for 802.1x EAP with WPA Enterprise Patch (mga#8577, Zombie Ryushu)
-rw-r--r--NEWS3
-rw-r--r--lib/network/connection/wireless.pm12
2 files changed, 15 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index a295dd4..0d94ddb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- drakconnect:
+ o add support for 802.1x EAP with WPA Enterprise Patch (mga#8577,
+ Zombie Ryushu)
- drakfirewall:
o check shorewall enabling via systemd (mga#8699, from Rosa)
- draknfs:
diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index 7e325af..df614d6 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -498,6 +498,18 @@ the username and password values specified here.") },
only used for EAP certificate based authentication. It could be
considered as the alternative to username/password combo.
Note: other related settings are shown on the Advanced page.") },
+ { label => N("EAP client private key"), val => \$self->{access}{network}{eap_private_key},
+ disabled => sub { $self->{access}{network}{encryption} ne 'wpa-eap' },
+ help => N("The complete path and filename of client private key. This is
+only used for EAP certificate based authentication. It could be
+considered as the alternative to username/password combo.
+ Note: other related settings are shown on the Advanced page.") },
+ { label => N("EAP client private key password"), val => \$self->{access}{network}{eap_private_key_passwd},
+ disabled => sub { $self->{access}{network}{encryption} ne 'wpa-eap' },
+ help => N("The complete password for the client private key. This is
+only used for EAP certificate based authentication. This password
+is used for protected client private keys only. It can be optional.
+ Note: other related settings are shown on the Advanced page.") },
{ label => N("Network ID"), val => \$self->{ifcfg}{WIRELESS_NWID}, advanced => 1 },
{ label => N("Operating frequency"), val => \$self->{ifcfg}{WIRELESS_FREQ}, advanced => 1 },
{ label => N("Sensitivity threshold"), val => \$self->{ifcfg}{WIRELESS_SENS}, advanced => 1 },