fixes #1007, #1009 deprecate "install only acl, icmp, telnet, ssh, nat, global and static" option in installer options dialog; instead, add option to generate shortened config to the pix advanced settings dialog

This commit is contained in:
Vadim Kurland
2009-12-23 21:53:29 +00:00
parent f1a527b35c
commit bd8c27d3be
4 changed files with 15 additions and 1 deletions
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 2257
#define BUILD_NUM 2258
+2
View File
@@ -139,6 +139,8 @@ QString CompilerDriver_pix::assembleFwScript(Cluster *cluster,
top_comment.setVariable("generate_outb_acls", QString((generate_outb_acls)?"yes":"no"));
top_comment.setVariable("afpa", QString((afpa)?"yes":"no"));
script_skeleton.setVariable("short_script", options->getBool("short_script"));
script_skeleton.setVariable("not_short_script", ! options->getBool("short_script"));
script_skeleton.setVariable("system_configuration_script", system_configuration_script.c_str());
script_skeleton.setVariable("policy_script", policy_script.c_str());
script_skeleton.setVariable("nat_script", nat_script.c_str());
+4
View File
@@ -173,6 +173,8 @@ pixAdvancedDialog::pixAdvancedDialog(QWidget*, FWObject *o)//(parent)
FWOptions *fwoptions = (Firewall::cast(obj))->getOptionsObject();
assert(fwoptions!=NULL);
/* Page Script */
bool f1=fwoptions->getBool("pix_acl_basic");
bool f2=fwoptions->getBool("pix_acl_no_clear");
bool f3=fwoptions->getBool("pix_acl_substitution");
@@ -194,6 +196,8 @@ pixAdvancedDialog::pixAdvancedDialog(QWidget*, FWObject *o)//(parent)
Management *mgmt=(Firewall::cast(obj))->getManagementObject();
assert(mgmt!=NULL);
data.registerOption( m_dialog->short_script, fwoptions, "short_script");
/* Page "Compiler Options" */
bool outboundACLSupported= (Resources::platform_res[platform]->getResourceBool(
@@ -25,7 +25,15 @@
! End of prolog script:
!
{{if short_script}}
! This script was generated with option "Generate only access-list, access-group,
! nat, static, global" commands turned on in the "Script" tab of the firewall
! object advanced settings dialog. Skipping system configuration commands.
{{endif}}
{{if not_short_script}}
{{$system_configuration_script}}
{{endif}}
{{$policy_script}}