From bde7cd1043c7d67b4a941a38d854d25a63749191 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Wed, 6 Jul 2011 18:06:11 -0700 Subject: [PATCH] clear option "prolog_place" in compiler for iosacl to make sure function CompilerDriver::assembleFwScriptInternal() does not get confused if user switched fw platform --- src/cisco_lib/CompilerDriver_iosacl_run.cpp | 5 +++++ test/ipt/rc.firewall.local | 4 ++-- test/pf/pf_cluster_4_rc.conf.local | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/cisco_lib/CompilerDriver_iosacl_run.cpp b/src/cisco_lib/CompilerDriver_iosacl_run.cpp index 4b04f9e9b..d6a528687 100644 --- a/src/cisco_lib/CompilerDriver_iosacl_run.cpp +++ b/src/cisco_lib/CompilerDriver_iosacl_run.cpp @@ -110,6 +110,11 @@ QString CompilerDriver_iosacl::assembleFwScript(Cluster *cluster, options->setStr("prolog_script", options->getStr("iosacl_prolog_script")); options->setStr("epilog_script", options->getStr("iosacl_epilog_script")); + // we do not offer user a choice of the place where to put prolog + // lines, therefore we can reset this attribute to make sure it + // does not interfere + options->setStr("prolog_place", ""); + assembleFwScriptInternal(cluster, fw, cluster_member, oscnf, &script_skeleton, &top_comment, "!", true); return script_skeleton.expand(); diff --git a/test/ipt/rc.firewall.local b/test/ipt/rc.firewall.local index 476684bb2..8175a6781 100755 --- a/test/ipt/rc.firewall.local +++ b/test/ipt/rc.firewall.local @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.0.3556 +# Firewall Builder fwb_ipt v5.0.0.3557 # -# Generated Tue Jul 5 18:03:29 2011 PDT by vadim +# Generated Wed Jul 6 17:48:03 2011 PDT by vadim # # files: * rc.firewall.local /etc/rc.d//rc.firewall.local # diff --git a/test/pf/pf_cluster_4_rc.conf.local b/test/pf/pf_cluster_4_rc.conf.local index af28ee0d1..523b35c73 100755 --- a/test/pf/pf_cluster_4_rc.conf.local +++ b/test/pf/pf_cluster_4_rc.conf.local @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v5.0.0.3556 +# Firewall Builder fwb_pf v5.0.0.3557 # -# Generated Tue Jul 5 18:05:39 2011 PDT by vadim +# Generated Wed Jul 6 17:49:01 2011 PDT by vadim # # files: * pf_cluster_4_rc.conf.local /etc/pf_cluster_4_rc.conf.local # files: pf_cluster_4_pf.conf /etc/pf_cluster_4_pf.conf