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

* src/supplicant-manager/nm-supplicant-settings-verify.c
		- eap_allowed, phase2_allowed: harmonize with allowed values from
			nm-settings.c



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3009 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-10-23 18:28:41 +00:00
parent 2e00167855
commit 657121419e
2 changed files with 14 additions and 4 deletions

View file

@ -1,3 +1,9 @@
2007-10-23 Dan Williams <dcbw@redhat.com>
* src/supplicant-manager/nm-supplicant-settings-verify.c
- eap_allowed, phase2_allowed: harmonize with allowed values from
nm-settings.c
2007-10-23 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-11-wireless.c

View file

@ -69,13 +69,17 @@ const char * proto_allowed[] = { "WPA", "RSN", NULL };
const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X",
"NONE", NULL };
const char * auth_alg_allowed[] = { "OPEN", "SHARED", "LEAP", NULL };
const char * eap_allowed[] = { "MD5", "TLS", "PEAP", "TTLS", "SIM",
"PSK", NULL };
const char * eap_allowed[] = { "LEAP", "MD5", "TLS", "PEAP", "TTLS", "SIM",
"PSK", "FAST", NULL };
const char * phase1_allowed[] = {"peapver=0", "peapver=1", "peaplabel=1",
"peap_outer_success=0", "include_tls_length=1",
"sim_min_num_chal=3", NULL };
const char * phase2_allowed[] = {"auth=MSCHAPV2", "auth=PAP", "autheap=TLS",
"autheap=MSCHAPV2", "autheap=MD5", NULL };
const char * phase2_allowed[] = {"auth=PAP", "auth=CHAP", "auth=MSCHAP",
"auth=MSCHAPV2", "auth=GTC", "auth=OTP",
"auth=MD5", "auth=TLS", "autheap=MD5",
"autheap=MSCHAPV2", "autheap=OTP",
"autheap=GTC", "autheap=TLS", NULL };
static const struct Opt opt_table[] = {
{ "ssid", TYPE_BYTES, 0, 32,FALSE, NULL },