Author: locilka Date: Thu Jul 21 15:24:21 2011 New Revision: 64931 URL: http://svn.opensuse.org/viewcvs/yast?rev=64931&view=rev Log: - Fixed SuSEfirewall2 config library: By default any unassigned network interface is automatically assigned to the external firewall zone (bnc#547309). - Fixed CWM library for opening ports in firewall not to list any empty strings returned by network module, just interface names (bnc#547309). - 2.21.5 Modified: trunk/yast2/VERSION trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp trunk/yast2/library/network/src/SuSEFirewall.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=64931&r1=64930&... ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Thu Jul 21 15:24:21 2011 @@ -1 +1 @@ -2.21.4 +2.21.5 Modified: trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/CWMFire... ============================================================================== --- trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp (original) +++ trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp Thu Jul 21 15:24:21 2011 @@ -33,6 +33,7 @@ import "SuSEFirewall"; import "Report"; import "Stage"; +import "String"; // used only for (Mode::installation() || Mode::update()) import "SuSEFirewallProposal"; @@ -139,7 +140,7 @@ y2milestone("Reading NetworkInterfaces..."); NetworkInterfaces::Read (); } - all_interfaces = NetworkInterfaces::List (""); + all_interfaces = String::NonEmpty (NetworkInterfaces::List ("")); all_interfaces = filter (string i, all_interfaces, { return i != "lo"; }); @@ -238,7 +239,7 @@ groups = add (groups, SuSEFirewall::special_all_interface_zone); } - groups = toset (groups); + groups = String::NonEmpty (toset (groups)); groups = filter (string g, groups, { return g != nil; }); @@ -491,7 +492,6 @@ } } - // list<string> firewall_ifaces = toset (Selected2Opened (ifaces, nm_ifaces_have_to_be_supported)); list<string> firewall_ifaces = toset (Selected2Opened (ifaces, false)); y2milestone("firewall_ifaces: %1", firewall_ifaces); Modified: trunk/yast2/library/network/src/SuSEFirewall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFir... ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewall.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewall.ycp Thu Jul 21 15:24:21 2011 @@ -240,11 +240,14 @@ /** * Function returns whether the feature 'any' network interface is supported in the * firewall configuration. The string 'any' must be in the 'EXT' zone. + * Updated: Currently returns only 'true' as every unasigned interface is + * automatically assigned to the EXT zone by SuSEfirewall2. * * @return boolean is_supported whether the feature is supported or not */ global boolean IsAnyNetworkInterfaceSupported () { - return contains(GetSpecialInterfacesInZone(special_all_interface_zone), special_all_interface_string); + // Currently unasigned interfaces belong to the EXT zone by dafault + return true; } /** Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=6... ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Jul 21 15:24:21 2011 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Jul 21 15:15:51 CEST 2011 - locilka@suse.cz + +- Fixed SuSEfirewall2 config library: By default any unassigned + network interface is automatically assigned to the external + firewall zone (bnc#547309). +- Fixed CWM library for opening ports in firewall not to list any + empty strings returned by network module, just interface names + (bnc#547309). +- 2.21.5 + +------------------------------------------------------------------- Mon Jul 18 08:26:12 CEST 2011 - jsrain@suse.cz - fixed typo (bnc#702662) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org