2008-04-18 Dan Williams <dcbw@redhat.com>

* libnm-util/nm-setting-ppp.c
	  libnm-util/nm-setting-ppp.h
	  src/ppp-manager/nm-ppp-manager.c
		- Remove the 'require-mppc' option, because pppd doesn't support it and
			it seems to have been an erroneous addition to the PPTP plugin in
			the first place (from which the ppp-manager is derived)



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3575 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-04-18 16:37:35 +00:00
parent d37629c6ca
commit a8f9a8d38e
4 changed files with 9 additions and 19 deletions

View file

@ -1,3 +1,12 @@
2008-04-18 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting-ppp.c
libnm-util/nm-setting-ppp.h
src/ppp-manager/nm-ppp-manager.c
- Remove the 'require-mppc' option, because pppd doesn't support it and
it seems to have been an erroneous addition to the PPTP plugin in
the first place (from which the ppp-manager is derived)
2008-04-17 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting-pppoe.c

View file

@ -15,7 +15,6 @@ enum {
PROP_REQUIRE_MPPE,
PROP_REQUIRE_MPPE_128,
PROP_MPPE_STATEFUL,
PROP_REQUIRE_MPPC,
PROP_CRTSCTS,
PROP_USEPEERDNS,
PROP_BAUD,
@ -82,9 +81,6 @@ set_property (GObject *object, guint prop_id,
case PROP_MPPE_STATEFUL:
setting->mppe_stateful = g_value_get_boolean (value);
break;
case PROP_REQUIRE_MPPC:
setting->require_mppc = g_value_get_boolean (value);
break;
case PROP_CRTSCTS:
setting->crtscts = g_value_get_boolean (value);
break;
@ -146,9 +142,6 @@ get_property (GObject *object, guint prop_id,
case PROP_MPPE_STATEFUL:
g_value_set_boolean (value, setting->mppe_stateful);
break;
case PROP_REQUIRE_MPPC:
g_value_set_boolean (value, setting->require_mppc);
break;
case PROP_CRTSCTS:
g_value_set_boolean (value, setting->crtscts);
break;
@ -260,14 +253,6 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
FALSE,
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
g_object_class_install_property
(object_class, PROP_REQUIRE_MPPC,
g_param_spec_boolean (NM_SETTING_PPP_REQUIRE_MPPC,
"Require MPPC",
"Require MPPC",
FALSE,
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
g_object_class_install_property
(object_class, PROP_CRTSCTS,
g_param_spec_boolean (NM_SETTING_PPP_CRTSCTS,

View file

@ -25,7 +25,6 @@ G_BEGIN_DECLS
#define NM_SETTING_PPP_REQUIRE_MPPE "require-mppe"
#define NM_SETTING_PPP_REQUIRE_MPPE_128 "require-mppe-128"
#define NM_SETTING_PPP_MPPE_STATEFUL "mpppe-stateful"
#define NM_SETTING_PPP_REQUIRE_MPPC "require-mppc"
#define NM_SETTING_PPP_CRTSCTS "crtscts"
#define NM_SETTING_PPP_USEPEERDNS "usepeerdns"
#define NM_SETTING_PPP_BAUD "baud"
@ -46,7 +45,6 @@ typedef struct {
gboolean require_mppe;
gboolean require_mppe_128;
gboolean mppe_stateful;
gboolean require_mppc;
gboolean crtscts;
gboolean usepeerdns;

View file

@ -541,8 +541,6 @@ create_pppd_cmd_line (NMSettingPPP *setting,
nm_cmd_line_add_string (cmd, "require-mppe-128");
if (setting->mppe_stateful)
nm_cmd_line_add_string (cmd, "mppe-stateful");
if (setting->require_mppc)
nm_cmd_line_add_string (cmd, "require-mppc");
if (setting->crtscts)
nm_cmd_line_add_string (cmd, "crtscts");
if (setting->usepeerdns)