Author: mfilka
Date: Thu May 10 12:20:00 2012
New Revision: 68136
URL: http://svn.opensuse.org/viewcvs/yast?rev=68136&view=rev
Log:
allows single quotes in ESSID - bnc#750325
Modified:
trunk/network/VERSION
trunk/network/package/yast2-network.changes
trunk/network/src/lan/wireless.ycp
trunk/network/src/routines/routines.ycp
trunk/network/yast2-network.spec.in
Modified: trunk/network/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=68136&r1=68135&r2=68136&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Thu May 10 12:20:00 2012
@@ -1 +1 @@
-2.22.7
+2.23.0
Modified: trunk/network/package/yast2-network.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=68136&r1=68135&r2=68136&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Thu May 10 12:20:00 2012
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed May 2 07:19:02 UTC 2012 - mfilka@suse.com
+
+- bnc#750325 - allow apostrophe in ESSID
+- 2.23.0
+
+-------------------------------------------------------------------
Tue Apr 24 13:35:28 CEST 2012 - ug@suse.de
- keep_install_network added to rnc file (bnc#758529)
Modified: trunk/network/src/lan/wireless.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/wireless.ycp?rev=68136&r1=68135&r2=68136&view=diff
==============================================================================
--- trunk/network/src/lan/wireless.ycp (original)
+++ trunk/network/src/lan/wireless.ycp Thu May 10 12:20:00 2012
@@ -278,9 +278,19 @@
Wizard::SetContentsButtons(caption, contents, sformat("%1%2%3", help["wireless"]:"", help["wep_key"]:"", help["wpa"]:""),
Label::BackButton(), Label::NextButton());
- // workaround for #118157
- string no_apos = deletechars (String::CPrint (), "'");
- UI::ChangeWidget (`id (`essid), `ValidChars, no_apos);
+ //
+ // Situation with (E)SSID is not as clear as it should be.
+ // According IEEE 802.11-2007 it should be between 0 and 32 octets (sometimes including trailing \0).
+ //
+ // However, vendors can have additional limits.
+ // According http://www.cisco.com/web/techdoc/wireless/access_points/online_help/eag/123-...
+ // characters ?, ", $, [, \, ], + are disallowed. Moreover !, #, : shouldn't be at beginning of the id.
+ // As this is only part of vendor specification and an APs which breaks that rule (see http://www.wirelessforums.org/alt-internet-wireless/ssid-33892.html)
+ // this is ignored.
+ //
+ // Eventually, as a note to bnc#118157 and bnc#750325 an ' (apostrophe) is valid character in ESSID.
+ //
+ UI::ChangeWidget (`id (`essid), `ValidChars, String::CPrint ());
UI::ChangeWidget (`id (`authmode), `Value, authmode);
if (authmode != "eap")
@@ -299,7 +309,7 @@
UI::ChangeWidget (`id (`type_g), `Enabled, authmode!="no-encryption" && authmode!="eap");
UI::ChangeWidget (`id (`key), `Enabled, authmode!="no-encryption" && authmode!="eap");
UI::ChangeWidget (`id (`keys), `Enabled, authmode!="no-encryption" && !authmode_wpa);
- UI::ChangeWidget (`id ("ascii"), `Enabled, authmode!="no-encryption" && authmode!="psk");
+ UI::ChangeWidget (`id ("ascii"), `Enabled, authmode!="no-encryption" && authmode!="psk");
ret = UI::UserInput();
@@ -401,13 +411,14 @@
break;
}
else if (ret == `scan_for_networks){
- string command = sformat("ip link set %1 up && iwlist %1 scan|grep ESSID|cut -d':' -f2|cut -d'\"' -f2|sort -u", LanItems::Items[LanItems::current, "ifcfg"]:"");
- map output = (map