fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 14:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2007-10-16 Dan Williams <dcbw@redhat.com>

Browse source 
* libnm-util/nm-setting.c
		- (setting_wireless_security_verify): fix phase2_auth methods; 'sim'
			also isn't valid phase2 autheap method



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2984 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-10-17 02:22:35 +00:00
parent 8d260a57f1
commit 8ea008c55c
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-10-16 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting.c
- (setting_wireless_security_verify): fix phase2_auth methods; 'sim'
also isn't valid phase2 autheap method
2007-10-16 Dan Williams <dcbw@redhat.com> 2007-10-16 Dan Williams <dcbw@redhat.com>
* libnm-glib/nm-client.c * libnm-glib/nm-client.c

5
libnm-util/nm-setting.c
View file

@ -793,7 +793,8 @@ setting_wireless_security_verify (NMSetting *setting, GHashTable *all_settings)
const char *valid_groups[] = { "wep40", "wep104", "tkip", "ccmp", NULL }; const char *valid_groups[] = { "wep40", "wep104", "tkip", "ccmp", NULL };
const char *valid_eap[] = { "leap", "md5", "tls", "peap", "ttls", "sim", "psk", "fast", NULL }; const char *valid_eap[] = { "leap", "md5", "tls", "peap", "ttls", "sim", "psk", "fast", NULL };
const char *valid_phase1_peapver[] = { "0", "1", NULL }; const char *valid_phase1_peapver[] = { "0", "1", NULL };
const char *valid_phase2_autheap[] = { "md5", "mschapv2", "otp", "gtc", "tls", "sim", 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 };
if (!self->key_mgmt || !string_in_list (self->key_mgmt, valid_key_mgmt)) { if (!self->key_mgmt || !string_in_list (self->key_mgmt, valid_key_mgmt)) {
g_warning ("Missing or invalid key management"); g_warning ("Missing or invalid key management");
@ -845,7 +846,7 @@ setting_wireless_security_verify (NMSetting *setting, GHashTable *all_settings)
return FALSE; return FALSE;
} }
if (self->phase2_auth && strcmp (self->phase2_auth, "mschapv2")) { if (self->phase2_auth && !string_in_list (self->phase2_auth, valid_phase2_auth)) {
g_warning ("Invalid phase2 authentication"); g_warning ("Invalid phase2 authentication");
return FALSE; return FALSE;
} }