summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-06-12 12:47:02 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-06-12 12:47:02 +0000
commitd0d822342a9bda7983202e8da1d0b666821dd1eb (patch)
tree85f892da67d39edd95426ab49a0d52e1122d9254
parent72a9e5872a76c4462fca7f5a38b2f3d45ce26003 (diff)
downloaddrakx-net-d0d822342a9bda7983202e8da1d0b666821dd1eb.tar
drakx-net-d0d822342a9bda7983202e8da1d0b666821dd1eb.tar.gz
drakx-net-d0d822342a9bda7983202e8da1d0b666821dd1eb.tar.bz2
drakx-net-d0d822342a9bda7983202e8da1d0b666821dd1eb.tar.xz
drakx-net-d0d822342a9bda7983202e8da1d0b666821dd1eb.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 42b9747..ff79459 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -930,8 +930,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