From e8cc4d25272fd4b5bcff7e848e973355ba5e57e3 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 4 Dec 2006 21:01:39 +0000 Subject: [PATCH] 2006-12-04 Dan Williams * src/nm-vpnc-service.c - (nm_vpnc_config_options_validate): allow the "NAT-Keepalive packet interval" option to pass validation git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2166 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- vpn-daemons/vpnc/ChangeLog | 6 ++++++ vpn-daemons/vpnc/src/nm-vpnc-service.c | 25 +++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog index 1c5377d1f8..8576153a74 100644 --- a/vpn-daemons/vpnc/ChangeLog +++ b/vpn-daemons/vpnc/ChangeLog @@ -1,3 +1,9 @@ +2006-12-04 Dan Williams + + * src/nm-vpnc-service.c + - (nm_vpnc_config_options_validate): allow the + "NAT-Keepalive packet interval" option to pass validation + 2006-10-30 Tambet Ingo * properties/Makefile.am: Include new files pcf-file.[ch] in build. diff --git a/vpn-daemons/vpnc/src/nm-vpnc-service.c b/vpn-daemons/vpnc/src/nm-vpnc-service.c index 2b90675c74..e709d0d064 100644 --- a/vpn-daemons/vpnc/src/nm-vpnc-service.c +++ b/vpn-daemons/vpnc/src/nm-vpnc-service.c @@ -492,18 +492,19 @@ typedef struct Option static gboolean nm_vpnc_config_options_validate (char **data_items, int num_items) { Option allowed_opts[] = { - { "IPSec gateway", OPT_TYPE_ADDRESS }, - { "IPSec ID", OPT_TYPE_ASCII }, - { "IPSec secret", OPT_TYPE_ASCII }, - { "Xauth username", OPT_TYPE_ASCII }, - { "UDP Encapsulate", OPT_TYPE_NONE }, - { "UDP Encapsulation Port", OPT_TYPE_ASCII }, - { "Domain", OPT_TYPE_ASCII }, - { "IKE DH Group", OPT_TYPE_ASCII }, - { "Perfect Forward Secrecy", OPT_TYPE_ASCII }, - { "Application Version", OPT_TYPE_ASCII }, - { "Rekeying interval", OPT_TYPE_ASCII }, - { NULL, OPT_TYPE_UNKNOWN } + { "IPSec gateway", OPT_TYPE_ADDRESS }, + { "IPSec ID", OPT_TYPE_ASCII }, + { "IPSec secret", OPT_TYPE_ASCII }, + { "Xauth username", OPT_TYPE_ASCII }, + { "UDP Encapsulate", OPT_TYPE_NONE }, + { "UDP Encapsulation Port", OPT_TYPE_ASCII }, + { "Domain", OPT_TYPE_ASCII }, + { "IKE DH Group", OPT_TYPE_ASCII }, + { "Perfect Forward Secrecy", OPT_TYPE_ASCII }, + { "Application Version", OPT_TYPE_ASCII }, + { "Rekeying interval", OPT_TYPE_ASCII }, + { "NAT-Keepalive packet interval", OPT_TYPE_ASCII }, + { NULL, OPT_TYPE_UNKNOWN } }; unsigned int i;