onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-19 01:37:17 +01:00
Code Issues Releases Wiki Activity

see #2344 disabled ntp configuraton when host os is FWSM

Browse Source
This commit is contained in:
Vadim Kurland 2011-04-13 17:24:55 -07:00
parent aa6be186da
commit 457fcd1660
43 changed files with 102 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/ChangeLog
View File

@ -1,5 +1,8 @@
2011-04-13 Vadim Kurland <vadim@netcitadel.com>
* 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"

31
src/libgui/pixosAdvancedDialog.cpp
View File

@ -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 */

57
src/libgui/pixosadvanceddialog_q.ui
View File

@ -12,7 +12,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>502</width>
<width>539</width>
<height>402</height>
</rect>
</property>
@ -78,31 +78,22 @@
<attribute name="title">
<string>NTP</string>
</attribute>
<layout class="QGridLayout">
<property name="margin">
<number>6</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>30</height>
</size>
</property>
</spacer>
</item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="buttonGroup41">
<widget class="QLabel" name="fwsm_ntp_warning">
<property name="text">
<string>NTP cannot be configured on FWSM, because it takes its settings from the Switch.</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="ntp_servers_group">
<property name="title">
<string>NTP Servers:</string>
</property>
@ -211,6 +202,22 @@
</layout>
</widget>
</item>
<item row="2" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>30</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="label602">

26
src/res/configlets/fwsm_os/ntp
View File

@ -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."

2
test/pix/cluster1-1_pix1.fw.orig
View File

@ -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

2
test/pix/cluster1-1_pix2.fw.orig
View File

@ -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

2
test/pix/cluster1_pix1.fw.orig
View File

@ -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

2
test/pix/cluster1_pix2.fw.orig
View File

@ -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

2
test/pix/firewall.fw.orig
View File

@ -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

2
test/pix/firewall1.fw.orig
View File

@ -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

2
test/pix/firewall10.fw.orig
View File

@ -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

2
test/pix/firewall11.fw.orig
View File

@ -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

2
test/pix/firewall12.fw.orig
View File

@ -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

2
test/pix/firewall13.fw.orig
View File

@ -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

2
test/pix/firewall14.fw.orig
View File

@ -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

2
test/pix/firewall2.fw.orig
View File

@ -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

2
test/pix/firewall20.fw.orig
View File

@ -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

2
test/pix/firewall21-1.fw.orig
View File

@ -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

2
test/pix/firewall21.fw.orig
View File

@ -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

2
test/pix/firewall22.fw.orig
View File

@ -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

2
test/pix/firewall23.fw.orig
View File

@ -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

2
test/pix/firewall3.fw.orig
View File

@ -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

2
test/pix/firewall33.fw.orig
View File

@ -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

2
test/pix/firewall34.fw.orig
View File

@ -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

2
test/pix/firewall4.fw.orig
View File

@ -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

2
test/pix/firewall50.fw.orig
View File

@ -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

2
test/pix/firewall6.fw.orig
View File

@ -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

2
test/pix/firewall8.fw.orig
View File

@ -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

2
test/pix/firewall80.fw.orig
View File

@ -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

2
test/pix/firewall81.fw.orig
View File

@ -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

2
test/pix/firewall82.fw.orig
View File

@ -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

2
test/pix/firewall83.fw.orig
View File

@ -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

2
test/pix/firewall9.fw.orig
View File

@ -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

2
test/pix/firewall90.fw.orig
View File

@ -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

2
test/pix/firewall91.fw.orig
View File

@ -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

2
test/pix/firewall92.fw.orig
View File

@ -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

2
test/pix/firewall93.fw.orig
View File

@ -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

2
test/pix/firewall94.fw.orig
View File

@ -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

5
test/pix/fwsm1.fw.orig
View File

@ -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

5
test/pix/fwsm2.fw.orig
View File

@ -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

2
test/pix/pix515.fw.orig
View File

@ -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

2
test/pix/real.fw.orig
View File

@ -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

2
test/pix/test_net_zone_2.fw.orig
View File

@ -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