From 147d3293fd3460f4d3140ff9895ffa0e2625abd8 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 4 Sep 2008 17:26:19 +0000 Subject: [PATCH] 2008-09-04 Dan Williams * src/supplicant-manager/nm-supplicant-settings-verify.c - Allow WPA-NONE key management for Ad-Hoc WPA connections git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4035 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ src/supplicant-manager/nm-supplicant-settings-verify.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b32d17b0e2..a55415cda4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-09-04 Dan Williams + + * src/supplicant-manager/nm-supplicant-settings-verify.c + - Allow WPA-NONE key management for Ad-Hoc WPA connections + 2008-09-04 Dan Williams * libnm-util/nm-setting-vpn.c diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.c b/src/supplicant-manager/nm-supplicant-settings-verify.c index ad849cebb5..76f7b78df2 100644 --- a/src/supplicant-manager/nm-supplicant-settings-verify.c +++ b/src/supplicant-manager/nm-supplicant-settings-verify.c @@ -66,7 +66,7 @@ static const struct validate_entry validate_table[] = { const char * pairwise_allowed[] = { "CCMP", "TKIP", "NONE", NULL }; const char * group_allowed[] = { "CCMP", "TKIP", "WEP104", "WEP40", NULL }; const char * proto_allowed[] = { "WPA", "RSN", NULL }; -const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X", +const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X", "WPA-NONE", "NONE", NULL }; const char * auth_alg_allowed[] = { "OPEN", "SHARED", "LEAP", NULL }; const char * eap_allowed[] = { "LEAP", "MD5", "TLS", "PEAP", "TTLS", "SIM",