fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-08 18:30:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-12-03 Dan Williams <dcbw@redhat.com>

Browse source 
Patch from Nathaniel McCallum <nathaniel@natemccallum.com>

	* properties/nm-ppp-dialog.glade
	  properties/nm-ppp-properties.c
	  src/nm-ppp-starter.c
		- Add option for Stateful MPPE


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2156 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2006-12-04 03:48:12 +00:00
parent c58410c6e3
commit 8e541d71cf
4 changed files with 47 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
vpn-daemons/pptp/ChangeLog
View file

@ -1,3 +1,12 @@
2006-12-03 Dan Williams <dcbw@redhat.com>
Patch from Nathaniel McCallum <nathaniel@natemccallum.com>
* properties/nm-ppp-dialog.glade
properties/nm-ppp-properties.c
src/nm-ppp-starter.c
- Add option for Stateful MPPE
2006-10-30 Tambet Ingo <tambet@ximian.com>
* src/nm-pppd-plugin.c: Remove the leading NetworkManager directory

25
vpn-daemons/pptp/properties/nm-ppp-dialog.glade
View file

@ -1317,7 +1317,7 @@ e.g. &quot;Campus VPN&quot; or &quot;Corporate Network&quot;</property>
<child>
<widget class="GtkTable" id="table11">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_rows">3</property>
<property name="n_columns">1</property>
<property name="homogeneous">False</property>
<property name="row_spacing">0</property>
@ -1366,6 +1366,29 @@ e.g. &quot;Campus VPN&quot; or &quot;Corporate Network&quot;</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="encrypt-mppe-stateful">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Enable stateful MPPE</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
</widget>
</child>
</widget>

8
vpn-daemons/pptp/properties/nm-ppp-properties.c
View file

@ -73,6 +73,7 @@
#define VPNUI_BTGPRS_DEFAULTS "ppp-connection-type=btgprs;" \
"encrypt-mppe=no;" \
"encrypt-mppe-128=no;" \
"encrypt-mppe-stateful=no;" \
"compress-mppc=no;" \
"compress-bsd=no;" \
"compress-deflate=no;" \
@ -82,6 +83,7 @@
"ppp-connection-type=pptp;" \
"encrypt-mppe=no;" \
"encrypt-mppe-128=yes;" \
"encrypt-mppe-stateful=yes;" \
"compress-mppc=no;" \
"compress-bsd=no;" \
"compress-deflate=no;" \
@ -93,6 +95,7 @@
"ppp-connection-type=dialup;" \
"encrypt-mppe=no;" \
"encrypt-mppe-128=no;" \
"encrypt-mppe-stateful=no;" \
"compress-mppc=no;" \
"compress-bsd=no;" \
"compress-deflate=no;" \
@ -208,6 +211,11 @@ impl_setup (NetworkManagerVpnUIImpl *impl)
"encrypt-mppe-128", "Encrypt-MPPE-128", _("Use 128 bit MPPE encryption"),
NULL, NULL, impl );
opt = vpnui_opt_new(
"encrypt-mppe-stateful" , VPN_UI_OPTTYPE_YESNO ,
"encrypt-mppe-stateful", "Encrypt-MPPE-Stateful", _("Enable stateful MPPE"),
NULL, NULL, impl );
opt = vpnui_opt_new(
"compress-mppc" , VPN_UI_OPTTYPE_YESNO ,
"compress-mppc", "Compress-MPPC", _("Use MPPC compression"),

6
vpn-daemons/pptp/src/nm-ppp-starter.c
View file

@ -716,6 +716,10 @@ static gint nm_ppp_get_cmdline_ppp (NmPPPData *data, char **data_items, const in
(strcmp( data_items[++i], "yes" ) == 0) ) {
g_ptr_array_add (ppp_argv, (gpointer) "require-mppe-128");
} else if ( (strcmp( data_items[i], "encrypt-mppe-stateful" ) == 0) &&
(strcmp( data_items[++i], "yes" ) == 0) ) {
g_ptr_array_add (ppp_argv, (gpointer) "mppe-stateful");
} else if ( (strcmp( data_items[i], "compress-mppc" ) == 0) &&
(strcmp( data_items[++i], "yes" ) == 0) ) {
g_ptr_array_add (ppp_argv, (gpointer) "require-mppc");
@ -895,6 +899,7 @@ static gboolean nm_ppp_config_options_validate (NmPPPData *data, char **data_ite
{ "compress-deflate", OPT_TYPE_ASCII },
{ "encrypt-mppe", OPT_TYPE_ASCII },
{ "encrypt-mppe-128", OPT_TYPE_ASCII },
{ "encrypt-mppe-stateful", OPT_TYPE_ASCII },
{ "ppp-auth-peer", OPT_TYPE_ASCII },
{ "ppp-refuse-eap", OPT_TYPE_ASCII },
{ "ppp-refuse-chap", OPT_TYPE_ASCII },
@ -921,6 +926,7 @@ static gboolean nm_ppp_config_options_validate (NmPPPData *data, char **data_ite
{ NULL, OPT_TYPE_UNKNOWN } };
PPPOption allowed_extra_ppp_opts[] = {
{ "mppe-stateful", 0 },
{ "require-mppe-128", 0 },
{ "refuse-eap", 0 },
{ "refuse-chap", 0 },