diff --git a/doc/ChangeLog b/doc/ChangeLog index 688c4395d..eb51a2ced 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,10 @@ 2011-02-10 vadim + * NamedObjectsManagerPIX.cpp (getClearCommands): fixes #2060 + "Existing configuration objects are not cleared in PIX 6.3". + Commands used to clear object groups and objects have different + syntax in PIX 6.3 and PIX 7 and later. + * linux24/check_utilities: fixes #1999 "log() does not work" Using built-in utitlity "command" to verify that all the tools generated script needs to function properly are available and can be diff --git a/src/cisco_lib/NamedObjectsManagerPIX.cpp b/src/cisco_lib/NamedObjectsManagerPIX.cpp index 5d51f43f5..7bcc4af46 100644 --- a/src/cisco_lib/NamedObjectsManagerPIX.cpp +++ b/src/cisco_lib/NamedObjectsManagerPIX.cpp @@ -26,6 +26,8 @@ #include "NamedObjectsManagerPIX.h" #include "PIXObjectGroup.h" +#include "fwbuilder/Resources.h" + #include #include @@ -48,8 +50,15 @@ string NamedObjectsManagerPIX::getClearCommands() { ostringstream output; - if (haveObjectGroups()) output << "clear conf object-group" << endl; - if (haveNamedObjects()) output << "clear conf object" << endl; + string clear_obj_group = Resources::platform_res[platform]->getResourceStr( + string("/FWBuilderResources/Target/options/") + + "version_" + version + "/pix_commands/clear_og"); + string clear_object = Resources::platform_res[platform]->getResourceStr( + string("/FWBuilderResources/Target/options/") + + "version_" + version + "/pix_commands/clear_obj"); + + if (haveObjectGroups()) output << clear_obj_group << endl; + if (haveNamedObjects()) output << clear_object << endl; return output.str(); } diff --git a/src/res/platform/pix.xml b/src/res/platform/pix.xml index fe6d62f23..b48200cde 100644 --- a/src/res/platform/pix.xml +++ b/src/res/platform/pix.xml @@ -53,6 +53,7 @@ clear access-list clear object-group + clear icmp clear telnet clear ssh @@ -138,6 +139,7 @@ clear access-list clear object-group + clear icmp clear telnet clear ssh @@ -223,6 +225,7 @@ clear access-list clear object-group + clear icmp clear telnet clear ssh @@ -308,6 +311,7 @@ clear config access-list clear config object-group + clear config object clear config icmp clear config telnet clear config ssh @@ -394,6 +398,7 @@ clear config access-list clear config object-group + clear config object clear config icmp clear config telnet clear config ssh @@ -480,6 +485,7 @@ clear config access-list clear config object-group + clear config object clear config icmp clear config telnet clear config ssh @@ -567,6 +573,7 @@ clear config access-list clear config object-group + clear config object clear config icmp clear config telnet clear config ssh diff --git a/test/pix/cluster1-1_pix1.fw.orig b/test/pix/cluster1-1_pix1.fw.orig index 8ef7a8ecb..9ab507bdf 100755 --- a/test/pix/cluster1-1_pix1.fw.orig +++ b/test/pix/cluster1-1_pix1.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:13 2011 PST by vadim +! Generated Thu Feb 10 15:07:22 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported @@ -121,8 +121,8 @@ clear config nat clear config access-list clear config icmp clear config telnet -clear conf object-group -clear conf object +clear config object-group +clear config object object-group network id56590X61097.src.net.0 diff --git a/test/pix/cluster1-1_pix2.fw.orig b/test/pix/cluster1-1_pix2.fw.orig index 815df870c..90b50e8b4 100755 --- a/test/pix/cluster1-1_pix2.fw.orig +++ b/test/pix/cluster1-1_pix2.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:13 2011 PST by vadim +! Generated Thu Feb 10 15:07:22 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported @@ -121,8 +121,8 @@ clear config nat clear config access-list clear config icmp clear config telnet -clear conf object-group -clear conf object +clear config object-group +clear config object object-group network id56590X61097.src.net.0 diff --git a/test/pix/cluster1_pix1.fw.orig b/test/pix/cluster1_pix1.fw.orig index 18a09803f..05d2022f8 100755 --- a/test/pix/cluster1_pix1.fw.orig +++ b/test/pix/cluster1_pix1.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:13 2011 PST by vadim +! Generated Thu Feb 10 15:07:22 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported @@ -121,8 +121,8 @@ clear config nat clear config access-list clear config icmp clear config telnet -clear conf object-group -clear conf object +clear config object-group +clear config object object-group network id2913X78273.src.net.0 diff --git a/test/pix/cluster1_pix2.fw.orig b/test/pix/cluster1_pix2.fw.orig index 4a6262d3d..ef54c0999 100755 --- a/test/pix/cluster1_pix2.fw.orig +++ b/test/pix/cluster1_pix2.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:13 2011 PST by vadim +! Generated Thu Feb 10 15:07:22 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported @@ -121,8 +121,8 @@ clear config nat clear config access-list clear config icmp clear config telnet -clear conf object-group -clear conf object +clear config object-group +clear config object object-group network id2913X78273.src.net.0 diff --git a/test/pix/firewall.fw.orig b/test/pix/firewall.fw.orig index 33e74e4ab..166d96bac 100755 --- a/test/pix/firewall.fw.orig +++ b/test/pix/firewall.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:06:55 2011 PST by vadim +! Generated Thu Feb 10 15:07:05 2011 PST by vadim ! ! Compiled for pix 6.2 ! Outbound ACLs: not supported @@ -271,8 +271,8 @@ clear access-list inside_acl_in clear access-list outside_acl_in clear icmp clear telnet -clear conf object-group -clear conf object +clear object-group + object-group network id3C4E4C38.dst.net.0 diff --git a/test/pix/firewall1.fw.orig b/test/pix/firewall1.fw.orig index 8d44411ec..8b3451fbd 100755 --- a/test/pix/firewall1.fw.orig +++ b/test/pix/firewall1.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:06:55 2011 PST by vadim +! Generated Thu Feb 10 15:07:04 2011 PST by vadim ! ! Compiled for pix 6.1 ! Outbound ACLs: not supported diff --git a/test/pix/firewall10.fw.orig b/test/pix/firewall10.fw.orig index a97eec6d8..b13ad40be 100755 --- a/test/pix/firewall10.fw.orig +++ b/test/pix/firewall10.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:06:56 2011 PST by vadim +! Generated Thu Feb 10 15:07:05 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported @@ -91,8 +91,8 @@ fixup protocol skinny 2000 fixup protocol smtp 25 fixup protocol sqlnet 1521 -clear conf object-group -clear conf object +clear object-group + object-group network id3DB0FA90.dst.net.0 diff --git a/test/pix/firewall11.fw.orig b/test/pix/firewall11.fw.orig index c289b2361..29e0c77fb 100755 --- a/test/pix/firewall11.fw.orig +++ b/test/pix/firewall11.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:06:56 2011 PST by vadim +! Generated Thu Feb 10 15:07:05 2011 PST by vadim ! ! Compiled for pix 6.2 ! Outbound ACLs: not supported diff --git a/test/pix/firewall12.fw.orig b/test/pix/firewall12.fw.orig index 9b5c6a927..a77af7200 100755 --- a/test/pix/firewall12.fw.orig +++ b/test/pix/firewall12.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:06:57 2011 PST by vadim +! Generated Thu Feb 10 15:07:06 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported @@ -87,8 +87,8 @@ fixup protocol ftp 21 fixup protocol http 80 fixup protocol icmp error -clear conf object-group -clear conf object +clear object-group + object-group network id3F8F95CD.dst.net.0 diff --git a/test/pix/firewall13.fw.orig b/test/pix/firewall13.fw.orig index d7ab240c0..6a1ed25a8 100755 --- a/test/pix/firewall13.fw.orig +++ b/test/pix/firewall13.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:06:57 2011 PST by vadim +! Generated Thu Feb 10 15:07:07 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall14.fw.orig b/test/pix/firewall14.fw.orig index 9708cc145..71a1bcea4 100755 --- a/test/pix/firewall14.fw.orig +++ b/test/pix/firewall14.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:06:58 2011 PST by vadim +! Generated Thu Feb 10 15:07:07 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall2.fw.orig b/test/pix/firewall2.fw.orig index f1d40a143..f86eab896 100755 --- a/test/pix/firewall2.fw.orig +++ b/test/pix/firewall2.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:06:58 2011 PST by vadim +! Generated Thu Feb 10 15:07:08 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported @@ -70,8 +70,8 @@ clear nat clear access-list clear icmp clear telnet -clear conf object-group -clear conf object +clear object-group + object-group service id3D6EF08C.srv.tcp.0 tcp diff --git a/test/pix/firewall20.fw.orig b/test/pix/firewall20.fw.orig index 0c96f4caf..dae09a31c 100755 --- a/test/pix/firewall20.fw.orig +++ b/test/pix/firewall20.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:06:59 2011 PST by vadim +! Generated Thu Feb 10 15:07:08 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall21-1.fw.orig b/test/pix/firewall21-1.fw.orig index 6818379f3..bdf6035ae 100755 --- a/test/pix/firewall21-1.fw.orig +++ b/test/pix/firewall21-1.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:00 2011 PST by vadim +! Generated Thu Feb 10 15:07:09 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall21.fw.orig b/test/pix/firewall21.fw.orig index 56d99142e..5cf322781 100755 --- a/test/pix/firewall21.fw.orig +++ b/test/pix/firewall21.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:06:59 2011 PST by vadim +! Generated Thu Feb 10 15:07:09 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/firewall22.fw.orig b/test/pix/firewall22.fw.orig index 5c93caefd..4d8d027fd 100755 --- a/test/pix/firewall22.fw.orig +++ b/test/pix/firewall22.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:00 2011 PST by vadim +! Generated Thu Feb 10 15:07:10 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/firewall3.fw.orig b/test/pix/firewall3.fw.orig index f4436bdf2..cb14e9ddf 100755 --- a/test/pix/firewall3.fw.orig +++ b/test/pix/firewall3.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:01 2011 PST by vadim +! Generated Thu Feb 10 15:07:10 2011 PST by vadim ! ! Compiled for pix 6.2 ! Outbound ACLs: not supported diff --git a/test/pix/firewall33.fw.orig b/test/pix/firewall33.fw.orig index a91729190..f613764a4 100755 --- a/test/pix/firewall33.fw.orig +++ b/test/pix/firewall33.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:01 2011 PST by vadim +! Generated Thu Feb 10 15:07:11 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported @@ -66,8 +66,8 @@ floodguard disable -clear conf object-group -clear conf object +clear object-group + object-group network id43867C2418346.src.net.0 diff --git a/test/pix/firewall34.fw.orig b/test/pix/firewall34.fw.orig index d6bfbf2c2..8f0fddd21 100755 --- a/test/pix/firewall34.fw.orig +++ b/test/pix/firewall34.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:02 2011 PST by vadim +! Generated Thu Feb 10 15:07:12 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported @@ -61,8 +61,8 @@ floodguard disable -clear conf object-group -clear conf object +clear object-group + object-group network id16988X10208.dst.net.0 diff --git a/test/pix/firewall4.fw.orig b/test/pix/firewall4.fw.orig index ca4d499fb..364e08e8d 100755 --- a/test/pix/firewall4.fw.orig +++ b/test/pix/firewall4.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:02 2011 PST by vadim +! Generated Thu Feb 10 15:07:12 2011 PST by vadim ! ! Compiled for pix 6.2 ! Outbound ACLs: not supported @@ -82,8 +82,8 @@ clear nat clear access-list clear icmp clear telnet -clear conf object-group -clear conf object +clear object-group + object-group service id3D79A1C2.srv.tcp.0 tcp diff --git a/test/pix/firewall50.fw.orig b/test/pix/firewall50.fw.orig index 63ee0c81e..6679df403 100755 --- a/test/pix/firewall50.fw.orig +++ b/test/pix/firewall50.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:03 2011 PST by vadim +! Generated Thu Feb 10 15:07:13 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported @@ -123,8 +123,8 @@ clear config access-list inside_acl_in clear config access-list outside_acl_in clear config icmp clear config telnet -clear conf object-group -clear conf object +clear config object-group +clear config object object-group network id45142FA628543.dst.net.0 diff --git a/test/pix/firewall6.fw.orig b/test/pix/firewall6.fw.orig index d2e4799dd..8bdabab74 100755 --- a/test/pix/firewall6.fw.orig +++ b/test/pix/firewall6.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:03 2011 PST by vadim +! Generated Thu Feb 10 15:07:13 2011 PST by vadim ! ! Compiled for pix 6.2 ! Outbound ACLs: not supported diff --git a/test/pix/firewall8.fw.orig b/test/pix/firewall8.fw.orig index 5a4bb4ce2..0e82169b8 100755 --- a/test/pix/firewall8.fw.orig +++ b/test/pix/firewall8.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:04 2011 PST by vadim +! Generated Thu Feb 10 15:07:14 2011 PST by vadim ! ! Compiled for pix 6.2 ! Outbound ACLs: not supported diff --git a/test/pix/firewall80.fw.orig b/test/pix/firewall80.fw.orig index f85515807..33448e647 100755 --- a/test/pix/firewall80.fw.orig +++ b/test/pix/firewall80.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:05 2011 PST by vadim +! Generated Thu Feb 10 15:07:14 2011 PST by vadim ! ! Compiled for pix 8.2 ! Outbound ACLs: supported @@ -93,8 +93,8 @@ clear config nat clear config access-list clear config icmp clear config telnet -clear conf object-group -clear conf object +clear config object-group +clear config object object-group icmp-type id19186X29796.srv.icmp.0 diff --git a/test/pix/firewall81.fw.orig b/test/pix/firewall81.fw.orig index 8f1a012de..c1b991bcf 100755 --- a/test/pix/firewall81.fw.orig +++ b/test/pix/firewall81.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:05 2011 PST by vadim +! Generated Thu Feb 10 15:07:15 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported @@ -94,7 +94,7 @@ clear config nat clear config access-list clear config icmp clear config telnet -clear conf object +clear config object object service http.0 diff --git a/test/pix/firewall82.fw.orig b/test/pix/firewall82.fw.orig index 57a832ccd..1504d479f 100755 --- a/test/pix/firewall82.fw.orig +++ b/test/pix/firewall82.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:06 2011 PST by vadim +! Generated Thu Feb 10 15:07:15 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported @@ -94,7 +94,7 @@ clear config nat clear config access-list clear config icmp clear config telnet -clear conf object +clear config object object service http.0 diff --git a/test/pix/firewall83.fw.orig b/test/pix/firewall83.fw.orig index 747ecb50f..8d7599bd5 100755 --- a/test/pix/firewall83.fw.orig +++ b/test/pix/firewall83.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:06 2011 PST by vadim +! Generated Thu Feb 10 15:07:16 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported @@ -92,7 +92,7 @@ clear config nat clear config access-list clear config icmp clear config telnet -clear conf object +clear config object object service http.0 diff --git a/test/pix/firewall9.fw.orig b/test/pix/firewall9.fw.orig index d56ce6b9c..e8fb7e339 100755 --- a/test/pix/firewall9.fw.orig +++ b/test/pix/firewall9.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:07 2011 PST by vadim +! Generated Thu Feb 10 15:07:16 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall90.fw.orig b/test/pix/firewall90.fw.orig index a50cf7492..06ec3c5c4 100755 --- a/test/pix/firewall90.fw.orig +++ b/test/pix/firewall90.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:07 2011 PST by vadim +! Generated Thu Feb 10 15:07:17 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported @@ -95,8 +95,8 @@ clear config nat clear config access-list clear config icmp clear config telnet -clear conf object-group -clear conf object +clear config object-group +clear config object object service http.0 diff --git a/test/pix/firewall91.fw.orig b/test/pix/firewall91.fw.orig index 5585c7be3..e647cbf83 100755 --- a/test/pix/firewall91.fw.orig +++ b/test/pix/firewall91.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:08 2011 PST by vadim +! Generated Thu Feb 10 15:07:17 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported @@ -97,7 +97,7 @@ clear config nat clear config access-list clear config icmp clear config telnet -clear conf object +clear config object object service http.0 diff --git a/test/pix/firewall92.fw.orig b/test/pix/firewall92.fw.orig index ff9f2a673..2d52c2e17 100755 --- a/test/pix/firewall92.fw.orig +++ b/test/pix/firewall92.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:08 2011 PST by vadim +! Generated Thu Feb 10 15:07:18 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported @@ -92,8 +92,8 @@ clear config nat clear config access-list clear config icmp clear config telnet -clear conf object-group -clear conf object +clear config object-group +clear config object object service http.0 diff --git a/test/pix/firewall93.fw.orig b/test/pix/firewall93.fw.orig index 121452465..83499f079 100755 --- a/test/pix/firewall93.fw.orig +++ b/test/pix/firewall93.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:09 2011 PST by vadim +! Generated Thu Feb 10 15:07:18 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported @@ -91,7 +91,7 @@ service-policy global_policy global clear xlate clear config nat -clear conf object +clear config object object network dmz-range-1.0 diff --git a/test/pix/firewall94.fw.orig b/test/pix/firewall94.fw.orig index 9a1279d30..a231522e6 100755 --- a/test/pix/firewall94.fw.orig +++ b/test/pix/firewall94.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:09 2011 PST by vadim +! Generated Thu Feb 10 15:07:18 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported @@ -77,8 +77,8 @@ service-policy global_policy global clear config access-list clear config icmp clear config telnet -clear conf object-group -clear conf object +clear config object-group +clear config object object network inside-range-1.0 diff --git a/test/pix/fwsm1.fw.orig b/test/pix/fwsm1.fw.orig index 45967ea47..68eb72ec7 100755 --- a/test/pix/fwsm1.fw.orig +++ b/test/pix/fwsm1.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:10 2011 PST by vadim +! Generated Thu Feb 10 15:07:19 2011 PST by vadim ! ! Compiled for fwsm 2.3 ! Outbound ACLs: supported @@ -104,8 +104,8 @@ clear access-list inside_acl_in clear access-list outside_acl_in clear icmp clear telnet -clear conf object-group -clear conf object +clear object-group + object-group network id444A03DE9567.dst.net.0 diff --git a/test/pix/fwsm2.fw.orig b/test/pix/fwsm2.fw.orig index 511bc6e6c..cd8979b64 100755 --- a/test/pix/fwsm2.fw.orig +++ b/test/pix/fwsm2.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:10 2011 PST by vadim +! Generated Thu Feb 10 15:07:20 2011 PST by vadim ! ! Compiled for fwsm 4.x ! Outbound ACLs: supported @@ -117,8 +117,8 @@ clear config access-list inside_acl_in clear config access-list outside_acl_in clear config icmp clear config telnet -clear conf object-group -clear conf object +clear config object-group + object-group network id17298X54624.dst.net.0 diff --git a/test/pix/pix515.fw.orig b/test/pix/pix515.fw.orig index 88cbf7daf..6439e6cd4 100755 --- a/test/pix/pix515.fw.orig +++ b/test/pix/pix515.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:11 2011 PST by vadim +! Generated Thu Feb 10 15:07:20 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/real.fw.orig b/test/pix/real.fw.orig index ed088cfdf..70c69fa50 100755 --- a/test/pix/real.fw.orig +++ b/test/pix/real.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3457 +! Firewall Builder fwb_pix v4.2.0.3470 ! -! Generated Thu Feb 3 10:07:11 2011 PST by vadim +! Generated Thu Feb 10 15:07:21 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported