summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-06-12 12:49:53 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-06-12 12:49:53 +0000
commite2adfdb7f0f94505aa7a70f32639920459569eca (patch)
tree0ebfa2f044c268bcb7de0449b1ee5083e73ceec6
parent3a94d160f3f27df474c8b2fabc15971573d0f3da (diff)
downloaddrakx-net-e2adfdb7f0f94505aa7a70f32639920459569eca.tar
drakx-net-e2adfdb7f0f94505aa7a70f32639920459569eca.tar.gz
drakx-net-e2adfdb7f0f94505aa7a70f32639920459569eca.tar.bz2
drakx-net-e2adfdb7f0f94505aa7a70f32639920459569eca.tar.xz
drakx-net-e2adfdb7f0f94505aa7a70f32639920459569eca.zip
Correctly handle WPA-Enterprise wpa_supplicant settings (#51574).
-rw-r--r--lib/network/connection/wireless.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index 468446f..5c1c396 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -925,8 +925,8 @@ sub wpa_supplicant_read_conf() {
foreach (cat_($::prefix . $wpa_supplicant_conf)) {
if ($network) {
#- in a "network = {}" block
- # value is either the string with "quotes" - or a non-whitespace containing string
- if (/^\s*(\w+)=\s*(?|([^"]\S*)|("[^"]*")).*$/) {
+ # value is either the string with "quotes" - or a full-length string
+ if (/^\s*(\w+)=\s*(?|([^"].*)|("[^"]*")).*$/) {
$network->{$1} = $2;
} elsif (/^\}/) {
#- end of network block