system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-06 16:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

2008-07-02 Dan Williams <dcbw@redhat.com>

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



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3800 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-07-02 16:08:04 +00:00
parent 7646f5a7b1
commit a8a0c113a7
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-07-02 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting-8021x.c
- (verify): allow forcing the PEAP label to 0
2008-07-02 Dan Williams <dcbw@redhat.com>
* introspection/nm-active-connection.xml

3
libnm-util/nm-setting-8021x.c
View file

@ -448,6 +448,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
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 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
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,