Author: locilka Date: Thu Jun 16 15:10:27 2011 New Revision: 64424 URL: http://svn.opensuse.org/viewcvs/yast?rev=64424&view=rev Log: A better fix for my previous commit (stricter/correct validation) Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewallExpertRules.ycp branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewallExpertRules.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewallExpertRules.ycp?rev=64424&r1=64423&r2=64424&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewallExpertRules.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewallExpertRules.ycp Thu Jun 16 15:10:27 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))); } Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out?rev=64424&r1=64423&r2=64424&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out Thu Jun 16 15:10:27 2011 @@ -6,8 +6,11 @@ Return true Return true Return true +Return true Dump All these should be *invalid* (false): Return false Return false Return false +Return false +Return false Dump == Done == Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp?rev=64424&r1=64423&r2=64424&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp Thu Jun 16 15:10:27 2011 @@ -9,11 +9,12 @@ 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", + "192.168.0.0/255.255.224.0", "0/0", "192.168.0.1/16", ]; list <string> invalid_network_definitions = [ "192.168.0.355", "192.168.0.1/0", "192.168.0.0/255.255.333.0", + "192.168.0.1/888", "192.168.0.1/33", ]; DUMP("All these should be *valid* (true):"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org