[kde-plasma-networkmanagement] fix "In file (unencrypted)" secrets storage (#682972)

Rex Dieter rdieter at fedoraproject.org
Mon Mar 14 15:10:55 UTC 2011


commit eb8caf65159e5d5fb46b9aaa3db604ea99e476f0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Mar 14 10:10:42 2011 -0500

    fix "In file (unencrypted)" secrets storage (#682972)

 ...x-connecting-to-WiFi-when-In-file-unencry.patch |   25 ++++++++++++++++++++
 kde-plasma-networkmanagement.spec                  |    8 +++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0001-internal-fix-connecting-to-WiFi-when-In-file-unencry.patch b/0001-internal-fix-connecting-to-WiFi-when-In-file-unencry.patch
new file mode 100644
index 0000000..1c55bb4
--- /dev/null
+++ b/0001-internal-fix-connecting-to-WiFi-when-In-file-unencry.patch
@@ -0,0 +1,25 @@
+diff --git a/libs/internals/connection.cpp b/libs/internals/connection.cpp
+--- a/libs/internals/connection.cpp
++++ b/libs/internals/connection.cpp
+@@ -272,8 +272,16 @@ bool Connection::secretsAvailable() const
+     bool allSecretsAvailable = true;
+     foreach (Setting * setting, m_settings) {
+         if (setting->hasSecrets() && !setting->secretsAvailable()) {
+-            allSecretsAvailable = false;
+-            break;
++            if (setting->type() == Knm::Setting::Security8021x) {
++                Security8021xSetting * s_8021x = static_cast<Knm::Security8021xSetting *>(setting);
++                if (s_8021x->enabled()) {
++                    allSecretsAvailable = false;
++                    break;
++                }
++            } else {
++                allSecretsAvailable = false;
++                break;
++            }
+         }
+     }
+     return allSecretsAvailable;
+-- 
+1.7.4
+
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index 5bd56b2..ad7ee18 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -4,7 +4,7 @@
 Name:           kde-plasma-networkmanagement
 Epoch:          1
 Version:        0.9
-Release:        0.37.%{snap}%{?dist}
+Release:        0.38.%{snap}%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -23,6 +23,8 @@ Source10: 00-fedora-networkmanagement.js
 ## upstreamable patches
 # https://git.reviewboard.kde.org/r/100835/
 Patch50: 0001-applet-fix-Enable-.-checkbox-handling-and-simplify-t.patch
+# https://git.reviewboard.kde.org/r/100855/
+Patch51: 0001-internal-fix-connecting-to-WiFi-when-In-file-unencry.patch
 
 ## upstream patches
 
@@ -101,6 +103,7 @@ Provides:       knetworkmanager-vpnc = %{?epoch:%{epoch}:}%{version}-%{release}
 %setup -q -n networkmanagement-%{version}
 
 %patch50 -p1 -b .fix_enable_checkbox_handling
+%patch51 -p1 -b .in_file_secrets
 
 # nuke monolithic knm bits
 rm -rfv monolithic po/*/knetworkmanager.po
@@ -215,6 +218,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %changelog
+* Mon Mar 14 2011 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.38.20110310
+- fix "In file (unencrypted)" secrets storage (#682972)
+
 * Thu Mar 10 2011 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.37.20110310
 - 20110310 snapshot
 - Updated code to fix "Enable ..." checkbox handling


More information about the scm-commits mailing list