diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-02-29 01:23:48 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-02-29 01:23:48 +0000 |
| commit | 19c6752b4379ade49ebd2197fabb98a8b9d13414 (patch) | |
| tree | c6ae23f48415b231397e6bd5dafd4695126762f3 | |
| parent | 5131916178ebfd3512817f1915e0aefbe351db81 (diff) | |
| download | drakx-net-19c6752b4379ade49ebd2197fabb98a8b9d13414.tar drakx-net-19c6752b4379ade49ebd2197fabb98a8b9d13414.tar.gz drakx-net-19c6752b4379ade49ebd2197fabb98a8b9d13414.tar.bz2 drakx-net-19c6752b4379ade49ebd2197fabb98a8b9d13414.tar.xz drakx-net-19c6752b4379ade49ebd2197fabb98a8b9d13414.zip | |
simplify
| -rw-r--r-- | lib/network/connection/wireless.pm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm index f7afb37..c402041 100644 --- a/lib/network/connection/wireless.pm +++ b/lib/network/connection/wireless.pm @@ -338,15 +338,13 @@ sub guess_network_access_settings { $self->{access}{network}{essid} = $network && $network->{essid} || $ifcfg->{WIRELESS_ESSID} || !$network && "any"; ($self->{access}{network}{key}, my $restricted) = get_wep_key_from_iwconfig($ifcfg->{WIRELESS_ENC_KEY}); $self->{access}{network}{encryption} = + $network && $network->{flags} =~ /eap/i ? + 'wpa-eap' : $network && $network->{flags} =~ /wpa/i ? 'wpa-psk' : $network && $network->{flags} =~ /wep/i || $self->{access}{network}{key} ? ($restricted ? 'restricted' : 'open') : 'none'; - #The above selects between wep and wpa-psk now for wpa-eap - if ($network->{flags} =~ /eap/i) { - $self->{access}{network}{encryption} = "wpa-eap"; - } #load settings if only we use wpa_suuplicant wpa_supplicant_load_eap_settings($self->{access}{network}) if $self->need_wpa_supplicant; |