From 7d8facc844f30db5b10a8061bd4752cbcd95d8e7 Mon Sep 17 00:00:00 2001
From: Eugeni Dodonov <eugeni@mandriva.org>
Date: Mon, 11 May 2009 02:57:48 +0000
Subject: Properly handle wireless passwords with '#' character (#50670).

---
 lib/network/connection/wireless.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/network/connection')

diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index 78c30a8..b0de565 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -921,7 +921,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
-- 
cgit v1.2.1