[kde-plasma-nm] Upload missing patch

Jan Grulich jgrulich at fedoraproject.org
Mon Jan 19 13:32:12 UTC 2015


commit 823e3434fe6813a6fd0c9a4667f4fb575d9b0e59
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Mon Jan 19 14:32:31 2015 +0100

    Upload missing patch

 ...make-storing-openconnect-secrets-optional.patch |  110 ++++++++++++++++++++
 1 files changed, 110 insertions(+), 0 deletions(-)
---
diff --git a/plasma-nm-make-storing-openconnect-secrets-optional.patch b/plasma-nm-make-storing-openconnect-secrets-optional.patch
new file mode 100644
index 0000000..a2947e4
--- /dev/null
+++ b/plasma-nm-make-storing-openconnect-secrets-optional.patch
@@ -0,0 +1,110 @@
+From fb0a729cf712be5eab96a7e957e85a3d2c02bf7d Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich at redhat.com>
+Date: Mon, 19 Jan 2015 14:15:31 +0100
+Subject: [PATCH] Make storing openconnect secrets optional
+
+BUG:309931
+---
+ kded/secretagent.cpp                |  7 ++++++-
+ vpn/openconnect/openconnectauth.cpp |  5 +++++
+ vpn/openconnect/openconnectauth.ui  | 29 +++++++++++++++++++++++++++--
+ 3 files changed, 38 insertions(+), 3 deletions(-)
+
+diff --git a/kded/secretagent.cpp b/kded/secretagent.cpp
+index 1862346..cfc2ac5 100644
+--- a/kded/secretagent.cpp
++++ b/kded/secretagent.cpp
+@@ -224,7 +224,12 @@ void SecretAgent::dialogAccepted()
+ 
+                     // Load temporary secrets from auth dialog which are not returned to NM
+                     foreach (const QString &key, tmpOpenconnectSecrets.keys()) {
+-                        data.insert(key + QLatin1String("-flags"), QString::number(NetworkManager::Setting::AgentOwned));
++                        if (secrets.contains(QLatin1String("save_passwords")) && secrets.value(QLatin1String("save_passwords")) == QLatin1String("yes")) {
++                            data.insert(key + QLatin1String("-flags"), QString::number(NetworkManager::Setting::AgentOwned));
++                        } else {
++                            data.insert(key + QLatin1String("-flags"), QString::number(NetworkManager::Setting::NotSaved));
++                        }
++
+                         secrets.insert(key, tmpOpenconnectSecrets.value(key));
+                     }
+ 
+diff --git a/vpn/openconnect/openconnectauth.cpp b/vpn/openconnect/openconnectauth.cpp
+index d3b609e..27a4bba 100644
+--- a/vpn/openconnect/openconnectauth.cpp
++++ b/vpn/openconnect/openconnectauth.cpp
+@@ -232,6 +232,10 @@ void OpenconnectAuthWidget::readSecrets()
+         d->ui.chkAutoconnect->setChecked(true);
+         QTimer::singleShot(0, this, SLOT(connectHost()));
+     }
++
++    if (d->secrets["save_passwords"] == "yes") {
++        d->ui.chkStorePasswords->setChecked(true);
++    }
+ }
+ 
+ void OpenconnectAuthWidget::acceptDialog()
+@@ -301,6 +305,7 @@ QVariantMap OpenconnectAuthWidget::setting(bool agentOwned) const
+ #endif
+     secrets.insert(QLatin1String(NM_OPENCONNECT_KEY_GWCERT), QLatin1String(fingerprint));
+     secrets.insert(QLatin1String("autoconnect"), d->ui.chkAutoconnect->isChecked() ? "yes" : "no");
++    secrets.insert(QLatin1String("save_passwords"), d->ui.chkStorePasswords->isChecked() ? "yes" : "no");
+ 
+     NMStringMap::iterator i = secrets.begin();
+     while (i != secrets.end()) {
+diff --git a/vpn/openconnect/openconnectauth.ui b/vpn/openconnect/openconnectauth.ui
+index 538d109..e1990b7 100644
+--- a/vpn/openconnect/openconnectauth.ui
++++ b/vpn/openconnect/openconnectauth.ui
+@@ -23,7 +23,16 @@
+    <property name="sizeConstraint">
+     <enum>QLayout::SetMinimumSize</enum>
+    </property>
+-   <property name="margin">
++   <property name="leftMargin">
++    <number>0</number>
++   </property>
++   <property name="topMargin">
++    <number>0</number>
++   </property>
++   <property name="rightMargin">
++    <number>0</number>
++   </property>
++   <property name="bottomMargin">
+     <number>0</number>
+    </property>
+    <item>
+@@ -79,6 +88,13 @@
+     </widget>
+    </item>
+    <item>
++    <widget class="QCheckBox" name="chkStorePasswords">
++     <property name="text">
++      <string>Store passwords</string>
++     </property>
++    </widget>
++   </item>
++   <item>
+     <widget class="QGroupBox" name="loginBox">
+      <property name="minimumSize">
+       <size>
+@@ -101,7 +117,16 @@
+       </sizepolicy>
+      </property>
+      <layout class="QVBoxLayout" name="logLayout">
+-      <property name="margin">
++      <property name="leftMargin">
++       <number>0</number>
++      </property>
++      <property name="topMargin">
++       <number>0</number>
++      </property>
++      <property name="rightMargin">
++       <number>0</number>
++      </property>
++      <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+-- 
+2.1.0
+


More information about the scm-commits mailing list