From 8492d33b01531ec464354e2ae66d168995ed9dc4 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 3 Apr 2008 03:56:24 +0000
Subject: write open/restricted  mode in WIRELESS_ENC_MODE variable to be able
 to use spaces in ASCII wireless keys (#26025)

---
 lib/network/connection/wireless.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index b26ac26..239320a 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -349,7 +349,7 @@ sub guess_network_access_settings {
       $network && $network->{flags} =~ /wpa/i ?
         'wpa-psk' :
       $network && $network->{flags} =~ /wep/i || $self->{access}{network}{key} ?
-        ($restricted ? 'restricted' : 'open') :
+        $ifcfg->{WIRELESS_ENC_MODE} || ($restricted ? 'restricted' : 'open') :
         'none';
 
     undef $self->{ifcfg}{WIRELESS_IWPRIV} if is_old_rt2x00($self->get_driver) && $self->{ifcfg}{WIRELESS_IWPRIV} =~ /WPAPSK/;
@@ -583,7 +583,9 @@ sub build_ifcfg_settings {
         ),
         WIRELESS_ESSID => $self->{access}{network}{essid},
         if_($self->{access}{network}{encryption} ne 'none',
-            WIRELESS_ENC_KEY => convert_wep_key_for_iwconfig($self->{access}{network}{key}, $self->{access}{network}{encryption} eq 'restricted', $self->{access}{network}{force_ascii_key})),
+            WIRELESS_ENC_KEY => convert_wep_key_for_iwconfig($self->{access}{network}{key}, $self->{access}{network}{force_ascii_key})),
+        if_(member($self->{access}{network}{encryption}, qw(open restricted)),
+            WIRELESS_ENC_MODE =>  $self->{access}{network}{encryption}),
         if_($self->need_rt2x00_iwpriv,
             #- use iwpriv for WPA with rt2400/rt2500 drivers, they don't plan to support wpa_supplicant
             WIRELESS_IWPRIV => qq(set AuthMode=WPAPSK
@@ -702,9 +704,8 @@ sub get_hex_key {
 }
 
 sub convert_wep_key_for_iwconfig {
-    my ($real_key, $restricted, $force_ascii) = @_;
-    my $key = !$force_ascii && get_hex_key($real_key) || "s:$real_key";
-    $restricted ? "restricted $key" : "open $key";
+    my ($real_key, $force_ascii) = @_;
+    !$force_ascii && get_hex_key($real_key) || "s:$real_key";
 }
 
 sub convert_wep_key_for_wpa_supplicant {
-- 
cgit v1.2.1