colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* libnm-util/nm-setting-ppp.c
	  libnm-util/nm-setting-ppp.h
	  src/ppp-manager/nm-ppp-manager.c
		- Add 'refuse-pap' and 'refuse-mschapv2' options



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3577 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-04-18 17:55:38 +00:00
parent 5e3121cee8
commit a99508edb1
4 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
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
- Add 'refuse-pap' and 'refuse-mschapv2' options
2008-04-18 Dan Williams <dcbw@redhat.com> 2008-04-18 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting-ppp.c * libnm-util/nm-setting-ppp.c

39
libnm-util/nm-setting-ppp.c
View File

@@ -8,8 +8,10 @@ enum {
PROP_0, PROP_0,
PROP_NOAUTH, PROP_NOAUTH,
PROP_REFUSE_EAP, PROP_REFUSE_EAP,
PROP_REFUSE_PAP,
PROP_REFUSE_CHAP, PROP_REFUSE_CHAP,
PROP_REFUSE_MSCHAP, PROP_REFUSE_MSCHAP,
PROP_REFUSE_MSCHAPV2,
PROP_NOBSDCOMP, PROP_NOBSDCOMP,
PROP_NODEFLATE, PROP_NODEFLATE,
PROP_REQUIRE_MPPE, PROP_REQUIRE_MPPE,
@@ -34,7 +36,14 @@ nm_setting_ppp_new (void)
static gboolean static gboolean
verify (NMSetting *setting, GSList *all_settings) verify (NMSetting *setting, GSList *all_settings)
{ {
/* NMSettingPPP *self = NM_SETTING_PPP (setting); */ NMSettingPPP *self = NM_SETTING_PPP (setting);
if (self->noauth) {
if (self->require_mppe) {
g_warning ("Option 'noauth' incompatible with 'require-mppe'");
return FALSE;
}
}
/* FIXME: Do we even want this or can we just let pppd evaluate the options? */ /* FIXME: Do we even want this or can we just let pppd evaluate the options? */
return TRUE; return TRUE;
@@ -59,12 +68,18 @@ set_property (GObject *object, guint prop_id,
case PROP_REFUSE_EAP: case PROP_REFUSE_EAP:
setting->refuse_eap = g_value_get_boolean (value); setting->refuse_eap = g_value_get_boolean (value);
break; break;
case PROP_REFUSE_PAP:
setting->refuse_pap = g_value_get_boolean (value);
break;
case PROP_REFUSE_CHAP: case PROP_REFUSE_CHAP:
setting->refuse_chap = g_value_get_boolean (value); setting->refuse_chap = g_value_get_boolean (value);
break; break;
case PROP_REFUSE_MSCHAP: case PROP_REFUSE_MSCHAP:
setting->refuse_mschap = g_value_get_boolean (value); setting->refuse_mschap = g_value_get_boolean (value);
break; break;
case PROP_REFUSE_MSCHAPV2:
setting->refuse_mschapv2 = g_value_get_boolean (value);
break;
case PROP_NOBSDCOMP: case PROP_NOBSDCOMP:
setting->nobsdcomp = g_value_get_boolean (value); setting->nobsdcomp = g_value_get_boolean (value);
break; break;
@@ -117,12 +132,18 @@ get_property (GObject *object, guint prop_id,
case PROP_REFUSE_EAP: case PROP_REFUSE_EAP:
g_value_set_boolean (value, setting->refuse_eap); g_value_set_boolean (value, setting->refuse_eap);
break; break;
case PROP_REFUSE_PAP:
g_value_set_boolean (value, setting->refuse_pap);
break;
case PROP_REFUSE_CHAP: case PROP_REFUSE_CHAP:
g_value_set_boolean (value, setting->refuse_chap); g_value_set_boolean (value, setting->refuse_chap);
break; break;
case PROP_REFUSE_MSCHAP: case PROP_REFUSE_MSCHAP:
g_value_set_boolean (value, setting->refuse_mschap); g_value_set_boolean (value, setting->refuse_mschap);
break; break;
case PROP_REFUSE_MSCHAPV2:
g_value_set_boolean (value, setting->refuse_mschapv2);
break;
case PROP_NOBSDCOMP: case PROP_NOBSDCOMP:
g_value_set_boolean (value, setting->nobsdcomp); g_value_set_boolean (value, setting->nobsdcomp);
break; break;
@@ -190,6 +211,14 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
FALSE, FALSE,
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
g_object_class_install_property
(object_class, PROP_REFUSE_PAP,
g_param_spec_boolean (NM_SETTING_PPP_REFUSE_PAP,
"Refuse PAP",
"Refuse PAP",
FALSE,
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
g_object_class_install_property g_object_class_install_property
(object_class, PROP_REFUSE_CHAP, (object_class, PROP_REFUSE_CHAP,
g_param_spec_boolean (NM_SETTING_PPP_REFUSE_CHAP, g_param_spec_boolean (NM_SETTING_PPP_REFUSE_CHAP,
@@ -206,6 +235,14 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
FALSE, FALSE,
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
g_object_class_install_property
(object_class, PROP_REFUSE_MSCHAPV2,
g_param_spec_boolean (NM_SETTING_PPP_REFUSE_MSCHAPV2,
"Refuse MSCHAPv2",
"Refuse MSCHAPv2",
FALSE,
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
g_object_class_install_property g_object_class_install_property
(object_class, PROP_NOBSDCOMP, (object_class, PROP_NOBSDCOMP,
g_param_spec_boolean (NM_SETTING_PPP_NOBSDCOMP, g_param_spec_boolean (NM_SETTING_PPP_NOBSDCOMP,

4
libnm-util/nm-setting-ppp.h
View File

@@ -18,8 +18,10 @@ G_BEGIN_DECLS
#define NM_SETTING_PPP_NOAUTH "noauth" #define NM_SETTING_PPP_NOAUTH "noauth"
#define NM_SETTING_PPP_REFUSE_EAP "refuse-eap" #define NM_SETTING_PPP_REFUSE_EAP "refuse-eap"
#define NM_SETTING_PPP_REFUSE_PAP "refuse-pap"
#define NM_SETTING_PPP_REFUSE_CHAP "refuse-chap" #define NM_SETTING_PPP_REFUSE_CHAP "refuse-chap"
#define NM_SETTING_PPP_REFUSE_MSCHAP "refuse-mschap" #define NM_SETTING_PPP_REFUSE_MSCHAP "refuse-mschap"
#define NM_SETTING_PPP_REFUSE_MSCHAPV2 "refuse-mschapv2"
#define NM_SETTING_PPP_NOBSDCOMP "nobsdcomp" #define NM_SETTING_PPP_NOBSDCOMP "nobsdcomp"
#define NM_SETTING_PPP_NODEFLATE "nodeflate" #define NM_SETTING_PPP_NODEFLATE "nodeflate"
#define NM_SETTING_PPP_REQUIRE_MPPE "require-mppe" #define NM_SETTING_PPP_REQUIRE_MPPE "require-mppe"
@@ -37,8 +39,10 @@ typedef struct {
gboolean noauth; gboolean noauth;
gboolean refuse_eap; gboolean refuse_eap;
gboolean refuse_pap;
gboolean refuse_chap; gboolean refuse_chap;
gboolean refuse_mschap; gboolean refuse_mschap;
gboolean refuse_mschapv2;
gboolean nobsdcomp; gboolean nobsdcomp;
gboolean nodeflate; gboolean nodeflate;
gboolean require_mppe; gboolean require_mppe;

4
src/ppp-manager/nm-ppp-manager.c
View File

@@ -527,10 +527,14 @@ create_pppd_cmd_line (NMSettingPPP *setting,
nm_cmd_line_add_string (cmd, "noauth"); nm_cmd_line_add_string (cmd, "noauth");
if (setting->refuse_eap) if (setting->refuse_eap)
nm_cmd_line_add_string (cmd, "refuse-eap"); nm_cmd_line_add_string (cmd, "refuse-eap");
if (setting->refuse_pap)
nm_cmd_line_add_string (cmd, "refuse-pap");
if (setting->refuse_chap) if (setting->refuse_chap)
nm_cmd_line_add_string (cmd, "refuse-chap"); nm_cmd_line_add_string (cmd, "refuse-chap");
if (setting->refuse_mschap) if (setting->refuse_mschap)
nm_cmd_line_add_string (cmd, "refuse-mschap"); nm_cmd_line_add_string (cmd, "refuse-mschap");
if (setting->refuse_mschapv2)
nm_cmd_line_add_string (cmd, "refuse-mschap-v2");
if (setting->nobsdcomp) if (setting->nobsdcomp)
nm_cmd_line_add_string (cmd, "nobsdcomp"); nm_cmd_line_add_string (cmd, "nobsdcomp");
if (setting->nodeflate) if (setting->nodeflate)