Author: locilka Date: Tue Aug 2 09:30:11 2011 New Revision: 65120 URL: http://svn.opensuse.org/viewcvs/yast?rev=65120&view=rev Log: - Fixed Get/SetBroadcastAllowedPorts in SuSEFirewall to keep user-entered values instead of translating them magically into list of ports (bnc#694782). - 2.21.9 Modified: trunk/yast2/VERSION 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=65120&r1=65119&r2=65120&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Aug 2 09:30:11 2011 @@ -1 +1 @@ -2.21.8 +2.21.9 Modified: trunk/yast2/library/network/src/SuSEFirewall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFirewall.ycp?rev=65120&r1=65119&r2=65120&view=diff ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewall.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewall.ycp Tue Aug 2 09:30:11 2011 @@ -501,6 +501,12 @@ * "ZONE2" : [ "port3", "port4" ], * "ZONE3" : [ ] * ] + * or + * $[ + * "ZONE1" : [ "yes" ], // will work for all ports automatically + * "ZONE3" : [ ], + * "ZONE3" : [ ] + * ] */ global define map GetBroadcastAllowedPorts () { @@ -511,9 +517,9 @@ // no broadcast allowed for this zone if (broadcast == "no") { allowed_ports[zone] = []; - // all UDP port allowed in zone also allow broadcast + // BNC #694782: "yes" is automatically translated by SuSEfirewall2 } else if (broadcast == "yes") { - allowed_ports[zone] = GetAllowedServicesForZoneProto (zone, "UDP"); + allowed_ports[zone] = ["yes"]; // only listed ports allows broadcast } else { allowed_ports[zone] = splitstring(broadcast, " "); @@ -538,6 +544,9 @@ SetModified(); foreach (string zone, GetKnownFirewallZones(), { + if (broadcast[zone]:[] == []) + broadcast[zone] = ["no"]; + SetBroadcastConfiguration(zone, mergestring(broadcast[zone]:[], " ")); }); } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=65120&r1=65119&r2=65120&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Aug 2 09:30:11 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Aug 2 09:19:26 CEST 2011 - locilka@suse.cz + +- Fixed Get/SetBroadcastAllowedPorts in SuSEFirewall to keep + user-entered values instead of translating them magically into + list of ports (bnc#694782). +- 2.21.9 + +------------------------------------------------------------------- Thu Jul 28 16:23:46 CEST 2011 - mvidner@suse.cz - Fixed NetworkInterfaces::GetTypeFromIfcfg to recognize bridges (bnc#704999). -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org