mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-06 02:18:00 +02:00
2008-10-09 Dan Williams <dcbw@redhat.com>
* properties/nm-vpnc.c - (update_connection): only set DPD timeout if it was something other than the default value git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4159 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
1182e8579b
commit
db7de7fcf1
2 changed files with 15 additions and 3 deletions
|
|
@ -1,3 +1,9 @@
|
||||||
|
2008-10-09 Dan Williams <dcbw@redhat.com>
|
||||||
|
|
||||||
|
* properties/nm-vpnc.c
|
||||||
|
- (update_connection): only set DPD timeout if it was something other
|
||||||
|
than the default value
|
||||||
|
|
||||||
2008-09-09 Dan Williams <dcbw@redhat.com>
|
2008-09-09 Dan Williams <dcbw@redhat.com>
|
||||||
|
|
||||||
* common-gnome/keyring-helpers.c
|
* common-gnome/keyring-helpers.c
|
||||||
|
|
|
||||||
|
|
@ -485,9 +485,15 @@ update_connection (NMVpnPluginUiWidgetInterface *iface,
|
||||||
g_strdup (NM_VPNC_KEY_DPD_IDLE_TIMEOUT),
|
g_strdup (NM_VPNC_KEY_DPD_IDLE_TIMEOUT),
|
||||||
g_strdup ("0"));
|
g_strdup ("0"));
|
||||||
} else {
|
} else {
|
||||||
g_hash_table_insert (s_vpn->data,
|
/* If DPD was disabled and now the user wishes to enable it, just
|
||||||
g_strdup (NM_VPNC_KEY_DPD_IDLE_TIMEOUT),
|
* don't pass the DPD_IDLE_TIMEOUT option to vpnc and thus use the
|
||||||
g_strdup_printf ("%d", priv->orig_dpd_timeout));
|
* default DPD idle time. Otherwise keep the original DPD idle timeout.
|
||||||
|
*/
|
||||||
|
if (priv->orig_dpd_timeout >= 10) {
|
||||||
|
g_hash_table_insert (s_vpn->data,
|
||||||
|
g_strdup (NM_VPNC_KEY_DPD_IDLE_TIMEOUT),
|
||||||
|
g_strdup_printf ("%d", priv->orig_dpd_timeout));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* System secrets get stored in the connection, user secrets are saved
|
/* System secrets get stored in the connection, user secrets are saved
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue