diff options
| author | Eugeni Dodonov <eugeni@mandriva.org> | 2009-06-02 21:13:11 +0000 |
|---|---|---|
| committer | Eugeni Dodonov <eugeni@mandriva.org> | 2009-06-02 21:13:11 +0000 |
| commit | 4091aa337859a79eca631daf5adb1396fae15e4e (patch) | |
| tree | 8c49990487001f52183e8104db842e32fd0b002a | |
| parent | f7ac0b7ee1f8957bbc781460048b58d76a5a49cd (diff) | |
| download | drakx-net-4091aa337859a79eca631daf5adb1396fae15e4e.tar drakx-net-4091aa337859a79eca631daf5adb1396fae15e4e.tar.gz drakx-net-4091aa337859a79eca631daf5adb1396fae15e4e.tar.bz2 drakx-net-4091aa337859a79eca631daf5adb1396fae15e4e.tar.xz drakx-net-4091aa337859a79eca631daf5adb1396fae15e4e.zip | |
Properly handle wireless passwords with '#' character (#50670).
| -rw-r--r-- | lib/network/connection/wireless.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm index 2e14656..574467a 100644 --- a/lib/network/connection/wireless.pm +++ b/lib/network/connection/wireless.pm @@ -920,7 +920,8 @@ sub wpa_supplicant_read_conf() { foreach (cat_($::prefix . $wpa_supplicant_conf)) { if ($network) { #- in a "network = {}" block - if (/^\s*(\w+)=(.*?)(?:\s*#.*)?$/) { + # value is either the string with "quotes" - or a non-whitespace containing string + if (/^\s*(\w+)=\s*(?|([^"]\S*)|("[^"]*")).*$/) { $network->{$1} = $2; } elsif (/^\}/) { #- end of network block |