diff -u network-manager-vpnc-0.6.4svn2422/debian/changelog network-manager-vpnc-0.6.4svn2422/debian/changelog --- network-manager-vpnc-0.6.4svn2422/debian/changelog +++ network-manager-vpnc-0.6.4svn2422/debian/changelog @@ -1,3 +1,11 @@ +network-manager-vpnc (0.6.4svn2422-0ubuntu2) feisty; urgency=low + + * Fix Ubuntu bugs 88073 and 90200 + -Add Single DES encryption option + -Add Disable Nat Traversal option + + -- Stéphane Graber Sat, 11 Mar 2007 22:49:25 +0100 + network-manager-vpnc (0.6.4svn2422-0ubuntu1) feisty; urgency=low * New SVN checkout only in patch2: unchanged: --- network-manager-vpnc-0.6.4svn2422.orig/debian/patches/02_fix_bugs_88073_90200_ubuntu.diff +++ network-manager-vpnc-0.6.4svn2422/debian/patches/02_fix_bugs_88073_90200_ubuntu.diff @@ -0,0 +1,1358 @@ +diff -Nrup ../network-manager-vpnc_0.6.4svn2422/properties/nm-vpnc.c ./properties/nm-vpnc.c +--- ../network-manager-vpnc_0.6.4svn2422/properties/nm-vpnc.c 2007-03-06 16:08:43.000000000 +0100 ++++ ./properties/nm-vpnc.c 2007-03-11 22:35:10.000000000 +0100 +@@ -55,6 +55,8 @@ struct _NetworkManagerVpnUIImpl { + GtkCheckButton *w_use_domain; + GtkEntry *w_domain; + GtkCheckButton *w_use_routes; ++ GtkCheckButton *w_disable_natt; ++ GtkCheckButton *w_enable_singledes; + GtkEntry *w_routes; + GtkExpander *w_opt_info_expander; + GtkButton *w_import_button; +@@ -68,6 +70,8 @@ vpnc_clear_widget (NetworkManagerVpnUIIm + gtk_entry_set_text (impl->w_group_name, ""); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username), FALSE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_routes), FALSE); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt), FALSE); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes), FALSE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_domain), FALSE); + gtk_entry_set_text (impl->w_username, ""); + gtk_entry_set_text (impl->w_routes, ""); +@@ -125,6 +129,10 @@ impl_get_widget (NetworkManagerVpnUI *se + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_domain), TRUE); + gtk_widget_set_sensitive (GTK_WIDGET (impl->w_domain), TRUE); + should_expand = TRUE; ++ } else if (strcmp (key, "Disable NAT Traversal") == 0) { ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt), TRUE); ++ } else if (strcmp (key, "Enable Single DES") == 0) { ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes), TRUE); + } + } + +@@ -172,6 +180,8 @@ impl_get_properties (NetworkManagerVpnUI + gboolean use_alternate_username; + const char *username; + gboolean use_domain; ++ gboolean disable_natt; ++ gboolean enable_singledes; + const char *domain; + + connectionname = gtk_entry_get_text (impl->w_connection_name); +@@ -180,6 +190,8 @@ impl_get_properties (NetworkManagerVpnUI + use_alternate_username = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username)); + username = gtk_entry_get_text (impl->w_username); + use_domain = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_domain)); ++ disable_natt = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt)); ++ enable_singledes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes)); + domain = gtk_entry_get_text (impl->w_domain); + + data = NULL; +@@ -195,6 +207,14 @@ impl_get_properties (NetworkManagerVpnUI + data = g_slist_append (data, g_strdup ("Domain")); + data = g_slist_append (data, g_strdup (domain)); + } ++ if (enable_singledes) { ++ data = g_slist_append (data, g_strdup ("Enable Single DES")); ++ data = g_slist_append (data, g_strdup ("")); ++ } ++ if (disable_natt) { ++ data = g_slist_append (data, g_strdup ("Disable NAT Traversal")); ++ data = g_slist_append (data, g_strdup ("")); ++ } + + return data; + } +@@ -266,6 +286,8 @@ impl_is_valid (NetworkManagerVpnUI *self + gboolean use_routes; + const char *routes_entry; + gboolean use_domain; ++ gboolean disable_natt; ++ gboolean enable_singledes; + const char *domain_entry; + + is_valid = FALSE; +@@ -276,6 +298,8 @@ impl_is_valid (NetworkManagerVpnUI *self + use_alternate_username = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username)); + username = gtk_entry_get_text (impl->w_username); + use_routes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_routes)); ++ disable_natt = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt)); ++ enable_singledes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes)); + routes_entry = gtk_entry_get_text (impl->w_routes); + use_domain = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_domain)); + domain_entry = gtk_entry_get_text (impl->w_domain); +@@ -429,6 +453,8 @@ impl_get_confirmation_details (NetworkMa + gboolean use_alternate_username; + const char *username; + gboolean use_routes; ++ gboolean disable_natt; ++ gboolean enable_singledes; + const char *routes; + gboolean use_domain; + const char *domain; +@@ -439,6 +465,8 @@ impl_get_confirmation_details (NetworkMa + use_alternate_username = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username)); + username = gtk_entry_get_text (impl->w_username); + use_routes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_routes)); ++ disable_natt = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt)); ++ enable_singledes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes)); + routes = gtk_entry_get_text (impl->w_routes); + use_domain = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_domain)); + domain = gtk_entry_get_text (impl->w_domain); +@@ -468,6 +496,14 @@ impl_get_confirmation_details (NetworkMa + g_string_append (buf, "\n\t"); + g_string_append_printf (buf, _("Routes: %s"), routes); + } ++ if (enable_singledes) { ++ g_string_append (buf, "\n\t"); ++ g_string_append_printf (buf, _("Enable Single DES")); ++ } ++ if (disable_natt) { ++ g_string_append (buf, "\n\t"); ++ g_string_append_printf (buf, _("Disable NAT Traversal")); ++ } + + g_string_append (buf, "\n\n"); + g_string_append (buf, _("The connection details can be changed using the \"Edit\" button.")); +@@ -530,6 +566,27 @@ import_from_file (NetworkManagerVpnUIImp + + gtk_expander_set_expanded (impl->w_opt_info_expander, expand); + ++ if ((buf = pcf_file_lookup_value (pcf, "main", "SingleDES"))) { ++ if (strncmp (buf, "1", 1) == 0) { ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes), TRUE); ++ } ++ else ++ { ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes), FALSE); ++ } ++ } ++ ++ if ((buf = pcf_file_lookup_value (pcf, "main", "EnableNat"))) { ++ if (strncmp (buf, "0", 1) == 0) { ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt), TRUE); ++ } ++ else ++ { ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt), FALSE); ++ } ++ } ++ ++ + if ((buf = pcf_file_lookup_value (pcf, "main", "TunnelingMode"))) { + /* If applicable, put up warning that TCP tunneling will be disabled */ + +@@ -625,6 +682,8 @@ export_to_file (NetworkManagerVpnUIImpl + FILE *f; + GSList *i; + const char *gateway = NULL; ++ const char *enablenat = "1"; ++ const char *singledes = "0"; + const char *groupname = NULL; + const char *username = NULL; + const char *domain = NULL; +@@ -648,6 +707,10 @@ export_to_file (NetworkManagerVpnUIImpl + username = value; + } else if (strcmp (key, "Domain") == 0) { + domain = value; ++ } else if (strcmp (key, "Disable NAT Traversal") == 0) { ++ enablenat = "0"; ++ } else if (strcmp (key, "Enable Single DES") == 0) { ++ singledes = "1"; + } + } + +@@ -693,7 +756,7 @@ export_to_file (NetworkManagerVpnUIImpl + "SaveUserPassword=0\n" + "EnableBackup=0\n" + "BackupServer=\n" +- "EnableNat=1\n" ++ "EnableNat=%s\n" + "CertStore=0\n" + "CertName=\n" + "CertPath=\n" +@@ -714,13 +777,16 @@ export_to_file (NetworkManagerVpnUIImpl + "SendCertChain=0\n" + "VerifyCertDN=\n" + "EnableSplitDNS=1\n" ++ "SingleDES=%s\n" + "SPPhonebook=\n" + "%s", + /* Description */ connection_name, + /* Host */ gateway, + /* GroupName */ groupname, + /* Username */ username != NULL ? username : "", ++ /* EnableNat */ enablenat, + /* NTDomain */ domain != NULL ? domain : "", ++ /* SingleDES */ singledes, + /* X-NM-Routes */ routes_str != NULL ? routes_str : ""); + + fclose (f); +@@ -825,6 +891,8 @@ impl_get_object (void) + impl->w_use_alternate_username = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-use-alternate-username")); + impl->w_username = GTK_ENTRY (glade_xml_get_widget (impl->xml, "vpnc-username")); + impl->w_use_routes = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-use-routes")); ++ impl->w_disable_natt = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-disable-natt")); ++ impl->w_enable_singledes = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-enable-singledes")); + impl->w_routes = GTK_ENTRY (glade_xml_get_widget (impl->xml, "vpnc-routes")); + impl->w_use_domain = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-use-domain")); + impl->w_domain = GTK_ENTRY (glade_xml_get_widget (impl->xml, "vpnc-domain")); +diff -Nrup ../network-manager-vpnc_0.6.4svn2422/properties/nm-vpnc-dialog.glade ./properties/nm-vpnc-dialog.glade +--- ../network-manager-vpnc_0.6.4svn2422/properties/nm-vpnc-dialog.glade 2007-03-06 16:08:43.000000000 +0100 ++++ ./properties/nm-vpnc-dialog.glade 2007-03-11 22:28:45.000000000 +0100 +@@ -1,720 +1,425 @@ +- +- +- ++ ++ ++ + +- +- +- +- +- GTK_WINDOW_TOPLEVEL +- GTK_WIN_POS_NONE +- False +- False +- False +- True +- False +- False +- GDK_WINDOW_TYPE_HINT_NORMAL +- GDK_GRAVITY_NORTH_WEST +- True +- False +- +- +- +- True +- False +- 6 +- +- +- +- True +- Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting. +- False +- False +- GTK_JUSTIFY_LEFT +- True +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- False +- True +- +- +- +- +- +- True +- False +- 6 +- +- +- +- True +- False +- 6 +- +- +- +- True +- <b>Connection Name</b> +- False +- True +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 3 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- False +- True +- +- +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 6 +- 0 +- +- +- +- True +- False +- 6 +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 0 +- 6 +- +- +- +- True +- Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" +- True +- True +- True +- 0 +- +- True +- False +- +- Connection Name +- Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" +- +- +- +- +- +- 0 +- False +- False +- +- +- +- +- +- +- 0 +- True +- True +- +- +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- <b>Connection Information</b> +- False +- True +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 3 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- True +- True +- True +- GTK_POS_TOP +- False +- False +- +- +- +- True +- False +- 6 +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 3 +- 0 +- 12 +- 3 +- +- +- +- True +- 2 +- 2 +- False +- 6 +- 12 +- +- +- +- True +- True +- True +- True +- 0 +- +- True +- False +- +- +- 1 +- 2 +- 0 +- 1 +- +- +- +- +- +- True +- True +- True +- True +- 0 +- +- True +- False +- +- +- 1 +- 2 +- 1 +- 2 +- +- +- +- +- +- True +- _Gateway: +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- vpnc-gateway +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- 1 +- 0 +- 1 +- fill +- +- +- +- +- +- True +- G_roup Name: +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- vpnc-group-name +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- 1 +- 1 +- 2 +- fill +- +- +- +- +- +- +- 0 +- False +- True +- +- +- +- +- False +- True +- +- +- +- +- +- True +- <b>Required</b> +- False +- True +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- tab +- +- +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 12 +- 0 +- +- +- +- True +- False +- 6 +- +- +- +- True +- True +- Override _user name +- True +- GTK_RELIEF_NORMAL +- True +- False +- False +- True +- +- +- 3 +- True +- True +- +- +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 12 +- 3 +- +- +- +- True +- True +- True +- True +- 0 +- +- True +- False +- +- +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- True +- Use _domain for authentication +- True +- GTK_RELIEF_NORMAL +- True +- False +- False +- True +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 12 +- 3 +- +- +- +- True +- True +- True +- True +- 0 +- +- True +- False +- +- +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- True +- _Only use VPN connection for these addresses +- True +- GTK_RELIEF_NORMAL +- True +- False +- False +- True +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 3 +- 12 +- 3 +- +- +- +- True +- False +- 6 +- +- +- +- True +- <i>example: 172.16.0.0/16 10.11.12.0/24</i> +- False +- True +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- False +- True +- +- +- +- +- +- True +- True +- True +- True +- 0 +- +- True +- False +- +- +- 0 +- True +- True +- +- +- +- +- +- +- 0 +- True +- True +- +- +- +- +- +- +- False +- True +- +- +- +- +- +- True +- Optional +- False +- True +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- Optional +- +- +- +- tab +- +- +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- GTK_BUTTONBOX_END +- 0 +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 3 +- 0 +- 3 +- +- +- +- True +- Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file. +- True +- True +- GTK_RELIEF_NORMAL +- True +- +- Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file. +- +- +- +- +- True +- 0.5 +- 0.5 +- 0 +- 0 +- 0 +- 0 +- 0 +- 0 +- +- +- +- True +- False +- 2 +- +- +- +- True +- gtk-add +- 4 +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- _Import Saved Configuration... +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- 0 +- False +- False +- +- +- +- +- +- +- +- +- +- +- +- +- 0 +- True +- True +- +- +- +- +- 0 +- True +- True +- +- +- +- +- +- ++ ++ False ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting. ++ True ++ ++ ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ 3 ++ <b>Connection Name</b> ++ True ++ ++ ++ False ++ ++ ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" ++ ++ Connection Name ++ Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" ++ ++ ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ True ++ 0 ++ 3 ++ <b>Connection Information</b> ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ True ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 3 ++ 12 ++ 3 ++ ++ ++ True ++ 2 ++ 2 ++ 12 ++ 6 ++ ++ ++ True ++ True ++ ++ ++ 1 ++ 2 ++ ++ ++ ++ ++ True ++ True ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ ++ ++ ++ ++ True ++ 1 ++ _Gateway: ++ True ++ vpnc-gateway ++ ++ ++ GTK_FILL ++ ++ ++ ++ ++ True ++ 1 ++ G_roup Name: ++ True ++ vpnc-group-name ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ False ++ ++ ++ ++ ++ True ++ 0 ++ <b>Required</b> ++ True ++ ++ ++ tab ++ False ++ False ++ ++ ++ ++ ++ True ++ 12 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ True ++ Override _user name ++ True ++ True ++ ++ ++ 3 ++ ++ ++ ++ ++ True ++ 12 ++ 3 ++ ++ ++ True ++ True ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ True ++ Use _domain for authentication ++ True ++ True ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ True ++ 12 ++ 3 ++ ++ ++ True ++ True ++ ++ ++ ++ ++ 3 ++ ++ ++ ++ ++ True ++ True ++ _Only use VPN connection for these addresses ++ True ++ True ++ ++ ++ False ++ False ++ 4 ++ ++ ++ ++ ++ True ++ 3 ++ 12 ++ 3 ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ <i>example: 172.16.0.0/16 10.11.12.0/24</i> ++ True ++ ++ ++ False ++ ++ ++ ++ ++ True ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ 5 ++ ++ ++ ++ ++ True ++ Disable NAT Traversal ++ True ++ ++ ++ 6 ++ ++ ++ ++ ++ True ++ Enable weak single DES encryption ++ True ++ ++ ++ 7 ++ ++ ++ ++ ++ ++ ++ 1 ++ False ++ ++ ++ ++ ++ True ++ 0 ++ Optional ++ True ++ ++ Optional ++ ++ ++ ++ tab ++ 1 ++ False ++ False ++ ++ ++ ++ ++ 2 ++ ++ ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ True ++ 3 ++ 3 ++ ++ ++ True ++ True ++ True ++ Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file. ++ ++ Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file. ++ ++ ++ ++ True ++ 0 ++ 0 ++ ++ ++ True ++ 2 ++ ++ ++ True ++ gtk-add ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ _Import Saved Configuration... ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 3 ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ + +diff -Nrup ../network-manager-vpnc_0.6.4svn2422/src/nm-vpnc-service.c ./src/nm-vpnc-service.c +--- ../network-manager-vpnc_0.6.4svn2422/src/nm-vpnc-service.c 2007-03-06 16:08:43.000000000 +0100 ++++ ./src/nm-vpnc-service.c 2007-03-11 22:28:59.000000000 +0100 +@@ -504,6 +504,8 @@ static gboolean nm_vpnc_config_options_v + { "Perfect Forward Secrecy", OPT_TYPE_ASCII }, + { "Application Version", OPT_TYPE_ASCII }, + { "Rekeying interval", OPT_TYPE_ASCII }, ++ { "Disable NAT Traversal", OPT_TYPE_NONE }, ++ { "Enable Single DES", OPT_TYPE_NONE }, + { "NAT-Keepalive packet interval", OPT_TYPE_ASCII }, + { NULL, OPT_TYPE_UNKNOWN } + };