Author: mzugec Date: Fri Oct 26 15:05:20 2007 New Revision: 41594 URL: http://svn.opensuse.org/viewcvs/yast?rev=41594&view=rev Log: leave WIRELESS_KEY_X and WIRELESS_WPA_PSK empty for "no encryption" auth mode (#335501) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/wireless.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=41594&r1=41593&r2=41594&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Oct 26 15:05:20 2007 @@ -1 +1 @@ -2.16.4 +2.16.5 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=41594&r1=41593&r2=41594&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Oct 26 15:05:20 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 26 15:01:43 CEST 2007 - mzugec@suse.de + +- leave WIRELESS_KEY_X and WIRELESS_WPA_PSK empty for "no encryption" + auth mode (#335501) +- 2.16.5 + +------------------------------------------------------------------- Fri Oct 26 12:38:52 CEST 2007 - mzugec@suse.de - when select dhcp don't remove static default GW for hotplug Modified: trunk/network/src/lan/wireless.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/wireless.ycp?rev=41594&r1=41593&r2=41594&view=diff ============================================================================== --- trunk/network/src/lan/wireless.ycp (original) +++ trunk/network/src/lan/wireless.ycp Fri Oct 26 15:05:20 2007 @@ -337,7 +337,12 @@ continue; } - key = (string) UI::QueryWidget (`id (`key), `Value); + if (authmode!="no-encryption" && authmode!="eap") key = (string) UI::QueryWidget (`id (`key), `Value); + else { + key=""; + LanItems::wl_key[LanItems::wl_default_key] = ""; + LanItems::wl_wpa_psk = ""; + } type = (string) UI::QueryWidget (`id (`type_g), `CurrentButton); if (authmode == "psk") { @@ -406,10 +411,12 @@ if (authmode == "psk") { LanItems::wl_wpa_psk = key; + LanItems::wl_key[LanItems::wl_default_key] = ""; } else if (!authmode_wpa && authmode!="no-encryption") { LanItems::wl_key[LanItems::wl_default_key] = ckey; + LanItems::wl_wpa_psk = ""; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org