From c7c1b99646b12e21fd08cf6ec8a318c6648ed9d7 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Sun, 24 Apr 2005 21:24:58 +0000
Subject: fix WPA key

---
 perl-install/network/netconnect.pm | 2 +-
 perl-install/network/wireless.pm   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index a37db2e8a..3dc390015 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -1286,7 +1286,7 @@ See iwpriv(8) man page for further information."),
                             $ethntf->{WIRELESS_ENC_KEY} = network::wireless::convert_wep_key_for_iwconfig($wireless_enc_key, $wireless_enc_mode eq 'restricted');
                             if ($wireless_enc_mode eq 'wpa-psk') {
                                 $ethntf->{WIRELESS_WPA_DRIVER} = network::wireless::wpa_supplicant_get_driver($module);
-                                network::wireless::wpa_supplicant_configure($in, $ethntf);
+                                network::wireless::wpa_supplicant_configure($in, $ethntf->{WIRELESS_ESSID}, $wireless_enc_key);
                             } else {
                                 delete $ethntf->{WIRELESS_WPA_DRIVER};
                             }
diff --git a/perl-install/network/wireless.pm b/perl-install/network/wireless.pm
index 27f06971b..f78ac5640 100644
--- a/perl-install/network/wireless.pm
+++ b/perl-install/network/wireless.pm
@@ -90,13 +90,13 @@ sub wpa_supplicant_get_driver {
 }
 
 sub wpa_supplicant_configure {
-    my ($in, $ethntf) = @_;
+    my ($in, $essid, $key) = @_;
     require services;
     $in->do_pkgs->install('wpa_supplicant');
 
     wpa_supplicant_add_network({
-            ssid => qq("$ethntf->{WIRELESS_ESSID}"),
-            psk => convert_key_for_wpa_supplicant($ethntf->{WIRELESS_ENC_KEY}),
+            ssid => qq("$essid"),
+            psk => convert_key_for_wpa_supplicant($key),
             scan_ssid => 1,
     });
 }
-- 
cgit v1.2.1