summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-06-12 12:51:24 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-06-12 12:51:24 +0000
commit89206eba2a8b6167f822e1d4317b291280cf3665 (patch)
treeaf24b78bf716998781c198ee2db7f10f653b9707
parent99f118879454b14b99f7634ace24ace1d02ae9e1 (diff)
downloaddrakx-net-89206eba2a8b6167f822e1d4317b291280cf3665.tar
drakx-net-89206eba2a8b6167f822e1d4317b291280cf3665.tar.gz
drakx-net-89206eba2a8b6167f822e1d4317b291280cf3665.tar.bz2
drakx-net-89206eba2a8b6167f822e1d4317b291280cf3665.tar.xz
drakx-net-89206eba2a8b6167f822e1d4317b291280cf3665.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 93db6cb..5d7a43b 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -924,8 +924,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