diff --git a/build_num b/build_num index c9b480913..ff3af2c07 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 2412 +#define BUILD_NUM 2414 diff --git a/doc/ChangeLog b/doc/ChangeLog index fdb54a0d3..135fc4382 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,10 @@ 2010-01-22 vadim + * PolicyCompiler_iosacl.cpp (PolicyCompiler_iosacl::compile): + fixes #1134: object-group clause can only be used with ipv4 + access lists in IOS per + http://www.cisco.com/en/US/docs/ios/sec_data_plane/configuration/guide/sec_object_group_acl.html#wp1058359 + * IOSObjectGroup.cpp (IOSObjectGroup::toString): fixes #1107: support for "object-group" clause in IOS access lists. Fixed syntax for the subnet clause inside "object-group network". diff --git a/src/cisco_lib/PolicyCompiler_iosacl.cpp b/src/cisco_lib/PolicyCompiler_iosacl.cpp index 92828021f..0d88ab813 100644 --- a/src/cisco_lib/PolicyCompiler_iosacl.cpp +++ b/src/cisco_lib/PolicyCompiler_iosacl.cpp @@ -181,7 +181,7 @@ void PolicyCompiler_iosacl::compile() string version = fw->getStr("version"); bool supports_object_groups = XMLTools::version_compare(version, "12.4")>=0 && - fw->getOptionsObject()->getBool("iosacl_use_object_groups"); + fw->getOptionsObject()->getBool("iosacl_use_object_groups") && ! ipv6; try { diff --git a/test/iosacl/objects-for-regression-tests.fwb b/test/iosacl/objects-for-regression-tests.fwb index ba6112100..32328ce14 100644 --- a/test/iosacl/objects-for-regression-tests.fwb +++ b/test/iosacl/objects-for-regression-tests.fwb @@ -25,6 +25,10 @@ + + + + @@ -54,6 +58,14 @@ + + + + + + + + @@ -85,6 +97,7 @@ + @@ -4761,6 +4774,344 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4782,6 +5133,7 @@ +