Mailinglist Archive: yast-commit (129 mails)

[mfilka@xxxxxxxxxxxxxxxxx]

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@xxxxxxxx
+
+- bnc#750325 - allow apostrophe in ESSID
+- 2.23.0 
+
+-------------------------------------------------------------------
 Tue Apr 24 13:35:28 CEST 2012 - ug@xxxxxxx
 
 - 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-04.JA/1400br/h_ap_sec_ap-client-security.html
+    // 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<string, any>)SCR::Execute(.target.bash_output, 
command);
-        if (output["exit"]:-1==0){
-         list<string> networks = splitstring(output["stdout"]:"", "\n");
-         y2milestone("Found networks : %1", networks);
-         UI::ChangeWidget(`essid, `Items, 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<string, any>)SCR::Execute(.target.bash_output, 
command);
+
+            if (output["exit"]:-1==0){
+                list<string> networks = splitstring(output["stdout"]:"", "\n");
+                y2milestone("Found networks : %1", networks);
+                UI::ChangeWidget(`essid, `Items, networks);
+            }
        }
        else if (ret != `authmode)
        {

Modified: trunk/network/src/routines/routines.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.ycp?rev=68136&r1=68135&r2=68136&view=diff
==============================================================================
--- trunk/network/src/routines/routines.ycp (original)
+++ trunk/network/src/routines/routines.ycp Thu May 10 12:20:00 2012
@@ -378,32 +378,6 @@
  return hardware;
 }
 
-string getIfcName(string devicename){
- string ifcfg="";
- string interfacetype = NetworkInterfaces::device_type( devicename );
- // for special s390 interface types write static configuration
- if (contains(["qeth", "hsi", "ctc", "lcs", "iucv"], interfacetype)){
-  y2internal("special device type %1", interfacetype);
-//  ifcfg=sformat("ifcfg-%1", hwfile);
-  y2error("TODO: create ifcfg file for s390");
- } else {
-        y2internal("usual type %1", interfacetype);
-        // if MAC available - use it for name
-//      if (size(hwcfg["HWD_ID"]:"")>0){
-//       ifcfg = sformat("ifcfg-%1-id-%2", interfacetype, hwcfg["HWD_ID"]:"");
-//       y2internal("MAC address available - use it for name %1", ifcfg);
-//      } else {
-               // in case MAC is not available, use device name (eth0) 
-                ifcfg = sformat("ifcfg-%1", devicename );
-//              y2internal("MAC address not available - use device name %1", 
ifcfg);
-//             }
-       }
- y2internal("interface configuration file %1", ifcfg);
- return ifcfg;
-}
-
-
-
 define string DistinguishedName(string name, map hwdevice) {
     if(hwdevice["sysfs_bus_id"]:"" != "")
        return sformat("%1 (%2)", name, hwdevice["sysfs_bus_id"]:"");

Modified: trunk/network/yast2-network.spec.in
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?rev=68136&r1=68135&r2=68136&view=diff
==============================================================================
--- trunk/network/yast2-network.spec.in (original)
+++ trunk/network/yast2-network.spec.in Thu May 10 12:20:00 2012
@@ -12,8 +12,9 @@
 
 # NetworkInterfaces::Write should write ifcfgs only once
 # Wizard::SetDesktopTitleAndIcon
+# yast2 v2.23.0 - support for shel (un)quoting
 BuildRequires:  yast2 >= 2.21.22
-Requires:       yast2 >= 2.21.22
+Requires:       yast2 >= 2.23.0
 
 #netconfig (FaTE #303618)
 Requires:       sysconfig >= 0.71.2

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx