NetworkManager r3800 - in trunk: . libnm-util

[dcbw svn gnome org]

Author: dcbw
Date: Wed Jul  2 16:08:04 2008
New Revision: 3800
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3800&view=rev

Log:
2008-07-02  Dan Williams  <dcbw redhat com>

	* libnm-util/nm-setting-8021x.c
		- (verify): allow forcing the PEAP label to 0



Modified:
   trunk/ChangeLog
   trunk/libnm-util/nm-setting-8021x.c

Modified: trunk/libnm-util/nm-setting-8021x.c
==============================================================================
--- trunk/libnm-util/nm-setting-8021x.c	(original)
+++ trunk/libnm-util/nm-setting-8021x.c	Wed Jul  2 16:08:04 2008
@@ -448,6 +448,7 @@
 	NMSetting8021x *self = NM_SETTING_802_1X (setting);
 	const char *valid_eap[] = { "leap", "md5", "tls", "peap", "ttls", "sim", "fast", NULL };
 	const char *valid_phase1_peapver[] = { "0", "1", NULL };
+	const char *valid_phase1_peaplabel[] = { "0", "1", NULL };
 	const char *valid_phase2_auth[] = { "pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", "tls", NULL };
 	const char *valid_phase2_autheap[] = { "md5", "mschapv2", "otp", "gtc", "tls", NULL };
 	GSList *iter;
@@ -495,7 +496,7 @@
 		return FALSE;
 	}
 
-	if (self->phase1_peaplabel && strcmp (self->phase1_peaplabel, "1")) {
+	if (self->phase1_peaplabel && !nm_utils_string_in_list (self->phase1_peaplabel, valid_phase1_peaplabel)) {
 		g_set_error (error,
 		             NM_SETTING_802_1X_ERROR,
 		             NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,