Author: locilka Date: Thu Jun 16 14:58:44 2011 New Revision: 64419 URL: http://svn.opensuse.org/viewcvs/yast?rev=64419&view=rev Log: - Fixed regexp in Custom broadcast definition in SuSEFirewallExpertRules (BNC #676972). - 2.20.15 Added: trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.err trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp Modified: trunk/yast2/VERSION trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=64419&r1=64418&r2=64419&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Thu Jun 16 14:58:44 2011 @@ -1 +1 @@ -2.20.14 +2.20.15 Modified: trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp?rev=64419&r1=64418&r2=64419&view=diff ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp Thu Jun 16 14:58:44 2011 @@ -83,7 +83,7 @@ // A.B.C.D/1 - A.B.C.D/32 (IP with a numeric netmask) else if (regexpmatch(network, "^" + type_ip4 + "/[01234567890]+$")) { string part_ip = regexpsub (network, "^(" + type_ip4 + ")/[01234567890]+$", "\\1"); - string part_bits = regexpsub (network, "^" + type_ip4 + "(/[01234567890])+$", "\\1"); + string part_bits = regexpsub (network, "^" + type_ip4 + "/([01234567890])+$", "\\1"); return (IP::Check4(part_ip) && ValidNetmaskBits(tointeger(part_bits))); } Added: trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.err?rev=64419&view=auto ============================================================================== (empty) Added: trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out?rev=64419&view=auto ============================================================================== --- trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out (added) +++ trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out Thu Jun 16 14:58:44 2011 @@ -0,0 +1,13 @@ +Dump == IsValidNetwork == +Dump All these should be *valid* (true): +Return true +Return true +Return true +Return true +Return true +Return true +Dump All these should be *invalid* (false): +Return false +Return false +Return false +Dump == Done == Added: trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp?rev=64419&view=auto ============================================================================== --- trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp (added) +++ trunk/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp Thu Jun 16 14:58:44 2011 @@ -0,0 +1,30 @@ +{ + + include "testsuite.ycp"; + // testedfiles: SuSEFirewallExpertRules + + import "SuSEFirewallExpertRules"; + + DUMP("== IsValidNetwork =="); + + list <string> valid_network_definitions = [ + "192.168.0.1", "192.168.0.0/24", "192.168.0.1/32", "192.168.0.0/255.255.0.0", + "192.168.0.0/255.255.224.0", "0/0", + ]; + + list <string> invalid_network_definitions = [ + "192.168.0.355", "192.168.0.1/0", "192.168.0.0/255.255.333.0", + ]; + + DUMP("All these should be *valid* (true):"); + foreach (string check_this, valid_network_definitions, { + TEST(``(SuSEFirewallExpertRules::IsValidNetwork (check_this)), [], nil); + }); + + DUMP("All these should be *invalid* (false):"); + foreach (string check_this, invalid_network_definitions, { + TEST(``(SuSEFirewallExpertRules::IsValidNetwork (check_this)), [], nil); + }); + + DUMP("== Done =="); +} Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=64419&r1=64418&r2=64419&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Jun 16 14:58:44 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jun 16 14:55:22 CEST 2011 - locilka@suse.cz + +- Fixed regexp in Custom broadcast definition in + SuSEFirewallExpertRules (BNC #676972). +- 2.20.15 + +------------------------------------------------------------------- Thu May 19 14:40:07 CEST 2011 - mvidner@suse.cz - Don't assume YaST has crashed (and scare the user with a pop-up) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org