diff --git a/doc/ChangeLog b/doc/ChangeLog index b9b3a6bae..146914295 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,8 @@ 2011-04-13 Vadim Kurland + * configlets/fwsm_os/ntp: see #2344 fwbuilder should not generate + any "ntp" commands for FWSM because NTP can not be configured on FWSM. + * OSConfigurator_pix_os.cpp (_printSysopt): see #2345 More fixes for FWSM 4.x: "service resetoutbound", "timeout xlate", "timeout sunrpc" diff --git a/src/libgui/pixosAdvancedDialog.cpp b/src/libgui/pixosAdvancedDialog.cpp index 93bdc0b11..ff24d1407 100644 --- a/src/libgui/pixosAdvancedDialog.cpp +++ b/src/libgui/pixosAdvancedDialog.cpp @@ -70,17 +70,32 @@ pixosAdvancedDialog::pixosAdvancedDialog(QWidget *parent,FWObject *o) assert(mgmt!=NULL); /* Page "General" */ - data.registerOption( m_dialog->pix_set_host_name , fwoptions, "pix_set_host_name" ); - data.registerOption( m_dialog->pix_ip_address , fwoptions, "pix_ip_address" ); + data.registerOption( + m_dialog->pix_set_host_name, fwoptions, "pix_set_host_name"); + data.registerOption( + m_dialog->pix_ip_address, fwoptions, "pix_ip_address"); /* Page NTP */ - data.registerOption( m_dialog->ntp1, fwoptions, "pix_ntp1" ); - data.registerOption( m_dialog->ntp1_pref, fwoptions, "pix_ntp1_pref" ); - data.registerOption( m_dialog->ntp2, fwoptions, "pix_ntp2" ); - data.registerOption( m_dialog->ntp2_pref, fwoptions, "pix_ntp2_pref" ); - data.registerOption( m_dialog->ntp3, fwoptions, "pix_ntp3" ); - data.registerOption( m_dialog->ntp3_pref, fwoptions, "pix_ntp3_pref" ); + string host_os = o->getStr("host_OS"); + + if (host_os == "pix_os") + { + m_dialog->fwsm_ntp_warning->hide(); + m_dialog->ntp_servers_group->show(); + data.registerOption( m_dialog->ntp1, fwoptions, "pix_ntp1" ); + data.registerOption( m_dialog->ntp1_pref, fwoptions, "pix_ntp1_pref" ); + data.registerOption( m_dialog->ntp2, fwoptions, "pix_ntp2" ); + data.registerOption( m_dialog->ntp2_pref, fwoptions, "pix_ntp2_pref" ); + data.registerOption( m_dialog->ntp3, fwoptions, "pix_ntp3" ); + data.registerOption( m_dialog->ntp3_pref, fwoptions, "pix_ntp3_pref" ); + } + + if (host_os == "fwsm_os") + { + m_dialog->fwsm_ntp_warning->show(); + m_dialog->ntp_servers_group->hide(); + } /* Page SNMP */ diff --git a/src/libgui/pixosadvanceddialog_q.ui b/src/libgui/pixosadvanceddialog_q.ui index 7b7e77258..8b69edd35 100644 --- a/src/libgui/pixosadvanceddialog_q.ui +++ b/src/libgui/pixosadvanceddialog_q.ui @@ -12,7 +12,7 @@ 0 0 - 502 + 539 402 @@ -78,31 +78,22 @@ NTP - - - 6 - - - 6 - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 30 - - - - + - + + + NTP cannot be configured on FWSM, because it takes its settings from the Switch. + + + Qt::AlignCenter + + + true + + + + + NTP Servers: @@ -211,6 +202,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 30 + + + + diff --git a/src/res/configlets/fwsm_os/ntp b/src/res/configlets/fwsm_os/ntp index ef830b59e..80e79bce3 100644 --- a/src/res/configlets/fwsm_os/ntp +++ b/src/res/configlets/fwsm_os/ntp @@ -1,27 +1,7 @@ ## -*- mode: shell-script; -*- ## -## To be able to make changes to the part of configuration created -## from this configlet you need to copy this file to the directory -## fwbuilder/configlets/pix_os/ in your home directory and modify it. -## Double "##" comments are removed during processing but single "#" -## comments are be retained and appear in the generated script. Empty -## lines are removed as well. -## -## Configlets support simple macro language with these constructs: -## {{$var}} is variable expansion -## {{if var}} is conditional operator. +## See http://www.cisco.com/en/US/products/hw/modules/ps2706/products_configuration_example09186a00808b4d9f.shtml ## - -{{if clear}} -{{if fwsm_version_lt_40}} -clear ntp -{{endif}} -{{if fwsm_version_ge_40}} -clear config ntp -{{endif}} -{{endif}} - -{{if not_server_1_empty}}ntp server {{$address_1}} source {{$interface_1_label}} {{if prefer_1}}prefer{{endif}} {{endif}} -{{if not_server_2_empty}}ntp server {{$address_2}} source {{$interface_2_label}} {{if prefer_2}}prefer{{endif}} {{endif}} -{{if not_server_3_empty}}ntp server {{$address_3}} source {{$interface_3_label}} {{if prefer_3}}prefer{{endif}} {{endif}} +## Cisco says: +## "Note: NTP cannot be configured on FWSM, because it takes its settings from the Switch." diff --git a/test/pix/cluster1-1_pix1.fw.orig b/test/pix/cluster1-1_pix1.fw.orig index 49be86970..7b88eacaf 100755 --- a/test/pix/cluster1-1_pix1.fw.orig +++ b/test/pix/cluster1-1_pix1.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:52 2011 PDT by vadim +! Generated Wed Apr 13 17:15:51 2011 PDT 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 05b685df1..29771b2b0 100755 --- a/test/pix/cluster1-1_pix2.fw.orig +++ b/test/pix/cluster1-1_pix2.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:52 2011 PDT by vadim +! Generated Wed Apr 13 17:15:51 2011 PDT 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 acebb2ee9..2eb54ec2e 100755 --- a/test/pix/cluster1_pix1.fw.orig +++ b/test/pix/cluster1_pix1.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:52 2011 PDT by vadim +! Generated Wed Apr 13 17:15:50 2011 PDT 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 9b3017cb1..0a3e51403 100755 --- a/test/pix/cluster1_pix2.fw.orig +++ b/test/pix/cluster1_pix2.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:52 2011 PDT by vadim +! Generated Wed Apr 13 17:15:50 2011 PDT 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 d3b98de07..93545ec1f 100755 --- a/test/pix/firewall.fw.orig +++ b/test/pix/firewall.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:33 2011 PDT by vadim +! Generated Wed Apr 13 17:15:31 2011 PDT 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 e8483573d..400091182 100755 --- a/test/pix/firewall1.fw.orig +++ b/test/pix/firewall1.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:33 2011 PDT by vadim +! Generated Wed Apr 13 17:15:31 2011 PDT 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 786b8ce18..485d8bb72 100755 --- a/test/pix/firewall10.fw.orig +++ b/test/pix/firewall10.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:34 2011 PDT by vadim +! Generated Wed Apr 13 17:15:32 2011 PDT 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 e37bc176d..9fc21eb4f 100755 --- a/test/pix/firewall11.fw.orig +++ b/test/pix/firewall11.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:34 2011 PDT by vadim +! Generated Wed Apr 13 17:15:32 2011 PDT 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 ae5b96711..aa92c047f 100755 --- a/test/pix/firewall12.fw.orig +++ b/test/pix/firewall12.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:35 2011 PDT by vadim +! Generated Wed Apr 13 17:15:33 2011 PDT 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 4715161d7..8640fd7ee 100755 --- a/test/pix/firewall13.fw.orig +++ b/test/pix/firewall13.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:35 2011 PDT by vadim +! Generated Wed Apr 13 17:15:33 2011 PDT 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 26c201843..737e818f6 100755 --- a/test/pix/firewall14.fw.orig +++ b/test/pix/firewall14.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:36 2011 PDT by vadim +! Generated Wed Apr 13 17:15:34 2011 PDT 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 9f4ca6ed9..25f4a3d3e 100755 --- a/test/pix/firewall2.fw.orig +++ b/test/pix/firewall2.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:36 2011 PDT by vadim +! Generated Wed Apr 13 17:15:34 2011 PDT 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 1a7978365..a58ee5a52 100755 --- a/test/pix/firewall20.fw.orig +++ b/test/pix/firewall20.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:37 2011 PDT by vadim +! Generated Wed Apr 13 17:15:35 2011 PDT 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 97ca03541..a8a844b1d 100755 --- a/test/pix/firewall21-1.fw.orig +++ b/test/pix/firewall21-1.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:38 2011 PDT by vadim +! Generated Wed Apr 13 17:15:36 2011 PDT 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 ef46f15e2..eac8c16f1 100755 --- a/test/pix/firewall21.fw.orig +++ b/test/pix/firewall21.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:37 2011 PDT by vadim +! Generated Wed Apr 13 17:15:35 2011 PDT 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 434a6843e..b872de112 100755 --- a/test/pix/firewall22.fw.orig +++ b/test/pix/firewall22.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:38 2011 PDT by vadim +! Generated Wed Apr 13 17:15:36 2011 PDT by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/firewall23.fw.orig b/test/pix/firewall23.fw.orig index 4383822bf..1891a6ac7 100755 --- a/test/pix/firewall23.fw.orig +++ b/test/pix/firewall23.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:39 2011 PDT by vadim +! Generated Wed Apr 13 17:15:37 2011 PDT by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall3.fw.orig b/test/pix/firewall3.fw.orig index 2b8ae6f86..c03e1ffbe 100755 --- a/test/pix/firewall3.fw.orig +++ b/test/pix/firewall3.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:39 2011 PDT by vadim +! Generated Wed Apr 13 17:15:37 2011 PDT 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 e5f06f30e..446f7d153 100755 --- a/test/pix/firewall33.fw.orig +++ b/test/pix/firewall33.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:40 2011 PDT by vadim +! Generated Wed Apr 13 17:15:38 2011 PDT 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 fd0f6d409..5ff887430 100755 --- a/test/pix/firewall34.fw.orig +++ b/test/pix/firewall34.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:40 2011 PDT by vadim +! Generated Wed Apr 13 17:15:38 2011 PDT 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 539033b06..aa4c94ba7 100755 --- a/test/pix/firewall4.fw.orig +++ b/test/pix/firewall4.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:41 2011 PDT by vadim +! Generated Wed Apr 13 17:15:39 2011 PDT 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 30092f626..d5564376f 100755 --- a/test/pix/firewall50.fw.orig +++ b/test/pix/firewall50.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:41 2011 PDT by vadim +! Generated Wed Apr 13 17:15:40 2011 PDT 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 0c3dfb03a..ddcc7a817 100755 --- a/test/pix/firewall6.fw.orig +++ b/test/pix/firewall6.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:42 2011 PDT by vadim +! Generated Wed Apr 13 17:15:40 2011 PDT 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 d07449290..952e319f3 100755 --- a/test/pix/firewall8.fw.orig +++ b/test/pix/firewall8.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:43 2011 PDT by vadim +! Generated Wed Apr 13 17:15:41 2011 PDT 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 fc1795f3a..9bd538a67 100755 --- a/test/pix/firewall80.fw.orig +++ b/test/pix/firewall80.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:43 2011 PDT by vadim +! Generated Wed Apr 13 17:15:42 2011 PDT 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 8b4da23eb..d49067a86 100755 --- a/test/pix/firewall81.fw.orig +++ b/test/pix/firewall81.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:44 2011 PDT by vadim +! Generated Wed Apr 13 17:15:42 2011 PDT 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 e94e421b1..86c8826d3 100755 --- a/test/pix/firewall82.fw.orig +++ b/test/pix/firewall82.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:44 2011 PDT by vadim +! Generated Wed Apr 13 17:15:43 2011 PDT 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 cd5991b62..1a9bc911e 100755 --- a/test/pix/firewall83.fw.orig +++ b/test/pix/firewall83.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:45 2011 PDT by vadim +! Generated Wed Apr 13 17:15:43 2011 PDT 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 100e03202..af2416b87 100755 --- a/test/pix/firewall9.fw.orig +++ b/test/pix/firewall9.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:45 2011 PDT by vadim +! Generated Wed Apr 13 17:15:44 2011 PDT 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 a55c49834..1740d12cf 100755 --- a/test/pix/firewall90.fw.orig +++ b/test/pix/firewall90.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:46 2011 PDT by vadim +! Generated Wed Apr 13 17:15:44 2011 PDT by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/firewall91.fw.orig b/test/pix/firewall91.fw.orig index 471c00f9e..02b6fdb19 100755 --- a/test/pix/firewall91.fw.orig +++ b/test/pix/firewall91.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:46 2011 PDT by vadim +! Generated Wed Apr 13 17:15:44 2011 PDT 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 8765fc7a5..df8028268 100755 --- a/test/pix/firewall92.fw.orig +++ b/test/pix/firewall92.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:47 2011 PDT by vadim +! Generated Wed Apr 13 17:15:45 2011 PDT by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/firewall93.fw.orig b/test/pix/firewall93.fw.orig index 278c531ca..6aa148741 100755 --- a/test/pix/firewall93.fw.orig +++ b/test/pix/firewall93.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:47 2011 PDT by vadim +! Generated Wed Apr 13 17:15:45 2011 PDT by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/firewall94.fw.orig b/test/pix/firewall94.fw.orig index 9787724d7..1e5cc1b03 100755 --- a/test/pix/firewall94.fw.orig +++ b/test/pix/firewall94.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:48 2011 PDT by vadim +! Generated Wed Apr 13 17:15:46 2011 PDT 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 4a179c501..119e72d78 100755 --- a/test/pix/fwsm1.fw.orig +++ b/test/pix/fwsm1.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:48 2011 PDT by vadim +! Generated Wed Apr 13 17:15:47 2011 PDT by vadim ! ! Compiled for fwsm 2.3 ! Outbound ACLs: supported @@ -71,8 +71,7 @@ snmp-server enable traps snmp-server host inside 192.168.1.20 poll snmp-server host inside 192.168.1.22 trap -clear ntp -ntp server 192.168.1.20 source inside prefer + no service resetinbound diff --git a/test/pix/fwsm2.fw.orig b/test/pix/fwsm2.fw.orig index fb7302068..d578b4c90 100755 --- a/test/pix/fwsm2.fw.orig +++ b/test/pix/fwsm2.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:49 2011 PDT by vadim +! Generated Wed Apr 13 17:15:47 2011 PDT by vadim ! ! Compiled for fwsm 4.x ! Outbound ACLs: supported @@ -80,8 +80,7 @@ snmp-server enable traps snmp-server host inside 192.168.1.20 poll snmp-server host inside 192.168.1.22 trap -clear config ntp -ntp server 192.168.1.20 source inside prefer + no service resetinbound diff --git a/test/pix/pix515.fw.orig b/test/pix/pix515.fw.orig index 08e4eee0d..189db3b2c 100755 --- a/test/pix/pix515.fw.orig +++ b/test/pix/pix515.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:50 2011 PDT by vadim +! Generated Wed Apr 13 17:15:48 2011 PDT 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 e49c7f5f9..406bd0041 100755 --- a/test/pix/real.fw.orig +++ b/test/pix/real.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:50 2011 PDT by vadim +! Generated Wed Apr 13 17:15:48 2011 PDT by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/test_net_zone_2.fw.orig b/test/pix/test_net_zone_2.fw.orig index 37dc2bbf2..aa3e40e9a 100755 --- a/test/pix/test_net_zone_2.fw.orig +++ b/test/pix/test_net_zone_2.fw.orig @@ -3,7 +3,7 @@ ! ! Firewall Builder fwb_pix v4.2.0.3525 ! -! Generated Wed Apr 13 17:10:51 2011 PDT by vadim +! Generated Wed Apr 13 17:15:49 2011 PDT by vadim ! ! Compiled for pix 6.1 ! Outbound ACLs: not supported