NetworkManager r3577 - in trunk: . libnm-util src/ppp-manager

[dcbw svn gnome org]

Author: dcbw
Date: Fri Apr 18 17:55:38 2008
New Revision: 3577
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3577&view=rev

Log:
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



Modified:
   trunk/ChangeLog
   trunk/libnm-util/nm-setting-ppp.c
   trunk/libnm-util/nm-setting-ppp.h
   trunk/src/ppp-manager/nm-ppp-manager.c

Modified: trunk/libnm-util/nm-setting-ppp.c
==============================================================================
--- trunk/libnm-util/nm-setting-ppp.c	(original)
+++ trunk/libnm-util/nm-setting-ppp.c	Fri Apr 18 17:55:38 2008
@@ -8,8 +8,10 @@
 	PROP_0,
 	PROP_NOAUTH,
 	PROP_REFUSE_EAP,
+	PROP_REFUSE_PAP,
 	PROP_REFUSE_CHAP,
 	PROP_REFUSE_MSCHAP,
+	PROP_REFUSE_MSCHAPV2,
 	PROP_NOBSDCOMP,
 	PROP_NODEFLATE,
 	PROP_REQUIRE_MPPE,
@@ -34,7 +36,14 @@
 static gboolean
 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? */
 	return TRUE;
@@ -59,12 +68,18 @@
 	case PROP_REFUSE_EAP:
 		setting->refuse_eap = g_value_get_boolean (value);
 		break;
+	case PROP_REFUSE_PAP:
+		setting->refuse_pap = g_value_get_boolean (value);
+		break;
 	case PROP_REFUSE_CHAP:
 		setting->refuse_chap = g_value_get_boolean (value);
 		break;
 	case PROP_REFUSE_MSCHAP:
 		setting->refuse_mschap = g_value_get_boolean (value);
 		break;
+	case PROP_REFUSE_MSCHAPV2:
+		setting->refuse_mschapv2 = g_value_get_boolean (value);
+		break;
 	case PROP_NOBSDCOMP:
 		setting->nobsdcomp = g_value_get_boolean (value);
 		break;
@@ -117,12 +132,18 @@
 	case PROP_REFUSE_EAP:
 		g_value_set_boolean (value, setting->refuse_eap);
 		break;
+	case PROP_REFUSE_PAP:
+		g_value_set_boolean (value, setting->refuse_pap);
+		break;
 	case PROP_REFUSE_CHAP:
 		g_value_set_boolean (value, setting->refuse_chap);
 		break;
 	case PROP_REFUSE_MSCHAP:
 		g_value_set_boolean (value, setting->refuse_mschap);
 		break;
+	case PROP_REFUSE_MSCHAPV2:
+		g_value_set_boolean (value, setting->refuse_mschapv2);
+		break;
 	case PROP_NOBSDCOMP:
 		g_value_set_boolean (value, setting->nobsdcomp);
 		break;
@@ -191,6 +212,14 @@
 						   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
 		(object_class, PROP_REFUSE_CHAP,
 		 g_param_spec_boolean (NM_SETTING_PPP_REFUSE_CHAP,
 						   "Refuse CHAP",
@@ -207,6 +236,14 @@
 						   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
 		(object_class, PROP_NOBSDCOMP,
 		 g_param_spec_boolean (NM_SETTING_PPP_NOBSDCOMP,
 						   "No BSD compression",

Modified: trunk/libnm-util/nm-setting-ppp.h
==============================================================================
--- trunk/libnm-util/nm-setting-ppp.h	(original)
+++ trunk/libnm-util/nm-setting-ppp.h	Fri Apr 18 17:55:38 2008
@@ -18,8 +18,10 @@
 
 #define NM_SETTING_PPP_NOAUTH            "noauth"
 #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_MSCHAP     "refuse-mschap"
+#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
 #define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
 #define NM_SETTING_PPP_NODEFLATE         "nodeflate"
 #define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
@@ -37,8 +39,10 @@
 
 	gboolean noauth;
 	gboolean refuse_eap;
+	gboolean refuse_pap;
 	gboolean refuse_chap;
 	gboolean refuse_mschap;
+	gboolean refuse_mschapv2;
 	gboolean nobsdcomp;
 	gboolean nodeflate;
 	gboolean require_mppe;

Modified: trunk/src/ppp-manager/nm-ppp-manager.c
==============================================================================
--- trunk/src/ppp-manager/nm-ppp-manager.c	(original)
+++ trunk/src/ppp-manager/nm-ppp-manager.c	Fri Apr 18 17:55:38 2008
@@ -527,10 +527,14 @@
 		nm_cmd_line_add_string (cmd, "noauth");
 	if (setting->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)
 		nm_cmd_line_add_string (cmd, "refuse-chap");
 	if (setting->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)
 		nm_cmd_line_add_string (cmd, "nobsdcomp");
 	if (setting->nodeflate)