summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2014-10-02 12:04:12 -0500
committerDan Williams <dcbw@redhat.com>2014-10-08 21:55:20 -0500
commit4a6ded1cfdad707dfef54e7b1afa96f0c9412d59 (patch)
treea907dbfb4f8bbd7055559c79806f2b36901d26d2
parentf77297ec85ad40d3df9a6a1ce7aee4823f63bc7c (diff)
downloadNetworkManager-4a6ded1cfdad707dfef54e7b1afa96f0c9412d59.tar.gz
supplicant: fix handling of 'freq_list' option and band locking (bgo #737795)
The supplicant has a custom parsing function for freq_list which handles the list as a string. Having NM marshal the option as TYPE_BYTES causes the supplicant to interpret the values that NM passes (which are in ASCII) as a byte-array and thus the supplicant gets a bogus frequency list. Instead, NM should marshal freq_list as a simple string (using TYPE_KEYWORD without value checking). https://bugzilla.gnome.org/show_bug.cgi?id=737795
-rw-r--r--src/supplicant-manager/nm-supplicant-settings-verify.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.c b/src/supplicant-manager/nm-supplicant-settings-verify.c
index f7d4ca58c4..3571c575ee 100644
--- a/src/supplicant-manager/nm-supplicant-settings-verify.c
+++ b/src/supplicant-manager/nm-supplicant-settings-verify.c
@@ -137,7 +137,7 @@ static const struct Opt opt_table[] = {
{ "proactive_key_caching", TYPE_INT, 0, 1, FALSE, NULL },
{ "bgscan", TYPE_BYTES, 0, 0, FALSE, NULL },
{ "pac_file", TYPE_BYTES, 0, 1024, FALSE, NULL },
- { "freq_list", TYPE_BYTES, 0, 0, FALSE, NULL },
+ { "freq_list", TYPE_KEYWORD, 0, 0, FALSE, NULL },
};