← Back to branch summary

~network-manager/network-manager/ubuntu.hardy.07

« back to all changes in this revision

Viewing changes to src/supplicant-manager/nm-supplicant-settings-verify.c

* merge 0.7~~svn20080905t025540+eni0 snapshot to hardy branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/supplicant-manager/nm-supplicant-settings-verify.c
66
66
const char * pairwise_allowed[] = { "CCMP", "TKIP", "NONE", NULL };
67
67
const char * group_allowed[] =    { "CCMP", "TKIP", "WEP104", "WEP40", NULL };
68
68
const char * proto_allowed[] =    { "WPA", "RSN", NULL };
69
 
const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X",
 
69
const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X", "WPA-NONE",
70
70
                                    "NONE", NULL };
71
71
const char * auth_alg_allowed[] = { "OPEN", "SHARED", "LEAP", NULL };
72
72
const char * eap_allowed[] =      { "LEAP", "MD5", "TLS", "PEAP", "TTLS", "SIM",