[NetworkManager-libreswan: 2/3] Added "Disable PFS" Option to advanced dialog

[Francesco Giudici <fgiudici src gnome org>]

commit 1c988f59a301f427f57a1fcd6b9851134f18cdda
Author: Jochen Jägers <jochen jaegers gmail com>
Date:   Wed Sep 19 21:46:03 2018 +0200

    Added "Disable PFS" Option to advanced dialog

 properties/nm-libreswan-dialog.ui | 26 +++++++++++++++++++++-----
 properties/nm-libreswan-editor.c  |  8 ++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)
---
diff --git a/properties/nm-libreswan-dialog.ui b/properties/nm-libreswan-dialog.ui
index aeaaea8..5239f39 100644
--- a/properties/nm-libreswan-dialog.ui
+++ b/properties/nm-libreswan-dialog.ui
@@ -648,7 +648,7 @@ config: esp &lt;proposals&gt;</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
+                        <property name="top_attach">4</property>
                       </packing>
                     </child>
                     <child>
@@ -660,7 +660,7 @@ config: ikelifetime &lt;lifetime&gt;</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
+                        <property name="top_attach">4</property>
                       </packing>
                     </child>
                     <child>
@@ -674,7 +674,7 @@ config: ikelifetime &lt;lifetime&gt;</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">5</property>
                       </packing>
                     </child>
                     <child>
@@ -686,7 +686,7 @@ config: salifetime &lt;lifetime&gt;</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">5</property>
                       </packing>
                     </child>
                     <child>
@@ -702,7 +702,23 @@ config: rekey &lt;no/yes&gt;</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
+                        <property name="top_attach">6</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="pfs_checkbutton">
+                        <property name="label" translatable="yes">Disable PFS</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="tooltip_text" translatable="yes">Disable perfect forward security. 
Enable this option only, if the server doesn't support PFS.
+config: pfs &lt;no/yes&gt;</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">3</property>
                       </packing>
                     </child>
                     <child>
diff --git a/properties/nm-libreswan-editor.c b/properties/nm-libreswan-editor.c
index 20f4dc8..711570e 100644
--- a/properties/nm-libreswan-editor.c
+++ b/properties/nm-libreswan-editor.c
@@ -428,6 +428,9 @@ init_editor_plugin (LibreswanEditor *self,
        widget_updated = init_widget (self, s_vpn, "rekey_checkbutton", NM_LIBRESWAN_KEY_REKEY, "no");
        g_return_val_if_fail (widget_updated, FALSE);
 
+       widget_updated = init_widget (self, s_vpn, "pfs_checkbutton", NM_LIBRESWAN_KEY_PFS, "no");
+       g_return_val_if_fail (widget_updated, FALSE);
+
        widget_updated = init_widget (self, s_vpn, "remote_network_entry", NM_LIBRESWAN_KEY_REMOTENETWORK, 
NULL);
        g_return_val_if_fail (widget_updated, FALSE);
 
@@ -618,6 +621,11 @@ update_connection (NMVpnEditor *iface,
        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
                nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_KEY_REKEY, "no");
 
+       /* Disable PFS */
+       widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "pfs_checkbutton"));
+       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+               nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_KEY_PFS, "no");
+
        /* Narrowing */
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "narrowing_checkbutton"));
        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))