diff --git a/test/pix/cluster1-1_pix1.fw.orig b/test/pix/cluster1-1_pix1.fw.orig index a17c06af0..8d5c75f8e 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:42 2011 PST by vadim +! Generated Thu Jan 13 18:02:32 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/cluster1-1_pix2.fw.orig b/test/pix/cluster1-1_pix2.fw.orig index c84ba7fee..33e4aa69b 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:42 2011 PST by vadim +! Generated Thu Jan 13 18:02:32 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/cluster1_pix1.fw.orig b/test/pix/cluster1_pix1.fw.orig index 4b85d2828..fea72ce21 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:42 2011 PST by vadim +! Generated Thu Jan 13 18:02:32 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/cluster1_pix2.fw.orig b/test/pix/cluster1_pix2.fw.orig index 23a326d7b..051b3c926 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:42 2011 PST by vadim +! Generated Thu Jan 13 18:02:32 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/firewall.fw.orig b/test/pix/firewall.fw.orig index 6f2e9fb83..d8e10015d 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:18 2011 PST by vadim +! Generated Thu Jan 13 18:02:07 2011 PST by vadim ! ! Compiled for pix 6.2 ! Outbound ACLs: not supported diff --git a/test/pix/firewall1.fw.orig b/test/pix/firewall1.fw.orig index bd0cc0d66..e90454bc1 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:19 2011 PST by vadim +! Generated Thu Jan 13 18:02:08 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 98f188618..abee1e4ef 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:19 2011 PST by vadim +! Generated Thu Jan 13 18:02:09 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall11.fw.orig b/test/pix/firewall11.fw.orig index 21ca67481..ab9a448ae 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:20 2011 PST by vadim +! Generated Thu Jan 13 18:02:10 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 b3a99bba3..6962b871d 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:21 2011 PST by vadim +! Generated Thu Jan 13 18:02:10 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall13.fw.orig b/test/pix/firewall13.fw.orig index 83e999a55..2fbab3152 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:21 2011 PST by vadim +! Generated Thu Jan 13 18:02:11 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 5b59a2f88..7887b09b2 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:22 2011 PST by vadim +! Generated Thu Jan 13 18:02:12 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 f0f0c9ee2..ce5d89176 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:23 2011 PST by vadim +! Generated Thu Jan 13 18:02:12 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall20.fw.orig b/test/pix/firewall20.fw.orig index e94ce97ef..3918fa37d 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:23 2011 PST by vadim +! Generated Thu Jan 13 18:02:13 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 3134001da..956bc456c 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:25 2011 PST by vadim +! Generated Thu Jan 13 18:02:14 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 0db617577..c9a5d2bbc 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:24 2011 PST by vadim +! Generated Thu Jan 13 18:02:14 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 870f997df..150bf5cc7 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:26 2011 PST by vadim +! Generated Thu Jan 13 18:02:15 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 70d3246b1..3216144dc 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:26 2011 PST by vadim +! Generated Thu Jan 13 18:02:16 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 75b51584d..cc42d49fe 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:27 2011 PST by vadim +! Generated Thu Jan 13 18:02:17 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall34.fw.orig b/test/pix/firewall34.fw.orig index 4dcbdc0b4..cad45bd1e 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:28 2011 PST by vadim +! Generated Thu Jan 13 18:02:18 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall4.fw.orig b/test/pix/firewall4.fw.orig index a6e69bee0..7f442c18f 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:29 2011 PST by vadim +! Generated Thu Jan 13 18:02:18 2011 PST by vadim ! ! Compiled for pix 6.2 ! Outbound ACLs: not supported diff --git a/test/pix/firewall50.fw.orig b/test/pix/firewall50.fw.orig index f860986e6..af658e59c 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:29 2011 PST by vadim +! Generated Thu Jan 13 18:02:19 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/firewall6.fw.orig b/test/pix/firewall6.fw.orig index 896837731..fdb665861 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:30 2011 PST by vadim +! Generated Thu Jan 13 18:02:20 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 333bb2363..dbb63cd77 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:31 2011 PST by vadim +! Generated Thu Jan 13 18:02:21 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 53ed42a28..17b808f42 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:32 2011 PST by vadim +! Generated Thu Jan 13 18:02:21 2011 PST by vadim ! ! Compiled for pix 8.2 ! Outbound ACLs: supported diff --git a/test/pix/firewall81.fw.orig b/test/pix/firewall81.fw.orig index 9d2d58ad8..936883af3 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:32 2011 PST by vadim +! Generated Thu Jan 13 18:02:22 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/firewall82.fw.orig b/test/pix/firewall82.fw.orig index 65f063531..927b1412b 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:33 2011 PST by vadim +! Generated Thu Jan 13 18:02:23 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/firewall83.fw.orig b/test/pix/firewall83.fw.orig index 69c54cde7..6fb7ac4e4 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:34 2011 PST by vadim +! Generated Thu Jan 13 18:02:23 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/firewall9.fw.orig b/test/pix/firewall9.fw.orig index 96645959b..dc5a08660 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:34 2011 PST by vadim +! Generated Thu Jan 13 18:02:24 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 d4da0e99a..15d9c1445 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:35 2011 PST by vadim +! Generated Thu Jan 13 18:02:25 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported @@ -16,8 +16,8 @@ ! testing new style ASA 8.3 nat commands ! SNAT rules -! N firewall90:NAT:12: error: Option 'translate dns' can not be used in combination with destination matching or translation -! N firewall90:NAT:13: error: Option 'translate dns' can not be used in combination with service matching or translation +! N firewall90:NAT:13: error: Option 'translate dns' can not be used in combination with destination matching or translation +! N firewall90:NAT:14: error: Option 'translate dns' can not be used in combination with service matching or translation ! ! Prolog script: @@ -267,88 +267,95 @@ nat (inside,outside) source dynamic internal_subnet_1 firewall90:FastEthernet1:i nat (inside,outside) source dynamic internal_subnet_2 firewall90:FastEthernet1:ip-1 service smtp smtp ! ! Rule 4 (NAT) -nat (inside,outside) source dynamic test_range_1 firewall90:FastEthernet1:ip-1 destination static spamhost1 spamhost1 service smtp smtp +! for #1928 +! note that group in OSrc includes another group +nat (inside,outside) source dynamic internal_subnet_1 firewall90:FastEthernet1:ip-1 service smtp smtp +nat (inside,outside) source dynamic Internal_net firewall90:FastEthernet1:ip-1 service smtp smtp +nat (inside,outside) source dynamic internal_subnet_2 firewall90:FastEthernet1:ip-1 service smtp smtp ! ! Rule 5 (NAT) -nat (inside,outside) source static hostA:eth0 firewall90:FastEthernet1:ip-1 destination static spamhost1 external_gw_1 service smtp smtp +nat (inside,outside) source dynamic test_range_1 firewall90:FastEthernet1:ip-1 destination static spamhost1 spamhost1 service smtp smtp ! ! Rule 6 (NAT) -! For #1907 -nat (inside,outside) source dynamic hostA:eth0 outside.id130599X29063.tsrc.net.0 service smtp smtp +nat (inside,outside) source static hostA:eth0 firewall90:FastEthernet1:ip-1 destination static spamhost1 external_gw_1 service smtp smtp ! ! Rule 7 (NAT) ! For #1907 -nat (inside,outside) source dynamic hostA:eth0 outside.id20720X27505.tsrc.net.0 interface service smtp smtp +nat (inside,outside) source dynamic hostA:eth0 outside.id130599X29063.tsrc.net.0 service smtp smtp ! ! Rule 8 (NAT) ! For #1907 -nat (inside,outside) source dynamic hostA:eth0 outside.id241772X29764.tsrc.net.0 interface service smtp smtp +nat (inside,outside) source dynamic hostA:eth0 outside.id20720X27505.tsrc.net.0 interface service smtp smtp ! ! Rule 9 (NAT) ! For #1907 -nat (inside,outside) source static hostA:eth0 hostA:eth0 service smtp smtp +nat (inside,outside) source dynamic hostA:eth0 outside.id241772X29764.tsrc.net.0 interface service smtp smtp ! ! Rule 10 (NAT) ! For #1907 -nat (inside,outside) source dynamic hostA:eth0 outside.id643092X27990.tsrc.net.0 interface service smtp smtp +nat (inside,outside) source static hostA:eth0 hostA:eth0 service smtp smtp ! ! Rule 11 (NAT) -! for #1902 -nat (inside,outside) source dynamic internal_subnet_1 firewall90:FastEthernet1:ip-1 dns +! For #1907 +nat (inside,outside) source dynamic hostA:eth0 outside.id643092X27990.tsrc.net.0 interface service smtp smtp ! ! Rule 12 (NAT) ! for #1902 -! can't use dns with destination matching or translation -! firewall90:NAT:12: error: Option 'translate dns' can not be used in combination with destination matching or translation -nat (inside,outside) source dynamic internal_subnet_1 firewall90:FastEthernet1:ip-1 destination static spamhost1 spamhost1 dns +nat (inside,outside) source dynamic internal_subnet_1 firewall90:FastEthernet1:ip-1 dns ! ! Rule 13 (NAT) ! for #1902 -! cant use dns with service translation either -! firewall90:NAT:13: error: Option 'translate dns' can not be used in combination with service matching or translation -nat (inside,outside) source dynamic internal_subnet_1 firewall90:FastEthernet1:ip-1 service smtp smtp dns +! can't use dns with destination matching or translation +! firewall90:NAT:13: error: Option 'translate dns' can not be used in combination with destination matching or translation +nat (inside,outside) source dynamic internal_subnet_1 firewall90:FastEthernet1:ip-1 destination static spamhost1 spamhost1 dns ! ! Rule 14 (NAT) -! for #1908 -! "static" vs "dynamic" -nat (inside,outside) source static hostA:eth0 firewall90:FastEthernet1:ip-1 +! for #1902 +! cant use dns with service translation either +! firewall90:NAT:14: error: Option 'translate dns' can not be used in combination with service matching or translation +nat (inside,outside) source dynamic internal_subnet_1 firewall90:FastEthernet1:ip-1 service smtp smtp dns ! ! Rule 15 (NAT) ! for #1908 ! "static" vs "dynamic" -nat (inside,outside) source dynamic hostA:eth0 outside_range +nat (inside,outside) source static hostA:eth0 firewall90:FastEthernet1:ip-1 ! ! Rule 16 (NAT) +! for #1908 +! "static" vs "dynamic" +nat (inside,outside) source dynamic hostA:eth0 outside_range +! +! Rule 17 (NAT) ! for #1908 "static" vs "dynamic" ! for #1885 "named object" - create ! for #1907 "multiple objects in TSrc" ! network object to define address range, then add it to object-group nat (inside,outside) source dynamic hostA:eth0 outside.id21121X3710.tsrc.net.0 interface ! -! Rule 17 (NAT) +! Rule 18 (NAT) ! for #1908, #1916 "static" vs "dynamic" ! for #1907 "multiple objects in TSrc" nat (inside,outside) source dynamic hostA:eth0 outside.id21177X3720.tsrc.net.0 interface ! -! Rule 18 (NAT) +! Rule 19 (NAT) ! for #1908 ! "static" vs "dynamic" nat (outside,outside) source dynamic outside_range firewall90:FastEthernet1:ip-1 ! -! Rule 19 (NAT) +! Rule 20 (NAT) ! for #1908 ! "static" vs "dynamic" nat (inside,outside) source dynamic internal_subnet_1 firewall90:FastEthernet1:ip-1 ! -! Rule 20 (NAT) +! Rule 21 (NAT) ! for #1908 ! "static" vs "dynamic" nat (inside,outside) source static internal_subnet_1 firewall90:FastEthernet1:ip-1 ! -! Rule 21 (NAT) +! Rule 22 (NAT) nat (outside,inside) source static any any destination static interface hostA:eth0 service http squid ! -! Rule 22 (NAT) +! Rule 23 (NAT) ! multiple objects in OSrc, ODst, OSrv and TSrc in various combinations nat (inside,outside) source dynamic internal_subnet_1 outside.id77971X5929.tsrc.net.0 interface destination static spamhost1 spamhost1 service smtp smtp nat (inside,outside) source dynamic internal_subnet_1 outside.id77971X5929.tsrc.net.1 interface destination static spamhost1 spamhost1 service smtps smtps diff --git a/test/pix/firewall91.fw.orig b/test/pix/firewall91.fw.orig index aa1591b41..995918772 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:36 2011 PST by vadim +! Generated Thu Jan 13 18:02:25 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/firewall92.fw.orig b/test/pix/firewall92.fw.orig index 8d174ba3a..5499e4ae5 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:36 2011 PST by vadim +! Generated Thu Jan 13 18:02:26 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/fwsm1.fw.orig b/test/pix/fwsm1.fw.orig index ac59c3d04..bcba5975e 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:37 2011 PST by vadim +! Generated Thu Jan 13 18:02:27 2011 PST by vadim ! ! Compiled for fwsm 2.3 ! Outbound ACLs: supported diff --git a/test/pix/fwsm2.fw.orig b/test/pix/fwsm2.fw.orig index cf6b36849..91ebd3064 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:38 2011 PST by vadim +! Generated Thu Jan 13 18:02:28 2011 PST by vadim ! ! Compiled for fwsm 4.x ! Outbound ACLs: supported diff --git a/test/pix/objects-for-regression-tests.fwb b/test/pix/objects-for-regression-tests.fwb index eae8a5b31..3e75c4151 100644 --- a/test/pix/objects-for-regression-tests.fwb +++ b/test/pix/objects-for-regression-tests.fwb @@ -1,6 +1,6 @@ - + @@ -535,6 +535,14 @@ + + + + + + + + @@ -18263,7 +18271,7 @@ no sysopt nodnsalias outbound - + @@ -18352,7 +18360,31 @@ no sysopt nodnsalias outbound - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -18375,7 +18407,7 @@ no sysopt nodnsalias outbound - + @@ -18396,7 +18428,7 @@ no sysopt nodnsalias outbound - + @@ -18421,7 +18453,7 @@ no sysopt nodnsalias outbound - + @@ -18446,7 +18478,7 @@ no sysopt nodnsalias outbound - + @@ -18470,7 +18502,7 @@ no sysopt nodnsalias outbound - + @@ -18493,7 +18525,7 @@ no sysopt nodnsalias outbound - + @@ -18516,7 +18548,7 @@ no sysopt nodnsalias outbound - + @@ -18536,11 +18568,12 @@ no sysopt nodnsalias outbound + - + @@ -18560,11 +18593,12 @@ no sysopt nodnsalias outbound + - + @@ -18589,7 +18623,7 @@ no sysopt nodnsalias outbound - + @@ -18616,7 +18650,7 @@ no sysopt nodnsalias outbound - + @@ -18643,7 +18677,7 @@ no sysopt nodnsalias outbound - + @@ -18670,7 +18704,7 @@ no sysopt nodnsalias outbound - + @@ -18697,7 +18731,7 @@ no sysopt nodnsalias outbound - + @@ -18724,7 +18758,7 @@ no sysopt nodnsalias outbound - + @@ -18748,7 +18782,7 @@ no sysopt nodnsalias outbound - + @@ -18775,7 +18809,7 @@ no sysopt nodnsalias outbound - + @@ -18802,7 +18836,7 @@ no sysopt nodnsalias outbound - + diff --git a/test/pix/pix515.fw.orig b/test/pix/pix515.fw.orig index a7acbd32e..39678cbd4 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:39 2011 PST by vadim +! Generated Thu Jan 13 18:02:29 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 9ceb8b716..a53730ec3 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.3430 +! Firewall Builder fwb_pix v4.2.0.3431 ! -! Generated Thu Jan 13 13:27:40 2011 PST by vadim +! Generated Thu Jan 13 18:02:30 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported