From 2b342aa67d3ba20bbdbaaf9ba046fdd93e95956b Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Sun, 20 Feb 2011 20:12:18 -0800 Subject: [PATCH] see #2057 detection of loops in branching rules ; see #2124 some error messages appeared multiple times in generated script --- .../RoutingCompiler_iosacl_writers.cpp | 2 +- src/cisco_lib/RoutingCompiler_pix_writers.cpp | 2 +- src/compiler_lib/CompilerDriver.cpp | 25 ++- src/iptlib/NATCompiler_PrintRule.cpp | 2 +- src/iptlib/PolicyCompiler_PrintRule.cpp | 2 +- src/iptlib/RoutingCompiler_ipt_writers.cpp | 2 +- src/libfwbuilder/src/fwbuilder/Rule.cpp | 1 + src/libfwbuilder/src/fwbuilder/Rule.h | 7 + .../src/fwcompiler/BaseCompiler.cpp | 3 +- src/libfwbuilder/src/fwcompiler/Compiler.cpp | 2 +- src/pflib/NATCompiler_pf_writers.cpp | 3 - src/pflib/PolicyCompiler_ipf_writers.cpp | 3 - src/pflib/PolicyCompiler_ipfw_writers.cpp | 3 - src/pflib/PolicyCompiler_pf_writers.cpp | 3 - src/pflib/RoutingCompiler_openbsd_writers.cpp | 2 +- test/ipt/cluster1_secuwall-1.fw.orig | 4 +- test/ipt/firewall-base-rulesets.fw.orig | 4 +- test/ipt/firewall-ipv6-1.fw.orig | 4 +- test/ipt/firewall-ipv6-2.fw.orig | 4 +- test/ipt/firewall-ipv6-3.fw.orig | 4 +- test/ipt/firewall-ipv6-4-1.fw.orig | 4 +- test/ipt/firewall-ipv6-4.fw.orig | 4 +- test/ipt/firewall-ipv6-5.fw.orig | 4 +- test/ipt/firewall-ipv6-6.fw.orig | 4 +- test/ipt/firewall-ipv6-7.fw.orig | 4 +- test/ipt/firewall-ipv6-8.fw.orig | 4 +- ...-ipv6-ipt-reset-prolog-after-flush.fw.orig | 4 +- ...-ipt-reset-prolog-after-interfaces.fw.orig | 4 +- ...firewall-ipv6-ipt-reset-prolog-top.fw.orig | 4 +- .../firewall-ipv6-prolog-after-flush.fw.orig | 4 +- ...ewall-ipv6-prolog-after-interfaces.fw.orig | 4 +- test/ipt/firewall-ipv6-prolog-top.fw.orig | 4 +- test/ipt/firewall-server-1-s.fw.orig | 4 +- test/ipt/firewall.fw.orig | 4 +- test/ipt/firewall1.fw.orig | 4 +- test/ipt/firewall10.fw.orig | 4 +- test/ipt/firewall11.fw.orig | 4 +- test/ipt/firewall12.fw.orig | 4 +- test/ipt/firewall13.fw.orig | 4 +- test/ipt/firewall14.fw.orig | 4 +- test/ipt/firewall15.fw.orig | 4 +- test/ipt/firewall16.fw.orig | 4 +- test/ipt/firewall17.fw.orig | 4 +- test/ipt/firewall18.fw.orig | 4 +- test/ipt/firewall19.fw.orig | 4 +- test/ipt/firewall2-1.fw.orig | 4 +- test/ipt/firewall2-2.fw.orig | 4 +- test/ipt/firewall2-3.fw.orig | 4 +- test/ipt/firewall2-4.fw.orig | 4 +- test/ipt/firewall2-5.fw.orig | 4 +- test/ipt/firewall2-6.fw.orig | 4 +- test/ipt/firewall2-7.fw.orig | 4 +- test/ipt/firewall2.fw.orig | 4 +- test/ipt/firewall20-ipv6.fw.orig | 4 +- test/ipt/firewall20.fw.orig | 4 +- test/ipt/firewall21-1.fw.orig | 4 +- test/ipt/firewall21.fw.orig | 4 +- test/ipt/firewall22.fw.orig | 4 +- test/ipt/firewall23-1.fw.orig | 4 +- test/ipt/firewall23.fw.orig | 4 +- test/ipt/firewall24.fw.orig | 4 +- test/ipt/firewall25.fw.orig | 4 +- test/ipt/firewall26.fw.orig | 4 +- test/ipt/firewall27.fw.orig | 4 +- test/ipt/firewall28.fw.orig | 4 +- test/ipt/firewall29.fw.orig | 4 +- test/ipt/firewall3.fw.orig | 4 +- test/ipt/firewall30.fw.orig | 4 +- test/ipt/firewall31.fw.orig | 4 +- test/ipt/firewall32.fw.orig | 4 +- test/ipt/firewall33-1.fw.orig | 4 +- test/ipt/firewall33.fw.orig | 4 +- test/ipt/firewall34.fw.orig | 4 +- test/ipt/firewall35.fw.orig | 4 +- test/ipt/firewall36-1.fw.orig | 4 +- test/ipt/firewall36-2.fw.orig | 4 +- test/ipt/firewall36.fw.orig | 4 +- test/ipt/firewall37-1.fw.orig | 4 +- test/ipt/firewall37.fw.orig | 4 +- test/ipt/firewall38.fw.orig | 4 +- test/ipt/firewall39.fw.orig | 55 ++++-- test/ipt/firewall4.fw.orig | 4 +- test/ipt/firewall40-1.fw.orig | 4 +- test/ipt/firewall40-2.fw.orig | 4 +- test/ipt/firewall40.fw.orig | 4 +- test/ipt/firewall41-1.fw.orig | 4 +- test/ipt/firewall41.fw.orig | 4 +- test/ipt/firewall42.fw.orig | 4 +- test/ipt/firewall5.fw.orig | 4 +- test/ipt/firewall50.fw.orig | 4 +- test/ipt/firewall51.fw.orig | 4 +- test/ipt/firewall6.fw.orig | 4 +- test/ipt/firewall60.fw.orig | 4 +- test/ipt/firewall61-1.2.5.fw.orig | 4 +- test/ipt/firewall61-1.2.6.fw.orig | 4 +- test/ipt/firewall61-1.3.x.fw.orig | 4 +- test/ipt/firewall61-1.4.fw.orig | 4 +- test/ipt/firewall62.fw.orig | 4 +- test/ipt/firewall63.fw.orig | 4 +- test/ipt/firewall7.fw.orig | 4 +- test/ipt/firewall70.fw.orig | 4 +- test/ipt/firewall71.fw.orig | 4 +- test/ipt/firewall72-1.3.x.fw.orig | 4 +- test/ipt/firewall72-1.4.3.fw.orig | 4 +- test/ipt/firewall73.fw.orig | 4 +- test/ipt/firewall74.fw.orig | 4 +- test/ipt/firewall8.fw.orig | 4 +- test/ipt/firewall80.fw.orig | 4 +- test/ipt/firewall81.fw.orig | 4 +- test/ipt/firewall82.fw.orig | 12 +- test/ipt/firewall82_A.fw.orig | 22 +-- test/ipt/firewall82_B.fw.orig | 4 +- test/ipt/firewall9.fw.orig | 4 +- test/ipt/firewall90.fw.orig | 4 +- test/ipt/firewall91.fw.orig | 4 +- test/ipt/firewall92.fw.orig | 4 +- test/ipt/firewall93.fw.orig | 4 +- test/ipt/fw-A.fw.orig | 4 +- test/ipt/fw1.fw.orig | 4 +- test/ipt/fwbuilder.fw.orig | 4 +- .../heartbeat_cluster_1_d_linux-1-d.fw.orig | 4 +- .../heartbeat_cluster_1_d_linux-2-d.fw.orig | 4 +- test/ipt/heartbeat_cluster_1_linux-1.fw.orig | 4 +- test/ipt/heartbeat_cluster_1_linux-2.fw.orig | 4 +- test/ipt/heartbeat_cluster_2_linux-1.fw.orig | 4 +- test/ipt/heartbeat_cluster_2_linux-2.fw.orig | 4 +- test/ipt/host.fw.orig | 4 +- test/ipt/objects-for-regression-tests.fwb | 165 +++++++++++++++--- test/ipt/openais_cluster_1_linux-1.fw.orig | 4 +- test/ipt/openais_cluster_1_linux-2.fw.orig | 4 +- test/ipt/rc.firewall.local | 2 +- test/ipt/rh90.fw.orig | 4 +- .../ipt/secuwall_cluster_1_secuwall-1.fw.orig | 4 +- test/ipt/server-cluster-1_server-1.fw.orig | 4 +- test/ipt/server-cluster-1_server-2.fw.orig | 4 +- test/ipt/test-shadowing-1.fw.orig | 4 +- test/ipt/test-shadowing-2.fw.orig | 4 +- test/ipt/test-shadowing-3.fw.orig | 4 +- test/ipt/test_fw.fw.orig | 4 +- test/ipt/vrrp_cluster_1_linux-1.fw.orig | 4 +- test/ipt/vrrp_cluster_1_linux-2.fw.orig | 4 +- test/ipt/vrrp_cluster_2_linux-1.fw.orig | 4 +- test/ipt/vrrp_cluster_2_linux-2.fw.orig | 4 +- test/ipt/vrrp_cluster_2_linux-3.fw.orig | 4 +- test/pf/firewall-base-rulesets.fw.orig | 6 +- test/pf/firewall-ipv6-1.fw.orig | 6 +- test/pf/firewall-ipv6-2.fw.orig | 6 +- test/pf/firewall-ipv6-3.fw.orig | 4 +- test/pf/firewall.fw.orig | 6 +- test/pf/firewall1.fw.orig | 6 +- test/pf/firewall10-1.fw.orig | 6 +- test/pf/firewall10-2.fw.orig | 6 +- test/pf/firewall10-3.fw.orig | 6 +- test/pf/firewall10-4.fw.orig | 6 +- test/pf/firewall10-5.fw.orig | 6 +- test/pf/firewall10-6.fw.orig | 6 +- test/pf/firewall100.fw.orig | 6 +- test/pf/firewall101.fw.orig | 6 +- test/pf/firewall102.fw.orig | 4 +- test/pf/firewall103-1.fw.orig | 6 +- test/pf/firewall103-2.fw.orig | 6 +- test/pf/firewall103.fw.orig | 6 +- test/pf/firewall104-1.fw.orig | 6 +- test/pf/firewall104.fw.orig | 6 +- test/pf/firewall105.fw.orig | 4 +- test/pf/firewall106.fw.orig | 4 +- test/pf/firewall107.fw.orig | 6 +- test/pf/firewall108.fw.orig | 4 +- test/pf/firewall109-1.fw.orig | 4 +- test/pf/firewall109-2.fw.orig | 6 +- test/pf/firewall109-3.fw.orig | 4 +- test/pf/firewall109.fw.orig | 6 +- test/pf/firewall11.fw.orig | 6 +- test/pf/firewall110.fw.orig | 6 +- test/pf/firewall12.fw.orig | 6 +- test/pf/firewall13.fw.orig | 6 +- test/pf/firewall14-1.fw.orig | 6 +- test/pf/firewall14.fw.orig | 6 +- test/pf/firewall2-1.fw.orig | 8 +- test/pf/firewall2-6.fw.orig | 6 +- test/pf/firewall2.fw.orig | 6 +- test/pf/firewall20.fw.orig | 6 +- test/pf/firewall21.fw.orig | 6 +- test/pf/firewall22.fw.orig | 6 +- test/pf/firewall3.fw.orig | 6 +- test/pf/firewall33.fw.orig | 6 +- test/pf/firewall34.fw.orig | 6 +- test/pf/firewall38.fw.orig | 6 +- test/pf/firewall39.fw.orig | 6 +- test/pf/firewall4.fw.orig | 6 +- test/pf/firewall40-1.fw.orig | 6 +- test/pf/firewall40.fw.orig | 6 +- test/pf/firewall41.fw.orig | 6 +- test/pf/firewall5.fw.orig | 6 +- test/pf/firewall51.fw.orig | 6 +- test/pf/firewall6.fw.orig | 6 +- test/pf/firewall62.fw.orig | 6 +- test/pf/firewall63.fw.orig | 6 +- test/pf/firewall7.fw.orig | 6 +- test/pf/firewall70.fw.orig | 6 +- test/pf/firewall8.fw.orig | 6 +- test/pf/firewall80-4.5.fw.orig | 6 +- test/pf/firewall80.fw.orig | 6 +- test/pf/firewall9.fw.orig | 6 +- test/pf/firewall91.fw.orig | 6 +- test/pf/firewall92.fw.orig | 6 +- test/pf/pf_cluster_1_openbsd-1.fw.orig | 6 +- test/pf/pf_cluster_1_openbsd-2.fw.orig | 6 +- test/pf/pf_cluster_2_freebsd-1.fw.orig | 6 +- test/pf/pf_cluster_2_freebsd-2.fw.orig | 6 +- test/pf/pf_cluster_3_openbsd-3.fw.orig | 6 +- test/pf/pf_cluster_3_openbsd-4.fw.orig | 6 +- test/pf/pf_cluster_4_rc.conf.local | 2 +- test/pf/pf_cluster_5_openbsd-3.fw.orig | 6 +- test/pf/pf_cluster_5_openbsd-4.fw.orig | 6 +- 215 files changed, 684 insertions(+), 540 deletions(-) diff --git a/src/cisco_lib/RoutingCompiler_iosacl_writers.cpp b/src/cisco_lib/RoutingCompiler_iosacl_writers.cpp index f77f1fb3d..ed675a22c 100644 --- a/src/cisco_lib/RoutingCompiler_iosacl_writers.cpp +++ b/src/cisco_lib/RoutingCompiler_iosacl_writers.cpp @@ -86,7 +86,7 @@ bool RoutingCompiler_iosacl::PrintRule::processNext() compiler->output << "! " << endl; } - string err = rule->getStr(".error_msg"); + string err = rule->getCompilerMessage(); if (!err.empty()) compiler->output << "# " << err << endl; if( rule->getRuleType() != RoutingRule::MultiPath ) diff --git a/src/cisco_lib/RoutingCompiler_pix_writers.cpp b/src/cisco_lib/RoutingCompiler_pix_writers.cpp index 2c79e33ca..6ed0fb7db 100644 --- a/src/cisco_lib/RoutingCompiler_pix_writers.cpp +++ b/src/cisco_lib/RoutingCompiler_pix_writers.cpp @@ -78,7 +78,7 @@ bool RoutingCompiler_pix::PrintRule::processNext() compiler->output << "! " << endl; } - string err = rule->getStr(".error_msg"); + string err = rule->getCompilerMessage(); if (!err.empty()) compiler->output << "# " << err << endl; if( rule->getRuleType() != RoutingRule::MultiPath ) diff --git a/src/compiler_lib/CompilerDriver.cpp b/src/compiler_lib/CompilerDriver.cpp index efa073307..00c6270ba 100644 --- a/src/compiler_lib/CompilerDriver.cpp +++ b/src/compiler_lib/CompilerDriver.cpp @@ -654,6 +654,9 @@ void CompilerDriver::findImportedRuleSets(Firewall *fw, RuleSet *branch_ruleset = rule->getBranch(); if (branch_ruleset!=NULL) { + // qDebug() << "ruleset=" << ruleset->getName().c_str() + // << "branch=" << branch_ruleset->getName().c_str(); + map referenced_branch_rulesets; _findImportedRuleSetsRecursively( @@ -666,12 +669,18 @@ void CompilerDriver::findImportedRuleSets(Firewall *fw, RuleSet *branch_ruleset = RuleSet::cast(it->first); int counter = it->second; + // qDebug() << " " + // << "branch=" << branch_ruleset->getName().c_str() + // << "counter=" << counter; + if (counter > 1) { - QString err("Rule set %1 of firewall %2 has branching rule that loops back to it"); + QString err( + "Rule branches to rule set %1 which branches " + "back to it, creating a loop"); warning(ruleset->getParent(), ruleset, rule, - err.arg(ruleset->getName().c_str()) - .arg(fw->getName().c_str()).toStdString()); + err.arg(branch_ruleset->getName().c_str()) + .toStdString()); } if (branch_ruleset->isChildOf(fw)) continue; @@ -702,6 +711,9 @@ void CompilerDriver::findImportedRuleSets(Firewall *fw, void CompilerDriver::_findImportedRuleSetsRecursively( Firewall *fw, RuleSet *branch_ruleset, map &branch_rulesets) { + // multiple rules in the rule set may branch to the same branch rule set + map local_branch_ruleset_counters; + int c = branch_rulesets[branch_ruleset]; branch_rulesets[branch_ruleset] = ++c; if (c > 1) return; // we have seen this one already @@ -712,9 +724,12 @@ void CompilerDriver::_findImportedRuleSetsRecursively( if (rule == NULL) continue; // skip RuleSetOptions object RuleSet *next_branch_ruleset = rule->getBranch(); - if (next_branch_ruleset!=NULL) + if (next_branch_ruleset!=NULL && + local_branch_ruleset_counters.count(next_branch_ruleset)==0) { - _findImportedRuleSetsRecursively(fw, next_branch_ruleset, branch_rulesets); + local_branch_ruleset_counters[next_branch_ruleset] = 1; + _findImportedRuleSetsRecursively( + fw, next_branch_ruleset, branch_rulesets); } } } diff --git a/src/iptlib/NATCompiler_PrintRule.cpp b/src/iptlib/NATCompiler_PrintRule.cpp index 63597aed0..023315e45 100644 --- a/src/iptlib/NATCompiler_PrintRule.cpp +++ b/src/iptlib/NATCompiler_PrintRule.cpp @@ -185,7 +185,7 @@ string NATCompiler_ipt::PrintRule::_printRuleLabel(NATRule *rule) current_rule_label=rl; } - string err = rule->getStr(".error_msg"); + string err = rule->getCompilerMessage(); if (!err.empty()) res << "# " << err << endl; return res.str(); diff --git a/src/iptlib/PolicyCompiler_PrintRule.cpp b/src/iptlib/PolicyCompiler_PrintRule.cpp index 070769cda..d35809f3c 100644 --- a/src/iptlib/PolicyCompiler_PrintRule.cpp +++ b/src/iptlib/PolicyCompiler_PrintRule.cpp @@ -204,7 +204,7 @@ string PolicyCompiler_ipt::PrintRule::_printRuleLabel(PolicyRule *rule) current_rule_label = rl; - string err = rule->getStr(".error_msg"); + string err = rule->getCompilerMessage(); if (!err.empty()) res << "# " << err << endl; return res.str(); diff --git a/src/iptlib/RoutingCompiler_ipt_writers.cpp b/src/iptlib/RoutingCompiler_ipt_writers.cpp index c0a4c53e9..2971f5736 100644 --- a/src/iptlib/RoutingCompiler_ipt_writers.cpp +++ b/src/iptlib/RoutingCompiler_ipt_writers.cpp @@ -193,7 +193,7 @@ bool RoutingCompiler_ipt::PrintRule::processNext() current_rule_label = rl; } - string err = rule->getStr(".error_msg"); + string err = rule->getCompilerMessage(); if (!err.empty()) compiler->output << "# " << err << endl; string command_line = RoutingRuleToString(rule); diff --git a/src/libfwbuilder/src/fwbuilder/Rule.cpp b/src/libfwbuilder/src/fwbuilder/Rule.cpp index f24d98203..57ea3374f 100644 --- a/src/libfwbuilder/src/fwbuilder/Rule.cpp +++ b/src/libfwbuilder/src/fwbuilder/Rule.cpp @@ -89,6 +89,7 @@ FWObject& Rule::shallowDuplicate(const FWObject *x, label = rx->label; unique_id = rx->unique_id; abs_rule_number = rx->abs_rule_number; + compiler_message = rx->compiler_message; return FWObject::shallowDuplicate(x,preserve_id); } diff --git a/src/libfwbuilder/src/fwbuilder/Rule.h b/src/libfwbuilder/src/fwbuilder/Rule.h index 4190bee2a..ab4ab5e6f 100644 --- a/src/libfwbuilder/src/fwbuilder/Rule.h +++ b/src/libfwbuilder/src/fwbuilder/Rule.h @@ -62,6 +62,10 @@ class Rule : public Group std::string unique_id; int abs_rule_number; + /* compilers store warnings and errors associated with this rule here. + */ + std::string compiler_message; + public: Rule(); @@ -79,6 +83,9 @@ class Rule : public Group void setPosition(int n); int getPosition() const; + void setCompilerMessage(const std::string &msg) { compiler_message = msg; } + std::string getCompilerMessage() { return compiler_message; } + void disable(); void enable(); bool isDisabled() const; diff --git a/src/libfwbuilder/src/fwcompiler/BaseCompiler.cpp b/src/libfwbuilder/src/fwcompiler/BaseCompiler.cpp index 091a7108e..d4d2e9eb2 100644 --- a/src/libfwbuilder/src/fwcompiler/BaseCompiler.cpp +++ b/src/libfwbuilder/src/fwcompiler/BaseCompiler.cpp @@ -125,7 +125,8 @@ void BaseCompiler::message(const std::string &level, { string str = setLevel(level, stdErrorMessage(fw, ruleset, rule, errstr)); printError(str); - if (rule && Rule::cast(rule)) rule->setStr(".error_msg", str); + Rule *cast_rule = Rule::cast(rule); + if (cast_rule) cast_rule->setCompilerMessage(str); } void BaseCompiler::printError(const string &errstr) diff --git a/src/libfwbuilder/src/fwcompiler/Compiler.cpp b/src/libfwbuilder/src/fwcompiler/Compiler.cpp index 54b6c21d4..cab4b080c 100644 --- a/src/libfwbuilder/src/fwcompiler/Compiler.cpp +++ b/src/libfwbuilder/src/fwcompiler/Compiler.cpp @@ -1571,7 +1571,7 @@ string Compiler::printComment(Rule *rule, string &prev_rule_label, } prev_rule_label = rl; } - string err = rule->getStr(".error_msg"); + string err = rule->getCompilerMessage(); if (!err.empty()) res << prefix << " " << err << endl; return res.str(); } diff --git a/src/pflib/NATCompiler_pf_writers.cpp b/src/pflib/NATCompiler_pf_writers.cpp index d90042f84..98c284ad5 100644 --- a/src/pflib/NATCompiler_pf_writers.cpp +++ b/src/pflib/NATCompiler_pf_writers.cpp @@ -112,9 +112,6 @@ bool NATCompiler_pf::PrintRule::processNext() compiler->output << compiler->printComment(rule, current_rule_label, "#"); - // string err = rule->getStr(".error_msg"); - // if (!err.empty()) compiler->output << "# " << err << endl; - RuleElementOSrc *osrcrel = rule->getOSrc(); RuleElementODst *odstrel = rule->getODst(); RuleElementTSrc *tsrcrel = rule->getTSrc(); diff --git a/src/pflib/PolicyCompiler_ipf_writers.cpp b/src/pflib/PolicyCompiler_ipf_writers.cpp index ecf1dccc8..849c95aad 100644 --- a/src/pflib/PolicyCompiler_ipf_writers.cpp +++ b/src/pflib/PolicyCompiler_ipf_writers.cpp @@ -332,9 +332,6 @@ bool PolicyCompiler_ipf::PrintRule::processNext() compiler->output << compiler->printComment(rule, current_rule_label, "#"); - // string err = rule->getStr(".error_msg"); - // if (!err.empty()) compiler->output << "# " << err << endl; - RuleElementSrc *srcrel=rule->getSrc(); Address *src =compiler->getFirstSrc(rule); assert(src); RuleElementDst *dstrel=rule->getDst(); diff --git a/src/pflib/PolicyCompiler_ipfw_writers.cpp b/src/pflib/PolicyCompiler_ipfw_writers.cpp index f942b0086..c0bdcba86 100644 --- a/src/pflib/PolicyCompiler_ipfw_writers.cpp +++ b/src/pflib/PolicyCompiler_ipfw_writers.cpp @@ -526,9 +526,6 @@ bool PolicyCompiler_ipfw::PrintRule::processNext() compiler->output << compiler->printComment(rule, current_rule_label, "#"); - // string err = rule->getStr(".error_msg"); - // if (!err.empty()) compiler->output << "# " << err << endl; - RuleElementSrc *srcrel=rule->getSrc(); Address *src =compiler->getFirstSrc(rule); assert(src); RuleElementDst *dstrel=rule->getDst(); diff --git a/src/pflib/PolicyCompiler_pf_writers.cpp b/src/pflib/PolicyCompiler_pf_writers.cpp index e7bdda9cd..8dab38435 100644 --- a/src/pflib/PolicyCompiler_pf_writers.cpp +++ b/src/pflib/PolicyCompiler_pf_writers.cpp @@ -925,9 +925,6 @@ bool PolicyCompiler_pf::PrintRule::processNext() compiler->output << compiler->printComment(rule, current_rule_label, "#"); - // string err = rule->getStr(".error_msg"); - // if (!err.empty()) compiler->output << "# " << err << endl; - RuleElementSrc *srcrel=rule->getSrc(); // Address *src =compiler->getFirstSrc(rule); assert(src); RuleElementDst *dstrel=rule->getDst(); diff --git a/src/pflib/RoutingCompiler_openbsd_writers.cpp b/src/pflib/RoutingCompiler_openbsd_writers.cpp index fb75d845f..037f9215f 100644 --- a/src/pflib/RoutingCompiler_openbsd_writers.cpp +++ b/src/pflib/RoutingCompiler_openbsd_writers.cpp @@ -192,7 +192,7 @@ bool RoutingCompiler_openbsd::PrintRule::processNext() current_rule_label = rl; } - string err = rule->getStr(".error_msg"); + string err = rule->getCompilerMessage(); if (!err.empty()) compiler->output << "# " << err << endl; string command_line = RoutingRuleToString(rule); diff --git a/test/ipt/cluster1_secuwall-1.fw.orig b/test/ipt/cluster1_secuwall-1.fw.orig index 650bf3c5f..875c71e05 100755 --- a/test/ipt/cluster1_secuwall-1.fw.orig +++ b/test/ipt/cluster1_secuwall-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:15 2011 PST by vadim +# Generated Sun Feb 20 20:08:49 2011 PST by vadim # # files: * cluster1_secuwall-1.fw /etc/cluster1_secuwall-1.fw # @@ -588,7 +588,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:15 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:49 2011 by vadim" log "Database was cluster-tests.fwb" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall-base-rulesets.fw.orig b/test/ipt/firewall-base-rulesets.fw.orig index e687300f0..6333d88e4 100755 --- a/test/ipt/firewall-base-rulesets.fw.orig +++ b/test/ipt/firewall-base-rulesets.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:34 2011 PST by vadim +# Generated Sun Feb 20 20:07:08 2011 PST by vadim # # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw # @@ -445,7 +445,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:34 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:07:08 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-1.fw.orig b/test/ipt/firewall-ipv6-1.fw.orig index 621e8a39e..46e19b84b 100755 --- a/test/ipt/firewall-ipv6-1.fw.orig +++ b/test/ipt/firewall-ipv6-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:57 2011 PST by vadim +# Generated Sun Feb 20 20:07:32 2011 PST by vadim # # files: * firewall-ipv6-1.fw /etc/firewall-ipv6-1.fw # @@ -687,7 +687,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:57 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:07:32 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-2.fw.orig b/test/ipt/firewall-ipv6-2.fw.orig index 5f961aad2..f241565af 100755 --- a/test/ipt/firewall-ipv6-2.fw.orig +++ b/test/ipt/firewall-ipv6-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:23:00 2011 PST by vadim +# Generated Sun Feb 20 20:07:34 2011 PST by vadim # # files: * firewall-ipv6-2.fw /etc/firewall-ipv6-2.fw # @@ -930,7 +930,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:23:00 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:07:34 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-3.fw.orig b/test/ipt/firewall-ipv6-3.fw.orig index b0d6551a2..5cd7772ab 100755 --- a/test/ipt/firewall-ipv6-3.fw.orig +++ b/test/ipt/firewall-ipv6-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:23:23 2011 PST by vadim +# Generated Sun Feb 20 20:07:57 2011 PST by vadim # # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw # @@ -592,7 +592,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:23:23 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:07:57 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-4-1.fw.orig b/test/ipt/firewall-ipv6-4-1.fw.orig index c4e8698d6..8e47c31e0 100755 --- a/test/ipt/firewall-ipv6-4-1.fw.orig +++ b/test/ipt/firewall-ipv6-4-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:23:48 2011 PST by vadim +# Generated Sun Feb 20 20:08:23 2011 PST by vadim # # files: * firewall-ipv6-4-1.fw /etc/firewall-ipv6-4-1.fw # @@ -539,7 +539,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:23:48 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:23 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-4.fw.orig b/test/ipt/firewall-ipv6-4.fw.orig index 7c0461e2a..1ac208ce7 100755 --- a/test/ipt/firewall-ipv6-4.fw.orig +++ b/test/ipt/firewall-ipv6-4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:23:26 2011 PST by vadim +# Generated Sun Feb 20 20:08:00 2011 PST by vadim # # files: * firewall-ipv6-4.fw /etc/firewall-ipv6-4.fw # @@ -577,7 +577,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:23:26 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:00 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-5.fw.orig b/test/ipt/firewall-ipv6-5.fw.orig index 213e6f244..f6de9ea0d 100755 --- a/test/ipt/firewall-ipv6-5.fw.orig +++ b/test/ipt/firewall-ipv6-5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:23:29 2011 PST by vadim +# Generated Sun Feb 20 20:08:03 2011 PST by vadim # # files: * firewall-ipv6-5.fw /etc/firewall-ipv6-5.fw # @@ -412,7 +412,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:23:29 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:03 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-6.fw.orig b/test/ipt/firewall-ipv6-6.fw.orig index 4a1259947..f5a7a3af5 100755 --- a/test/ipt/firewall-ipv6-6.fw.orig +++ b/test/ipt/firewall-ipv6-6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:23:33 2011 PST by vadim +# Generated Sun Feb 20 20:08:07 2011 PST by vadim # # files: * firewall-ipv6-6.fw /etc/firewall-ipv6-6.fw # @@ -399,7 +399,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:23:33 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:07 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-7.fw.orig b/test/ipt/firewall-ipv6-7.fw.orig index 7b739a0e5..e61e676d3 100755 --- a/test/ipt/firewall-ipv6-7.fw.orig +++ b/test/ipt/firewall-ipv6-7.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:23:37 2011 PST by vadim +# Generated Sun Feb 20 20:08:11 2011 PST by vadim # # files: * firewall-ipv6-7.fw /etc/firewall-ipv6-7.fw # @@ -443,7 +443,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:23:37 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:11 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-8.fw.orig b/test/ipt/firewall-ipv6-8.fw.orig index 04ca63c78..852e21478 100755 --- a/test/ipt/firewall-ipv6-8.fw.orig +++ b/test/ipt/firewall-ipv6-8.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:23:41 2011 PST by vadim +# Generated Sun Feb 20 20:08:15 2011 PST by vadim # # files: * firewall-ipv6-8.fw /etc/firewall-ipv6-8.fw # @@ -484,7 +484,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:23:41 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:15 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig index f7dd05814..62a3971eb 100755 --- a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig +++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:23:45 2011 PST by vadim +# Generated Sun Feb 20 20:08:19 2011 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-after-flush.fw /etc/firewall-ipv6-ipt-reset-prolog-after-flush.fw # @@ -450,7 +450,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:23:45 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:19 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig index bd33903f1..587afeee6 100755 --- a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig +++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:23:49 2011 PST by vadim +# Generated Sun Feb 20 20:08:23 2011 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-after-interfaces.fw /etc/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw # @@ -450,7 +450,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:23:49 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:23 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig b/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig index 5641ac2e2..d690e3199 100755 --- a/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig +++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:23:52 2011 PST by vadim +# Generated Sun Feb 20 20:08:27 2011 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-top.fw /etc/firewall-ipv6-ipt-reset-prolog-top.fw # @@ -450,7 +450,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:23:52 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:27 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig b/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig index 70ffdd0e2..57878778e 100755 --- a/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig +++ b/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:23:53 2011 PST by vadim +# Generated Sun Feb 20 20:08:27 2011 PST by vadim # # files: * firewall-ipv6-prolog-after-flush.fw /etc/firewall-ipv6-prolog-after-flush.fw # @@ -420,7 +420,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:23:53 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:27 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig b/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig index 2366c50d0..8dad8936b 100755 --- a/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig +++ b/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:23:57 2011 PST by vadim +# Generated Sun Feb 20 20:08:31 2011 PST by vadim # # files: * firewall-ipv6-prolog-after-interfaces.fw /etc/firewall-ipv6-prolog-after-interfaces.fw # @@ -420,7 +420,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:23:57 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:31 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-prolog-top.fw.orig b/test/ipt/firewall-ipv6-prolog-top.fw.orig index 2f48ffb3a..93e953d87 100755 --- a/test/ipt/firewall-ipv6-prolog-top.fw.orig +++ b/test/ipt/firewall-ipv6-prolog-top.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:23:57 2011 PST by vadim +# Generated Sun Feb 20 20:08:32 2011 PST by vadim # # files: * firewall-ipv6-prolog-top.fw /etc/firewall-ipv6-prolog-top.fw # @@ -420,7 +420,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:23:57 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:32 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-server-1-s.fw.orig b/test/ipt/firewall-server-1-s.fw.orig index 11de6725a..afeeb2f79 100755 --- a/test/ipt/firewall-server-1-s.fw.orig +++ b/test/ipt/firewall-server-1-s.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:00 2011 PST by vadim +# Generated Sun Feb 20 20:08:35 2011 PST by vadim # # files: * firewall-server-1-s.fw /etc/fw/firewall-server-1-s.fw # @@ -393,7 +393,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:00 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:35 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall.fw.orig b/test/ipt/firewall.fw.orig index 437f3c172..125561b61 100755 --- a/test/ipt/firewall.fw.orig +++ b/test/ipt/firewall.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:19:37 2011 PST by vadim +# Generated Sun Feb 20 20:04:17 2011 PST by vadim # # files: * firewall.fw /etc/fw/firewall.fw # @@ -1341,7 +1341,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:19:37 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:17 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall1.fw.orig b/test/ipt/firewall1.fw.orig index 9292f25e3..d6d011c39 100755 --- a/test/ipt/firewall1.fw.orig +++ b/test/ipt/firewall1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:19:40 2011 PST by vadim +# Generated Sun Feb 20 20:04:19 2011 PST by vadim # # files: * firewall1.fw /etc/fw/firewall1.fw # @@ -1252,7 +1252,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:19:40 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:19 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall10.fw.orig b/test/ipt/firewall10.fw.orig index 2b812979d..05a77cb1b 100755 --- a/test/ipt/firewall10.fw.orig +++ b/test/ipt/firewall10.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:19:41 2011 PST by vadim +# Generated Sun Feb 20 20:04:20 2011 PST by vadim # # files: * firewall10.fw /etc/fw/firewall10.fw # @@ -473,7 +473,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:19:41 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:20 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall11.fw.orig b/test/ipt/firewall11.fw.orig index 41f5c07d8..a337efa6d 100755 --- a/test/ipt/firewall11.fw.orig +++ b/test/ipt/firewall11.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:19:43 2011 PST by vadim +# Generated Sun Feb 20 20:04:22 2011 PST by vadim # # files: * firewall11.fw /etc/fw/firewall11.fw # @@ -589,7 +589,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:19:43 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:22 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall12.fw.orig b/test/ipt/firewall12.fw.orig index 501a83fea..6100c1586 100755 --- a/test/ipt/firewall12.fw.orig +++ b/test/ipt/firewall12.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:19:44 2011 PST by vadim +# Generated Sun Feb 20 20:04:23 2011 PST by vadim # # files: * firewall12.fw /etc/fw/firewall12.fw # @@ -511,7 +511,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:19:44 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:23 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall13.fw.orig b/test/ipt/firewall13.fw.orig index 865d24909..d4509d240 100755 --- a/test/ipt/firewall13.fw.orig +++ b/test/ipt/firewall13.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:19:46 2011 PST by vadim +# Generated Sun Feb 20 20:04:25 2011 PST by vadim # # files: * firewall13.fw /etc/fw/firewall13.fw # @@ -385,7 +385,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:19:46 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:25 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall14.fw.orig b/test/ipt/firewall14.fw.orig index c72cd7c91..caf6b505a 100755 --- a/test/ipt/firewall14.fw.orig +++ b/test/ipt/firewall14.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:19:47 2011 PST by vadim +# Generated Sun Feb 20 20:04:27 2011 PST by vadim # # files: * firewall14.fw /etc/fw/firewall14.fw # @@ -404,7 +404,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:19:47 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:27 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall15.fw.orig b/test/ipt/firewall15.fw.orig index 14c340885..c44af3f77 100755 --- a/test/ipt/firewall15.fw.orig +++ b/test/ipt/firewall15.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:19:49 2011 PST by vadim +# Generated Sun Feb 20 20:04:28 2011 PST by vadim # # files: * firewall15.fw /etc/fw/firewall15.fw # @@ -388,7 +388,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:19:49 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:28 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall16.fw.orig b/test/ipt/firewall16.fw.orig index 403223f1e..a34fdba7c 100755 --- a/test/ipt/firewall16.fw.orig +++ b/test/ipt/firewall16.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:19:50 2011 PST by vadim +# Generated Sun Feb 20 20:04:30 2011 PST by vadim # # files: * firewall16.fw /etc/fw/firewall16.fw # @@ -492,7 +492,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:19:50 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:30 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall17.fw.orig b/test/ipt/firewall17.fw.orig index 5326dd7a7..9927dff96 100755 --- a/test/ipt/firewall17.fw.orig +++ b/test/ipt/firewall17.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:19:52 2011 PST by vadim +# Generated Sun Feb 20 20:04:31 2011 PST by vadim # # files: * firewall17.fw /etc/fw/firewall17.fw # @@ -471,7 +471,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:19:52 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:31 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall18.fw.orig b/test/ipt/firewall18.fw.orig index 0b7e5c526..025ca8462 100755 --- a/test/ipt/firewall18.fw.orig +++ b/test/ipt/firewall18.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:19:53 2011 PST by vadim +# Generated Sun Feb 20 20:04:33 2011 PST by vadim # # files: * firewall18.fw /etc/fw/firewall18.fw # @@ -504,7 +504,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:19:53 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:33 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall19.fw.orig b/test/ipt/firewall19.fw.orig index a6195c035..357e8079c 100755 --- a/test/ipt/firewall19.fw.orig +++ b/test/ipt/firewall19.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:19:55 2011 PST by vadim +# Generated Sun Feb 20 20:04:35 2011 PST by vadim # # files: * firewall19.fw /etc/fw/firewall19.fw # @@ -509,7 +509,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:19:55 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:35 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall2-1.fw.orig b/test/ipt/firewall2-1.fw.orig index 1b16fa009..1e9e96e89 100755 --- a/test/ipt/firewall2-1.fw.orig +++ b/test/ipt/firewall2-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:06 2011 PST by vadim +# Generated Sun Feb 20 20:04:45 2011 PST by vadim # # files: * firewall2-1.fw /etc/fw/firewall2-1.fw # @@ -1420,7 +1420,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:06 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:45 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall2-2.fw.orig b/test/ipt/firewall2-2.fw.orig index 52e2e2e0e..63d38ff0e 100755 --- a/test/ipt/firewall2-2.fw.orig +++ b/test/ipt/firewall2-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:10 2011 PST by vadim +# Generated Sun Feb 20 20:04:49 2011 PST by vadim # # files: * firewall2-2.fw /etc/fw/firewall2-2.fw # @@ -1249,7 +1249,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:10 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:49 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall2-3.fw.orig b/test/ipt/firewall2-3.fw.orig index ce885b1a5..0671bd76c 100755 --- a/test/ipt/firewall2-3.fw.orig +++ b/test/ipt/firewall2-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:14 2011 PST by vadim +# Generated Sun Feb 20 20:04:53 2011 PST by vadim # # files: * firewall2-3.fw /etc/fw/firewall2-3.fw # @@ -1120,7 +1120,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:14 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:53 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall2-4.fw.orig b/test/ipt/firewall2-4.fw.orig index 3cdf69431..4703e6c7c 100755 --- a/test/ipt/firewall2-4.fw.orig +++ b/test/ipt/firewall2-4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:18 2011 PST by vadim +# Generated Sun Feb 20 20:04:57 2011 PST by vadim # # files: * firewall2-4.fw /etc/fw/firewall2-4.fw # @@ -424,7 +424,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:18 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:57 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall2-5.fw.orig b/test/ipt/firewall2-5.fw.orig index 5613ddbdb..45ebb1718 100755 --- a/test/ipt/firewall2-5.fw.orig +++ b/test/ipt/firewall2-5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:21 2011 PST by vadim +# Generated Sun Feb 20 20:05:00 2011 PST by vadim # # files: * firewall2-5.fw /etc/fw/firewall2-5.fw # @@ -453,7 +453,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:21 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:00 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall2-6.fw.orig b/test/ipt/firewall2-6.fw.orig index 951a15ff8..071f2eaed 100755 --- a/test/ipt/firewall2-6.fw.orig +++ b/test/ipt/firewall2-6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:33:58 2011 PST by vadim +# Generated Sun Feb 20 20:05:04 2011 PST by vadim # # files: * firewall2-6.fw /etc/fw/firewall2-6.fw # @@ -566,7 +566,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:33:58 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:04 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall2-7.fw.orig b/test/ipt/firewall2-7.fw.orig index e055a0c69..f4a2e4595 100755 --- a/test/ipt/firewall2-7.fw.orig +++ b/test/ipt/firewall2-7.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:29 2011 PST by vadim +# Generated Sun Feb 20 20:05:07 2011 PST by vadim # # files: * firewall2-7.fw /etc/fw/firewall2-7.fw # @@ -424,7 +424,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:29 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:07 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall2.fw.orig b/test/ipt/firewall2.fw.orig index 0cc3b84d3..339e5f62e 100755 --- a/test/ipt/firewall2.fw.orig +++ b/test/ipt/firewall2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:19:58 2011 PST by vadim +# Generated Sun Feb 20 20:04:37 2011 PST by vadim # # files: * firewall2.fw /etc/fw/firewall2.fw # @@ -1470,7 +1470,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:19:58 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:37 2011 by vadim" check_tools check_run_time_address_table_files diff --git a/test/ipt/firewall20-ipv6.fw.orig b/test/ipt/firewall20-ipv6.fw.orig index dcc65d281..820bfcc2d 100755 --- a/test/ipt/firewall20-ipv6.fw.orig +++ b/test/ipt/firewall20-ipv6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:01 2011 PST by vadim +# Generated Sun Feb 20 20:04:40 2011 PST by vadim # # files: * firewall20-ipv6.fw /etc/fw/firewall20-ipv6.fw # @@ -456,7 +456,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:01 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:40 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall20.fw.orig b/test/ipt/firewall20.fw.orig index 5fc0c852d..7e2d316ed 100755 --- a/test/ipt/firewall20.fw.orig +++ b/test/ipt/firewall20.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:19:58 2011 PST by vadim +# Generated Sun Feb 20 20:04:38 2011 PST by vadim # # files: * firewall20.fw /etc/fw/firewall20.fw # @@ -674,7 +674,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:19:58 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:38 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall21-1.fw.orig b/test/ipt/firewall21-1.fw.orig index 61063134d..c7b53b7b4 100755 --- a/test/ipt/firewall21-1.fw.orig +++ b/test/ipt/firewall21-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:05 2011 PST by vadim +# Generated Sun Feb 20 20:04:44 2011 PST by vadim # # files: * firewall21-1.fw /etc/fw/firewall21-1.fw # @@ -470,7 +470,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:05 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:44 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall21.fw.orig b/test/ipt/firewall21.fw.orig index a4d09bbff..732914d63 100755 --- a/test/ipt/firewall21.fw.orig +++ b/test/ipt/firewall21.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:02 2011 PST by vadim +# Generated Sun Feb 20 20:04:41 2011 PST by vadim # # files: * firewall21.fw /etc/fw/firewall21.fw # @@ -469,7 +469,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:02 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:41 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall22.fw.orig b/test/ipt/firewall22.fw.orig index 43788ccae..184fef39b 100755 --- a/test/ipt/firewall22.fw.orig +++ b/test/ipt/firewall22.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:09 2011 PST by vadim +# Generated Sun Feb 20 20:04:47 2011 PST by vadim # # files: * firewall22.fw /etc/fw/firewall22.fw # @@ -390,7 +390,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:09 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:47 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall23-1.fw.orig b/test/ipt/firewall23-1.fw.orig index 12b1074d4..41d217a7d 100755 --- a/test/ipt/firewall23-1.fw.orig +++ b/test/ipt/firewall23-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:15 2011 PST by vadim +# Generated Sun Feb 20 20:04:54 2011 PST by vadim # # files: * firewall23-1.fw /etc/fw/firewall23-1.fw # @@ -564,7 +564,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:15 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:54 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall23.fw.orig b/test/ipt/firewall23.fw.orig index 122d81745..d7dfae95e 100755 --- a/test/ipt/firewall23.fw.orig +++ b/test/ipt/firewall23.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:12 2011 PST by vadim +# Generated Sun Feb 20 20:04:51 2011 PST by vadim # # files: * firewall23.fw /etc/fw/firewall23.fw # @@ -476,7 +476,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:12 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:51 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall24.fw.orig b/test/ipt/firewall24.fw.orig index 652db54f1..126939552 100755 --- a/test/ipt/firewall24.fw.orig +++ b/test/ipt/firewall24.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:17 2011 PST by vadim +# Generated Sun Feb 20 20:04:56 2011 PST by vadim # # files: * firewall24.fw /etc/fw/firewall24.fw # @@ -493,7 +493,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:17 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:04:56 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall25.fw.orig b/test/ipt/firewall25.fw.orig index 856089cde..ea8e66045 100755 --- a/test/ipt/firewall25.fw.orig +++ b/test/ipt/firewall25.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:22 2011 PST by vadim +# Generated Sun Feb 20 20:05:00 2011 PST by vadim # # files: * firewall25.fw /etc/fw/firewall25.fw # @@ -687,7 +687,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:22 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:00 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall26.fw.orig b/test/ipt/firewall26.fw.orig index ff58654ec..3aa4a57f8 100755 --- a/test/ipt/firewall26.fw.orig +++ b/test/ipt/firewall26.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:25 2011 PST by vadim +# Generated Sun Feb 20 20:05:03 2011 PST by vadim # # files: * firewall26.fw /etc/fw/firewall26.fw # @@ -562,7 +562,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:25 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:03 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall27.fw.orig b/test/ipt/firewall27.fw.orig index 1847b6f00..b5b5e3cd4 100755 --- a/test/ipt/firewall27.fw.orig +++ b/test/ipt/firewall27.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:28 2011 PST by vadim +# Generated Sun Feb 20 20:05:06 2011 PST by vadim # # files: * firewall27.fw /etc/fw/firewall27.fw # @@ -546,7 +546,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:28 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:06 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall28.fw.orig b/test/ipt/firewall28.fw.orig index 8b7a0cb0c..e76ce2010 100755 --- a/test/ipt/firewall28.fw.orig +++ b/test/ipt/firewall28.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:32 2011 PST by vadim +# Generated Sun Feb 20 20:05:09 2011 PST by vadim # # files: * firewall28.fw /etc/fw/firewall28.fw # @@ -407,7 +407,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:32 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:09 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall29.fw.orig b/test/ipt/firewall29.fw.orig index 4183aa1c5..253c6113a 100755 --- a/test/ipt/firewall29.fw.orig +++ b/test/ipt/firewall29.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:32 2011 PST by vadim +# Generated Sun Feb 20 20:05:10 2011 PST by vadim # # files: * firewall29.fw /etc/fw/firewall29.fw # @@ -440,7 +440,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:32 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:10 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall3.fw.orig b/test/ipt/firewall3.fw.orig index 93e6b5148..803e83d9d 100755 --- a/test/ipt/firewall3.fw.orig +++ b/test/ipt/firewall3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:35 2011 PST by vadim +# Generated Sun Feb 20 20:05:13 2011 PST by vadim # # files: * firewall3.fw /etc/fw/firewall3.fw # @@ -578,7 +578,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:35 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:13 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall30.fw.orig b/test/ipt/firewall30.fw.orig index 326e3ef8f..ac15e81e9 100755 --- a/test/ipt/firewall30.fw.orig +++ b/test/ipt/firewall30.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:35 2011 PST by vadim +# Generated Sun Feb 20 20:05:13 2011 PST by vadim # # files: * firewall30.fw /etc/fw/firewall30.fw # @@ -375,7 +375,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:35 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:13 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall31.fw.orig b/test/ipt/firewall31.fw.orig index b38145d46..817ea5892 100755 --- a/test/ipt/firewall31.fw.orig +++ b/test/ipt/firewall31.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:38 2011 PST by vadim +# Generated Sun Feb 20 20:05:16 2011 PST by vadim # # files: * firewall31.fw /etc/fw/firewall31.fw # @@ -445,7 +445,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:38 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:16 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall32.fw.orig b/test/ipt/firewall32.fw.orig index e04f69a75..e3aedeaa5 100755 --- a/test/ipt/firewall32.fw.orig +++ b/test/ipt/firewall32.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:39 2011 PST by vadim +# Generated Sun Feb 20 20:05:17 2011 PST by vadim # # files: * firewall32.fw /etc/fw/firewall32.fw # @@ -416,7 +416,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:39 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:17 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall33-1.fw.orig b/test/ipt/firewall33-1.fw.orig index 9f60f95fc..c84aa1b7c 100755 --- a/test/ipt/firewall33-1.fw.orig +++ b/test/ipt/firewall33-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:54 2011 PST by vadim +# Generated Sun Feb 20 20:05:31 2011 PST by vadim # # files: * firewall33-1.fw /etc/fw/firewall33-1.fw # @@ -522,7 +522,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:54 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:31 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall33.fw.orig b/test/ipt/firewall33.fw.orig index 9630eada3..1fc0d22ba 100755 --- a/test/ipt/firewall33.fw.orig +++ b/test/ipt/firewall33.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:53 2011 PST by vadim +# Generated Sun Feb 20 20:05:31 2011 PST by vadim # # files: * firewall33.fw /etc/fw/firewall33.fw # @@ -571,7 +571,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:53 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:31 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall34.fw.orig b/test/ipt/firewall34.fw.orig index 4323b96df..cfa112fdf 100755 --- a/test/ipt/firewall34.fw.orig +++ b/test/ipt/firewall34.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:57 2011 PST by vadim +# Generated Sun Feb 20 20:05:35 2011 PST by vadim # # files: * firewall34.fw /etc/fw/firewall34.fw # @@ -648,7 +648,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:57 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:35 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall35.fw.orig b/test/ipt/firewall35.fw.orig index f15716b30..e0a46b992 100755 --- a/test/ipt/firewall35.fw.orig +++ b/test/ipt/firewall35.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:20:58 2011 PST by vadim +# Generated Sun Feb 20 20:05:35 2011 PST by vadim # # files: * firewall35.fw /etc/fw/firewall35.fw # @@ -540,7 +540,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:20:58 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:35 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall36-1.fw.orig b/test/ipt/firewall36-1.fw.orig index d4d9f8e7f..f3996f208 100755 --- a/test/ipt/firewall36-1.fw.orig +++ b/test/ipt/firewall36-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:01 2011 PST by vadim +# Generated Sun Feb 20 20:05:39 2011 PST by vadim # # files: * firewall36-1.fw /etc/firewall36-1.fw # @@ -433,7 +433,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:01 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:39 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall36-2.fw.orig b/test/ipt/firewall36-2.fw.orig index 491f50313..16cf33893 100755 --- a/test/ipt/firewall36-2.fw.orig +++ b/test/ipt/firewall36-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:04 2011 PST by vadim +# Generated Sun Feb 20 20:05:41 2011 PST by vadim # # files: * firewall36-2.fw /etc/firewall36-2.fw # @@ -433,7 +433,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:04 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:41 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall36.fw.orig b/test/ipt/firewall36.fw.orig index 1609a3632..13e0dbd24 100755 --- a/test/ipt/firewall36.fw.orig +++ b/test/ipt/firewall36.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:01 2011 PST by vadim +# Generated Sun Feb 20 20:05:38 2011 PST by vadim # # files: * firewall36.fw /etc/firewall36.fw # @@ -535,7 +535,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:01 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:38 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall37-1.fw.orig b/test/ipt/firewall37-1.fw.orig index 04b13bef9..ff2cbfa09 100755 --- a/test/ipt/firewall37-1.fw.orig +++ b/test/ipt/firewall37-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:08 2011 PST by vadim +# Generated Sun Feb 20 20:05:45 2011 PST by vadim # # files: * firewall37-1.fw /etc/fw/firewall37-1.fw # @@ -769,7 +769,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:08 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:45 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall37.fw.orig b/test/ipt/firewall37.fw.orig index eda6a7bda..fa8fce0d6 100755 --- a/test/ipt/firewall37.fw.orig +++ b/test/ipt/firewall37.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:16 2011 PST by vadim +# Generated Sun Feb 20 20:05:54 2011 PST by vadim # # files: * firewall37.fw /etc/fw/firewall37.fw # @@ -1049,7 +1049,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:16 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:54 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall38.fw.orig b/test/ipt/firewall38.fw.orig index 9d191f85f..2e42083dd 100755 --- a/test/ipt/firewall38.fw.orig +++ b/test/ipt/firewall38.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:10 2011 PST by vadim +# Generated Sun Feb 20 20:05:47 2011 PST by vadim # # files: * firewall38.fw /etc/fw/firewall38.fw # @@ -498,7 +498,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:10 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:47 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall39.fw.orig b/test/ipt/firewall39.fw.orig index b94dfeb3b..2e499c54f 100755 --- a/test/ipt/firewall39.fw.orig +++ b/test/ipt/firewall39.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:21 2011 PST by vadim +# Generated Sun Feb 20 20:05:55 2011 PST by vadim # # files: * firewall39.fw /etc/fw/firewall39.fw # @@ -14,7 +14,8 @@ # normal script mode (not using iptables-restore) - +# firewall39:Policy:14: warning: Rule branches to rule set rule6_branch which branches back to it, creating a loop +# firewall39:rule6_branch:0: warning: Rule branches to rule set Policy which branches back to it, creating a loop FWBDEBUG="" @@ -624,6 +625,16 @@ script_body() { $IPTABLES -A rule4_branch -i eth0 -j In_rule4_branch_1 $IPTABLES -A In_rule4_branch_1 -j LOG --log-level info --log-prefix "RULE 1 -- BRANCH " $IPTABLES -A In_rule4_branch_1 -j rule_4_1_branch + # ================ Table 'filter', rule set rule6_branch + # + # Rule rule6_branch 0 (global) + # + echo "Rule rule6_branch 0 (global)" + # + # firewall39:rule6_branch:0: warning: Rule branches to rule set Policy which branches back to it, creating a loop + $IPTABLES -N rule6_branch + $IPTABLES -N Policy + $IPTABLES -A rule6_branch -j Policy # ================ Table 'filter', rule set Policy # # Rule 0 (global) @@ -797,30 +808,42 @@ script_body() { # echo "Rule 14 (global)" # - $IPTABLES -A INPUT -s 192.168.1.0/24 -j TCPMSS --set-mss 1400 - $IPTABLES -A OUTPUT -s 192.168.1.0/24 -j TCPMSS --set-mss 1400 - $IPTABLES -A FORWARD -s 192.168.1.0/24 -j TCPMSS --set-mss 1400 + # testing loop in branching rules + # firewall39:Policy:14: warning: Rule branches to rule set rule6_branch which branches back to it, creating a loop + $IPTABLES -A INPUT -s 192.168.1.0/24 -j rule6_branch + # firewall39:Policy:14: warning: Rule branches to rule set rule6_branch which branches back to it, creating a loop + $IPTABLES -A OUTPUT -s 192.168.1.0/24 -j rule6_branch + # firewall39:Policy:14: warning: Rule branches to rule set rule6_branch which branches back to it, creating a loop + $IPTABLES -A FORWARD -s 192.168.1.0/24 -j rule6_branch # # Rule 15 (global) # echo "Rule 15 (global)" # - $IPTABLES -N RULE_15 - $IPTABLES -A INPUT -s 222.222.222.0/24 -j RULE_15 - $IPTABLES -A FORWARD -s 222.222.222.0/24 -j RULE_15 - $IPTABLES -A RULE_15 -j LOG --log-level info --log-prefix "RULE 15 -- CUSTOM " - $IPTABLES -A RULE_15 -j TARPIT + $IPTABLES -A INPUT -s 192.168.1.0/24 -j TCPMSS --set-mss 1400 + $IPTABLES -A OUTPUT -s 192.168.1.0/24 -j TCPMSS --set-mss 1400 + $IPTABLES -A FORWARD -s 192.168.1.0/24 -j TCPMSS --set-mss 1400 # # Rule 16 (global) # echo "Rule 16 (global)" # $IPTABLES -N RULE_16 - $IPTABLES -A OUTPUT -j RULE_16 - $IPTABLES -A INPUT -j RULE_16 - $IPTABLES -A FORWARD -j RULE_16 - $IPTABLES -A RULE_16 -j LOG --log-level info --log-prefix "RULE 16 -- DENY " - $IPTABLES -A RULE_16 -j DROP + $IPTABLES -A INPUT -s 222.222.222.0/24 -j RULE_16 + $IPTABLES -A FORWARD -s 222.222.222.0/24 -j RULE_16 + $IPTABLES -A RULE_16 -j LOG --log-level info --log-prefix "RULE 16 -- CUSTOM " + $IPTABLES -A RULE_16 -j TARPIT + # + # Rule 17 (global) + # + echo "Rule 17 (global)" + # + $IPTABLES -N RULE_17 + $IPTABLES -A OUTPUT -j RULE_17 + $IPTABLES -A INPUT -j RULE_17 + $IPTABLES -A FORWARD -j RULE_17 + $IPTABLES -A RULE_17 -j LOG --log-level info --log-prefix "RULE 17 -- DENY " + $IPTABLES -A RULE_17 -j DROP } ip_forward() { @@ -876,7 +899,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:21 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:55 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall4.fw.orig b/test/ipt/firewall4.fw.orig index 0d669c7a5..72573c495 100755 --- a/test/ipt/firewall4.fw.orig +++ b/test/ipt/firewall4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:20 2011 PST by vadim +# Generated Sun Feb 20 20:05:57 2011 PST by vadim # # files: * firewall4.fw /etc/fw/firewall4.fw # @@ -710,7 +710,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:20 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:57 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall40-1.fw.orig b/test/ipt/firewall40-1.fw.orig index 6a7dbdce2..3ecbf931a 100755 --- a/test/ipt/firewall40-1.fw.orig +++ b/test/ipt/firewall40-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:25 2011 PST by vadim +# Generated Sun Feb 20 20:06:01 2011 PST by vadim # # files: * firewall40-1.fw /etc/firewall40-1.fw # @@ -450,7 +450,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:25 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:01 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall40-2.fw.orig b/test/ipt/firewall40-2.fw.orig index da8d7c707..b2186d61c 100755 --- a/test/ipt/firewall40-2.fw.orig +++ b/test/ipt/firewall40-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:26 2011 PST by vadim +# Generated Sun Feb 20 20:06:01 2011 PST by vadim # # files: * firewall40-2.fw /etc/firewall40-2.fw # @@ -437,7 +437,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:26 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:01 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall40.fw.orig b/test/ipt/firewall40.fw.orig index ba3d2f3b5..ad5b612d1 100755 --- a/test/ipt/firewall40.fw.orig +++ b/test/ipt/firewall40.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:23 2011 PST by vadim +# Generated Sun Feb 20 20:05:58 2011 PST by vadim # # files: * firewall40.fw /etc/firewall40.fw # @@ -439,7 +439,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:23 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:05:58 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall41-1.fw.orig b/test/ipt/firewall41-1.fw.orig index 1bf9a5603..9d6916e51 100755 --- a/test/ipt/firewall41-1.fw.orig +++ b/test/ipt/firewall41-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:29 2011 PST by vadim +# Generated Sun Feb 20 20:06:04 2011 PST by vadim # # files: * firewall41-1.fw /etc/firewall41-1.fw # @@ -575,7 +575,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:29 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:04 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall41.fw.orig b/test/ipt/firewall41.fw.orig index 2974bf224..de52717f5 100755 --- a/test/ipt/firewall41.fw.orig +++ b/test/ipt/firewall41.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:33 2011 PST by vadim +# Generated Sun Feb 20 20:06:09 2011 PST by vadim # # files: * firewall41.fw /etc/firewall41.fw # @@ -456,7 +456,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:33 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:09 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall42.fw.orig b/test/ipt/firewall42.fw.orig index 71694b2a9..91889d796 100755 --- a/test/ipt/firewall42.fw.orig +++ b/test/ipt/firewall42.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:35 2011 PST by vadim +# Generated Sun Feb 20 20:06:10 2011 PST by vadim # # files: * firewall42.fw /etc/fw/firewall42.fw # @@ -382,7 +382,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:35 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:10 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall5.fw.orig b/test/ipt/firewall5.fw.orig index 6c7be0604..73589983d 100755 --- a/test/ipt/firewall5.fw.orig +++ b/test/ipt/firewall5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:36 2011 PST by vadim +# Generated Sun Feb 20 20:06:12 2011 PST by vadim # # files: * firewall5.fw /etc/fw/firewall5.fw # @@ -622,7 +622,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:36 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:12 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall50.fw.orig b/test/ipt/firewall50.fw.orig index 579515ff9..9ba0530b4 100755 --- a/test/ipt/firewall50.fw.orig +++ b/test/ipt/firewall50.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:39 2011 PST by vadim +# Generated Sun Feb 20 20:06:14 2011 PST by vadim # # files: * firewall50.fw /etc/fw/firewall50.fw # @@ -407,7 +407,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:39 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:14 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall51.fw.orig b/test/ipt/firewall51.fw.orig index d6034e004..d049bcda8 100755 --- a/test/ipt/firewall51.fw.orig +++ b/test/ipt/firewall51.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:42 2011 PST by vadim +# Generated Sun Feb 20 20:06:18 2011 PST by vadim # # files: * firewall51.fw /etc/fw/firewall51.fw # @@ -491,7 +491,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:42 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:18 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall6.fw.orig b/test/ipt/firewall6.fw.orig index cb0ad0500..eb1c3bfc3 100755 --- a/test/ipt/firewall6.fw.orig +++ b/test/ipt/firewall6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:42 2011 PST by vadim +# Generated Sun Feb 20 20:06:17 2011 PST by vadim # # files: * firewall6.fw /etc/fw/firewall6.fw # @@ -513,7 +513,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:42 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:17 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall60.fw.orig b/test/ipt/firewall60.fw.orig index bc1b84d25..751d84c18 100755 --- a/test/ipt/firewall60.fw.orig +++ b/test/ipt/firewall60.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:45 2011 PST by vadim +# Generated Sun Feb 20 20:06:20 2011 PST by vadim # # files: * firewall60.fw /etc/firewall60.fw # @@ -419,7 +419,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:45 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:20 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall61-1.2.5.fw.orig b/test/ipt/firewall61-1.2.5.fw.orig index 4c7a1848c..f179068bf 100755 --- a/test/ipt/firewall61-1.2.5.fw.orig +++ b/test/ipt/firewall61-1.2.5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:47 2011 PST by vadim +# Generated Sun Feb 20 20:06:22 2011 PST by vadim # # files: * firewall61-1.2.5.fw /etc/firewall61-1.2.5.fw # @@ -499,7 +499,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:47 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:22 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall61-1.2.6.fw.orig b/test/ipt/firewall61-1.2.6.fw.orig index 365005ad4..e888abb59 100755 --- a/test/ipt/firewall61-1.2.6.fw.orig +++ b/test/ipt/firewall61-1.2.6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:50 2011 PST by vadim +# Generated Sun Feb 20 20:06:25 2011 PST by vadim # # files: * firewall61-1.2.6.fw /etc/firewall61-1.2.6.fw # @@ -505,7 +505,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:50 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:25 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall61-1.3.x.fw.orig b/test/ipt/firewall61-1.3.x.fw.orig index cdc8b6b1f..ff92645e3 100755 --- a/test/ipt/firewall61-1.3.x.fw.orig +++ b/test/ipt/firewall61-1.3.x.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:51 2011 PST by vadim +# Generated Sun Feb 20 20:06:26 2011 PST by vadim # # files: * firewall61-1.3.x.fw /etc/firewall61-1.3.x.fw # @@ -492,7 +492,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:51 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:26 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall61-1.4.fw.orig b/test/ipt/firewall61-1.4.fw.orig index ab5bf0b24..825f771ef 100755 --- a/test/ipt/firewall61-1.4.fw.orig +++ b/test/ipt/firewall61-1.4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:54 2011 PST by vadim +# Generated Sun Feb 20 20:06:29 2011 PST by vadim # # files: * firewall61-1.4.fw /etc/firewall61-1.4.fw # @@ -493,7 +493,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:54 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:29 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall62.fw.orig b/test/ipt/firewall62.fw.orig index 5fbebe8f9..c40c66ae6 100755 --- a/test/ipt/firewall62.fw.orig +++ b/test/ipt/firewall62.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:54 2011 PST by vadim +# Generated Sun Feb 20 20:06:29 2011 PST by vadim # # files: * firewall62.fw /etc/firewall62.fw # @@ -543,7 +543,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:54 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:29 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall63.fw.orig b/test/ipt/firewall63.fw.orig index cdfff709e..be1226b85 100755 --- a/test/ipt/firewall63.fw.orig +++ b/test/ipt/firewall63.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:58 2011 PST by vadim +# Generated Sun Feb 20 20:06:32 2011 PST by vadim # # files: * firewall63.fw /etc/firewall63.fw # @@ -389,7 +389,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:58 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:32 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall7.fw.orig b/test/ipt/firewall7.fw.orig index 8e7e26a93..146c9ee89 100755 --- a/test/ipt/firewall7.fw.orig +++ b/test/ipt/firewall7.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:58 2011 PST by vadim +# Generated Sun Feb 20 20:06:33 2011 PST by vadim # # files: * firewall7.fw /etc/fw/firewall7.fw # @@ -473,7 +473,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:21:58 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:33 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall70.fw.orig b/test/ipt/firewall70.fw.orig index 6b8d884a1..39332c44e 100755 --- a/test/ipt/firewall70.fw.orig +++ b/test/ipt/firewall70.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:03 2011 PST by vadim +# Generated Sun Feb 20 20:06:37 2011 PST by vadim # # files: * firewall70.fw iptables.sh # @@ -412,7 +412,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:03 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:37 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall71.fw.orig b/test/ipt/firewall71.fw.orig index 50c2ecd65..b1f1178b9 100755 --- a/test/ipt/firewall71.fw.orig +++ b/test/ipt/firewall71.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:03 2011 PST by vadim +# Generated Sun Feb 20 20:06:37 2011 PST by vadim # # files: * firewall71.fw /etc/fw/firewall71.fw # @@ -428,7 +428,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:03 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:37 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall72-1.3.x.fw.orig b/test/ipt/firewall72-1.3.x.fw.orig index abeaedf07..328e05b70 100755 --- a/test/ipt/firewall72-1.3.x.fw.orig +++ b/test/ipt/firewall72-1.3.x.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:06 2011 PST by vadim +# Generated Sun Feb 20 20:06:40 2011 PST by vadim # # files: * firewall72-1.3.x.fw /etc/fw/firewall72-1.3.x.fw # @@ -555,7 +555,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:06 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:40 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall72-1.4.3.fw.orig b/test/ipt/firewall72-1.4.3.fw.orig index f68ab5248..7abd397eb 100755 --- a/test/ipt/firewall72-1.4.3.fw.orig +++ b/test/ipt/firewall72-1.4.3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:06 2011 PST by vadim +# Generated Sun Feb 20 20:06:41 2011 PST by vadim # # files: * firewall72-1.4.3.fw /etc/fw/firewall72-1.4.3.fw # @@ -555,7 +555,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:06 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:41 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall73.fw.orig b/test/ipt/firewall73.fw.orig index 6be84cf02..86ce610ba 100755 --- a/test/ipt/firewall73.fw.orig +++ b/test/ipt/firewall73.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:10 2011 PST by vadim +# Generated Sun Feb 20 20:06:43 2011 PST by vadim # # files: * firewall73.fw /etc/fw/firewall73.fw # @@ -523,7 +523,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:10 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:43 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall74.fw.orig b/test/ipt/firewall74.fw.orig index 6085f5e6f..39628ec6f 100755 --- a/test/ipt/firewall74.fw.orig +++ b/test/ipt/firewall74.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:10 2011 PST by vadim +# Generated Sun Feb 20 20:06:44 2011 PST by vadim # # files: * firewall74.fw /etc/fw/firewall74.fw # @@ -375,7 +375,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:10 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:44 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall8.fw.orig b/test/ipt/firewall8.fw.orig index 99464d685..5ef436c7a 100755 --- a/test/ipt/firewall8.fw.orig +++ b/test/ipt/firewall8.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:13 2011 PST by vadim +# Generated Sun Feb 20 20:06:47 2011 PST by vadim # # files: * firewall8.fw /etc/fw/firewall8.fw # @@ -358,7 +358,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:13 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:47 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall80.fw.orig b/test/ipt/firewall80.fw.orig index 59a199349..6f8428201 100755 --- a/test/ipt/firewall80.fw.orig +++ b/test/ipt/firewall80.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:14 2011 PST by vadim +# Generated Sun Feb 20 20:06:48 2011 PST by vadim # # files: * firewall80.fw /etc/fw/firewall80.fw # @@ -399,7 +399,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:14 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:48 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall81.fw.orig b/test/ipt/firewall81.fw.orig index b09db3124..4f52470a3 100755 --- a/test/ipt/firewall81.fw.orig +++ b/test/ipt/firewall81.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:18 2011 PST by vadim +# Generated Sun Feb 20 20:06:51 2011 PST by vadim # # files: * firewall81.fw /etc/fw/firewall81.fw # @@ -419,7 +419,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:18 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:51 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall82.fw.orig b/test/ipt/firewall82.fw.orig index 2645a702f..ec22ff533 100755 --- a/test/ipt/firewall82.fw.orig +++ b/test/ipt/firewall82.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:18 2011 PST by vadim +# Generated Sun Feb 20 20:06:52 2011 PST by vadim # # files: * firewall82.fw /etc/firewall82.fw # @@ -13,7 +13,7 @@ # This firewall has two interfaces. Eth0 faces outside and has a dynamic address; eth1 faces inside. # Policy includes basic rules to permit unrestricted outbound access and anti-spoofing rules. Access to the firewall is permitted only from internal network and only using SSH. The firewall uses one of the machines on internal network for DNS. Internal network is configured with address 192.168.1.0/255.255.255.0 -# firewall82:Policy:0: warning: Rule set Policy of firewall firewall82 has branching rule that loops back to it +# firewall82:Policy:0: warning: Rule branches to rule set Policy_A which branches back to it, creating a loop FWBDEBUG="" @@ -353,11 +353,11 @@ script_body() { # echo "Rule 0 (global)" # - # firewall82:Policy:0: warning: Rule set Policy of firewall firewall82 has branching rule that loops back to it + # firewall82:Policy:0: warning: Rule branches to rule set Policy_A which branches back to it, creating a loop $IPTABLES -A OUTPUT -j Policy_A - # firewall82:Policy:0: warning: Rule set Policy of firewall firewall82 has branching rule that loops back to it + # firewall82:Policy:0: warning: Rule branches to rule set Policy_A which branches back to it, creating a loop $IPTABLES -A INPUT -j Policy_A - # firewall82:Policy:0: warning: Rule set Policy of firewall firewall82 has branching rule that loops back to it + # firewall82:Policy:0: warning: Rule branches to rule set Policy_A which branches back to it, creating a loop $IPTABLES -A FORWARD -j Policy_A } @@ -414,7 +414,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:18 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:52 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall82_A.fw.orig b/test/ipt/firewall82_A.fw.orig index 271da34ef..28f706a72 100755 --- a/test/ipt/firewall82_A.fw.orig +++ b/test/ipt/firewall82_A.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:22 2011 PST by vadim +# Generated Sun Feb 20 20:06:55 2011 PST by vadim # # files: * firewall82_A.fw /etc/fw/firewall82_A.fw # @@ -12,9 +12,9 @@ # # this object is used to hold branch rulesets for firewall82 -# firewall82_A:Policy_A:1: warning: Rule set Policy_A of firewall firewall82_A has branching rule that loops back to it -# firewall82_A:Policy_A:1: warning: Rule set Policy_A of firewall firewall82_A has branching rule that loops back to it -# firewall82_A:Policy_A:2: warning: Rule set Policy_A of firewall firewall82_A has branching rule that loops back to it +# firewall82_A:Policy_A:1: warning: Rule branches to rule set Policy_A which branches back to it, creating a loop +# firewall82_A:Policy_A:1: warning: Rule branches to rule set Policy which branches back to it, creating a loop +# firewall82_A:Policy_A:2: warning: Rule branches to rule set Policy_A which branches back to it, creating a loop FWBDEBUG="" @@ -334,22 +334,22 @@ script_body() { echo "Rule Policy_A 1 (global)" # # recursive branching - # firewall82_A:Policy_A:1: warning: Rule set Policy_A of firewall firewall82_A has branching rule that loops back to it + # firewall82_A:Policy_A:1: warning: Rule branches to rule set Policy which branches back to it, creating a loop $IPTABLES -A OUTPUT -j Policy - # firewall82_A:Policy_A:1: warning: Rule set Policy_A of firewall firewall82_A has branching rule that loops back to it + # firewall82_A:Policy_A:1: warning: Rule branches to rule set Policy which branches back to it, creating a loop $IPTABLES -A INPUT -j Policy - # firewall82_A:Policy_A:1: warning: Rule set Policy_A of firewall firewall82_A has branching rule that loops back to it + # firewall82_A:Policy_A:1: warning: Rule branches to rule set Policy which branches back to it, creating a loop $IPTABLES -A FORWARD -j Policy # # Rule Policy_A 2 (global) # echo "Rule Policy_A 2 (global)" # - # firewall82_A:Policy_A:2: warning: Rule set Policy_A of firewall firewall82_A has branching rule that loops back to it + # firewall82_A:Policy_A:2: warning: Rule branches to rule set Policy_A which branches back to it, creating a loop $IPTABLES -A OUTPUT -j Policy_A - # firewall82_A:Policy_A:2: warning: Rule set Policy_A of firewall firewall82_A has branching rule that loops back to it + # firewall82_A:Policy_A:2: warning: Rule branches to rule set Policy_A which branches back to it, creating a loop $IPTABLES -A INPUT -j Policy_A - # firewall82_A:Policy_A:2: warning: Rule set Policy_A of firewall firewall82_A has branching rule that loops back to it + # firewall82_A:Policy_A:2: warning: Rule branches to rule set Policy_A which branches back to it, creating a loop $IPTABLES -A FORWARD -j Policy_A } @@ -406,7 +406,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:22 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:55 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall82_B.fw.orig b/test/ipt/firewall82_B.fw.orig index 7223047f4..5cfca2216 100755 --- a/test/ipt/firewall82_B.fw.orig +++ b/test/ipt/firewall82_B.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:21 2011 PST by vadim +# Generated Sun Feb 20 20:06:55 2011 PST by vadim # # files: * firewall82_B.fw /etc/fw/firewall82_B.fw # @@ -363,7 +363,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:21 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:55 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall9.fw.orig b/test/ipt/firewall9.fw.orig index a12e749c1..38c5be7ae 100755 --- a/test/ipt/firewall9.fw.orig +++ b/test/ipt/firewall9.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:24 2011 PST by vadim +# Generated Sun Feb 20 20:06:58 2011 PST by vadim # # files: * firewall9.fw /etc/fw/firewall9.fw # @@ -633,7 +633,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:24 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:58 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall90.fw.orig b/test/ipt/firewall90.fw.orig index e1b3a987e..53b3875ef 100755 --- a/test/ipt/firewall90.fw.orig +++ b/test/ipt/firewall90.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:25 2011 PST by vadim +# Generated Sun Feb 20 20:06:58 2011 PST by vadim # # files: * firewall90.fw /etc/fw/firewall90.fw # @@ -383,7 +383,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:25 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:58 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall91.fw.orig b/test/ipt/firewall91.fw.orig index 089c27b74..13a0599a1 100755 --- a/test/ipt/firewall91.fw.orig +++ b/test/ipt/firewall91.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:28 2011 PST by vadim +# Generated Sun Feb 20 20:07:02 2011 PST by vadim # # files: * firewall91.fw /etc/fw/firewall91.fw # @@ -383,7 +383,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:28 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:07:02 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall92.fw.orig b/test/ipt/firewall92.fw.orig index 6390455b3..f7b5fe866 100755 --- a/test/ipt/firewall92.fw.orig +++ b/test/ipt/firewall92.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:29 2011 PST by vadim +# Generated Sun Feb 20 20:07:03 2011 PST by vadim # # files: * firewall92.fw /etc/fw/firewall92.fw # @@ -419,7 +419,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:29 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:07:03 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall93.fw.orig b/test/ipt/firewall93.fw.orig index 91ba2b16d..25991a13f 100755 --- a/test/ipt/firewall93.fw.orig +++ b/test/ipt/firewall93.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:22:31 2011 PST by vadim +# Generated Sun Feb 20 20:07:06 2011 PST by vadim # # files: * firewall93.fw /etc/fw/firewall93.fw # @@ -458,7 +458,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:22:31 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:07:06 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/fw-A.fw.orig b/test/ipt/fw-A.fw.orig index ac87d801d..dad08f444 100755 --- a/test/ipt/fw-A.fw.orig +++ b/test/ipt/fw-A.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:04 2011 PST by vadim +# Generated Sun Feb 20 20:08:38 2011 PST by vadim # # files: * fw-A.fw /sw/FWbuilder/fw-A.fw # @@ -722,7 +722,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:04 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:38 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/fw1.fw.orig b/test/ipt/fw1.fw.orig index c272c1875..70fc7001e 100755 --- a/test/ipt/fw1.fw.orig +++ b/test/ipt/fw1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:01 2011 PST by vadim +# Generated Sun Feb 20 20:08:35 2011 PST by vadim # # files: * fw1.fw /etc/fw1.fw # @@ -519,7 +519,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:01 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:35 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/fwbuilder.fw.orig b/test/ipt/fwbuilder.fw.orig index 9cd9ab6fb..86fa44b27 100755 --- a/test/ipt/fwbuilder.fw.orig +++ b/test/ipt/fwbuilder.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:21:32 2011 PST by vadim +# Generated Sun Feb 20 20:06:07 2011 PST by vadim # # files: * fwbuilder.fw /etc/init.d/fwbuilder.fw # @@ -483,7 +483,7 @@ status_action() { } start() { - log "Activating firewall script generated Sun Feb 20 17:21:32 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:06:07 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/heartbeat_cluster_1_d_linux-1-d.fw.orig b/test/ipt/heartbeat_cluster_1_d_linux-1-d.fw.orig index 428414280..831927b7d 100755 --- a/test/ipt/heartbeat_cluster_1_d_linux-1-d.fw.orig +++ b/test/ipt/heartbeat_cluster_1_d_linux-1-d.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:16 2011 PST by vadim +# Generated Sun Feb 20 20:08:51 2011 PST by vadim # # files: * heartbeat_cluster_1_d_linux-1-d.fw firewall.sh # @@ -720,7 +720,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:16 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:51 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/heartbeat_cluster_1_d_linux-2-d.fw.orig b/test/ipt/heartbeat_cluster_1_d_linux-2-d.fw.orig index 6430f8eb5..428767172 100755 --- a/test/ipt/heartbeat_cluster_1_d_linux-2-d.fw.orig +++ b/test/ipt/heartbeat_cluster_1_d_linux-2-d.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:17 2011 PST by vadim +# Generated Sun Feb 20 20:08:51 2011 PST by vadim # # files: * heartbeat_cluster_1_d_linux-2-d.fw firewall.sh # @@ -723,7 +723,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:17 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:51 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/heartbeat_cluster_1_linux-1.fw.orig b/test/ipt/heartbeat_cluster_1_linux-1.fw.orig index 257648ad6..77f53ae50 100755 --- a/test/ipt/heartbeat_cluster_1_linux-1.fw.orig +++ b/test/ipt/heartbeat_cluster_1_linux-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:15 2011 PST by vadim +# Generated Sun Feb 20 20:08:50 2011 PST by vadim # # files: * heartbeat_cluster_1_linux-1.fw /etc/heartbeat_cluster_1_linux-1.fw # @@ -843,7 +843,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:15 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:50 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/heartbeat_cluster_1_linux-2.fw.orig b/test/ipt/heartbeat_cluster_1_linux-2.fw.orig index 6efafac50..149f86a0e 100755 --- a/test/ipt/heartbeat_cluster_1_linux-2.fw.orig +++ b/test/ipt/heartbeat_cluster_1_linux-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:16 2011 PST by vadim +# Generated Sun Feb 20 20:08:50 2011 PST by vadim # # files: * heartbeat_cluster_1_linux-2.fw /etc/heartbeat_cluster_1_linux-2.fw # @@ -741,7 +741,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:16 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:50 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/heartbeat_cluster_2_linux-1.fw.orig b/test/ipt/heartbeat_cluster_2_linux-1.fw.orig index 67124f581..540176938 100755 --- a/test/ipt/heartbeat_cluster_2_linux-1.fw.orig +++ b/test/ipt/heartbeat_cluster_2_linux-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:17 2011 PST by vadim +# Generated Sun Feb 20 20:08:52 2011 PST by vadim # # files: * heartbeat_cluster_2_linux-1.fw /etc/heartbeat_cluster_2_linux-1.fw # @@ -707,7 +707,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:17 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:52 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/heartbeat_cluster_2_linux-2.fw.orig b/test/ipt/heartbeat_cluster_2_linux-2.fw.orig index 8bb3146f0..781f0cf8c 100755 --- a/test/ipt/heartbeat_cluster_2_linux-2.fw.orig +++ b/test/ipt/heartbeat_cluster_2_linux-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:18 2011 PST by vadim +# Generated Sun Feb 20 20:08:52 2011 PST by vadim # # files: * heartbeat_cluster_2_linux-2.fw /etc/heartbeat_cluster_2_linux-2.fw # @@ -620,7 +620,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:18 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:52 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/host.fw.orig b/test/ipt/host.fw.orig index 0f53fab62..8c021eb13 100755 --- a/test/ipt/host.fw.orig +++ b/test/ipt/host.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:04 2011 PST by vadim +# Generated Sun Feb 20 20:08:38 2011 PST by vadim # # files: * host.fw /etc/fw/host.fw # @@ -422,7 +422,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:04 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:38 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/objects-for-regression-tests.fwb b/test/ipt/objects-for-regression-tests.fwb index 3905e9420..a8aee1f3e 100644 --- a/test/ipt/objects-for-regression-tests.fwb +++ b/test/ipt/objects-for-regression-tests.fwb @@ -1,6 +1,6 @@ - + @@ -3887,6 +3887,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -29623,7 +29647,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT% - + @@ -30181,7 +30205,65 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT% - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30208,7 +30290,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT% - + @@ -30249,7 +30331,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT% - + @@ -30517,9 +30599,6 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT% - - - @@ -30632,26 +30711,56 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT% - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/ipt/openais_cluster_1_linux-1.fw.orig b/test/ipt/openais_cluster_1_linux-1.fw.orig index a1c5aac59..e35ca9ed6 100755 --- a/test/ipt/openais_cluster_1_linux-1.fw.orig +++ b/test/ipt/openais_cluster_1_linux-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:18 2011 PST by vadim +# Generated Sun Feb 20 20:08:53 2011 PST by vadim # # files: * openais_cluster_1_linux-1.fw /etc/openais_cluster_1_linux-1.fw # @@ -707,7 +707,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:18 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:53 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/openais_cluster_1_linux-2.fw.orig b/test/ipt/openais_cluster_1_linux-2.fw.orig index 05d403c3c..11646daf6 100755 --- a/test/ipt/openais_cluster_1_linux-2.fw.orig +++ b/test/ipt/openais_cluster_1_linux-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:19 2011 PST by vadim +# Generated Sun Feb 20 20:08:53 2011 PST by vadim # # files: * openais_cluster_1_linux-2.fw /etc/openais_cluster_1_linux-2.fw # @@ -611,7 +611,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:19 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:53 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/rc.firewall.local b/test/ipt/rc.firewall.local index 5b1e09fa3..711ff2144 100755 --- a/test/ipt/rc.firewall.local +++ b/test/ipt/rc.firewall.local @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 18:08:08 2011 PST by vadim +# Generated Sun Feb 20 20:08:42 2011 PST by vadim # # files: * rc.firewall.local /etc/rc.d//rc.firewall.local # diff --git a/test/ipt/rh90.fw.orig b/test/ipt/rh90.fw.orig index 30b2a6c14..3ec6acef6 100755 --- a/test/ipt/rh90.fw.orig +++ b/test/ipt/rh90.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:08 2011 PST by vadim +# Generated Sun Feb 20 20:08:42 2011 PST by vadim # # files: * rh90.fw /etc/rh90.fw # @@ -421,7 +421,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:08 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:42 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/secuwall_cluster_1_secuwall-1.fw.orig b/test/ipt/secuwall_cluster_1_secuwall-1.fw.orig index 29e5967af..5ffd41794 100755 --- a/test/ipt/secuwall_cluster_1_secuwall-1.fw.orig +++ b/test/ipt/secuwall_cluster_1_secuwall-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:18 2011 PST by vadim +# Generated Sun Feb 20 20:08:53 2011 PST by vadim # # files: * secuwall_cluster_1_secuwall-1.fw /etc/secuwall_cluster_1_secuwall-1.fw # @@ -405,7 +405,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:18 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:53 2011 by vadim" log "Database was cluster-tests.fwb" check_tools check_run_time_address_table_files diff --git a/test/ipt/server-cluster-1_server-1.fw.orig b/test/ipt/server-cluster-1_server-1.fw.orig index ee45bf0df..78d0da443 100755 --- a/test/ipt/server-cluster-1_server-1.fw.orig +++ b/test/ipt/server-cluster-1_server-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:19 2011 PST by vadim +# Generated Sun Feb 20 20:08:53 2011 PST by vadim # # files: * server-cluster-1_server-1.fw /etc/fw/server-cluster-1_server-1.fw # @@ -398,7 +398,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:19 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:53 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/server-cluster-1_server-2.fw.orig b/test/ipt/server-cluster-1_server-2.fw.orig index dc9d23e9c..13c1122b0 100755 --- a/test/ipt/server-cluster-1_server-2.fw.orig +++ b/test/ipt/server-cluster-1_server-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:19 2011 PST by vadim +# Generated Sun Feb 20 20:08:54 2011 PST by vadim # # files: * server-cluster-1_server-2.fw /etc/fw/server-cluster-1_server-2.fw # @@ -397,7 +397,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:19 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:54 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/test-shadowing-1.fw.orig b/test/ipt/test-shadowing-1.fw.orig index 2c93bba39..843ea98fe 100755 --- a/test/ipt/test-shadowing-1.fw.orig +++ b/test/ipt/test-shadowing-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:11 2011 PST by vadim +# Generated Sun Feb 20 20:08:46 2011 PST by vadim # # files: * test-shadowing-1.fw /etc/test-shadowing-1.fw # @@ -461,7 +461,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:11 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:46 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/test-shadowing-2.fw.orig b/test/ipt/test-shadowing-2.fw.orig index ae2eb3f32..8ca858464 100755 --- a/test/ipt/test-shadowing-2.fw.orig +++ b/test/ipt/test-shadowing-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:14 2011 PST by vadim +# Generated Sun Feb 20 20:08:49 2011 PST by vadim # # files: * test-shadowing-2.fw /etc/test-shadowing-2.fw # @@ -423,7 +423,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:14 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:49 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/test-shadowing-3.fw.orig b/test/ipt/test-shadowing-3.fw.orig index 990eec325..c38e50f24 100755 --- a/test/ipt/test-shadowing-3.fw.orig +++ b/test/ipt/test-shadowing-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:18 2011 PST by vadim +# Generated Sun Feb 20 20:08:52 2011 PST by vadim # # files: * test-shadowing-3.fw /etc/test-shadowing-3.fw # @@ -474,7 +474,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:18 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:52 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/test_fw.fw.orig b/test/ipt/test_fw.fw.orig index 5863c546e..e54f35815 100755 --- a/test/ipt/test_fw.fw.orig +++ b/test/ipt/test_fw.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:12 2011 PST by vadim +# Generated Sun Feb 20 20:08:47 2011 PST by vadim # # files: * test_fw.fw /etc/test_fw.fw # @@ -570,7 +570,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:12 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:47 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/vrrp_cluster_1_linux-1.fw.orig b/test/ipt/vrrp_cluster_1_linux-1.fw.orig index 56923b2a5..20062a71b 100755 --- a/test/ipt/vrrp_cluster_1_linux-1.fw.orig +++ b/test/ipt/vrrp_cluster_1_linux-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:19 2011 PST by vadim +# Generated Sun Feb 20 20:08:54 2011 PST by vadim # # files: * vrrp_cluster_1_linux-1.fw /etc/vrrp_cluster_1_linux-1.fw # @@ -710,7 +710,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:19 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:54 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/vrrp_cluster_1_linux-2.fw.orig b/test/ipt/vrrp_cluster_1_linux-2.fw.orig index 2f07aa96f..a2e281377 100755 --- a/test/ipt/vrrp_cluster_1_linux-2.fw.orig +++ b/test/ipt/vrrp_cluster_1_linux-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:20 2011 PST by vadim +# Generated Sun Feb 20 20:08:54 2011 PST by vadim # # files: * vrrp_cluster_1_linux-2.fw /etc/vrrp_cluster_1_linux-2.fw # @@ -615,7 +615,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:20 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:54 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/vrrp_cluster_2_linux-1.fw.orig b/test/ipt/vrrp_cluster_2_linux-1.fw.orig index d7df0873f..c17ca73a8 100755 --- a/test/ipt/vrrp_cluster_2_linux-1.fw.orig +++ b/test/ipt/vrrp_cluster_2_linux-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:19 2011 PST by vadim +# Generated Sun Feb 20 20:08:54 2011 PST by vadim # # files: * vrrp_cluster_2_linux-1.fw /etc/vrrp_cluster_2_linux-1.fw # @@ -642,7 +642,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:19 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:54 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/vrrp_cluster_2_linux-2.fw.orig b/test/ipt/vrrp_cluster_2_linux-2.fw.orig index a1084d1a1..6e3f5de4d 100755 --- a/test/ipt/vrrp_cluster_2_linux-2.fw.orig +++ b/test/ipt/vrrp_cluster_2_linux-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:20 2011 PST by vadim +# Generated Sun Feb 20 20:08:55 2011 PST by vadim # # files: * vrrp_cluster_2_linux-2.fw /etc/vrrp_cluster_2_linux-2.fw # @@ -547,7 +547,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:20 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:55 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/vrrp_cluster_2_linux-3.fw.orig b/test/ipt/vrrp_cluster_2_linux-3.fw.orig index 69d1e604d..7e4ffd5f5 100755 --- a/test/ipt/vrrp_cluster_2_linux-3.fw.orig +++ b/test/ipt/vrrp_cluster_2_linux-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v4.2.0.3483 # -# Generated Sun Feb 20 17:24:20 2011 PST by vadim +# Generated Sun Feb 20 20:08:55 2011 PST by vadim # # files: * vrrp_cluster_2_linux-3.fw /etc/vrrp_cluster_2_linux-3.fw # @@ -523,7 +523,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Sun Feb 20 17:24:20 2011 by vadim" + log "Activating firewall script generated Sun Feb 20 20:08:55 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/pf/firewall-base-rulesets.fw.orig b/test/pf/firewall-base-rulesets.fw.orig index fb00975b5..18d3a94d7 100755 --- a/test/pf/firewall-base-rulesets.fw.orig +++ b/test/pf/firewall-base-rulesets.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:32:02 2011 PST by vadim +# Generated Sun Feb 20 20:10:18 2011 PST by vadim # # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw # files: firewall-base-rulesets.conf /etc/fw/firewall-base-rulesets.conf @@ -163,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "en2 192.168.100.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:32:02 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:18 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-1.fw.orig b/test/pf/firewall-ipv6-1.fw.orig index 7c8e3ba25..aba371477 100755 --- a/test/pf/firewall-ipv6-1.fw.orig +++ b/test/pf/firewall-ipv6-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:32:02 2011 PST by vadim +# Generated Sun Feb 20 20:10:18 2011 PST by vadim # # files: * firewall-ipv6-1.fw pf-ipv6.fw # files: firewall-ipv6-1.conf /etc/fw/pf-ipv6.conf @@ -175,7 +175,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sat Feb 19 15:32:02 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:18 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-2.fw.orig b/test/pf/firewall-ipv6-2.fw.orig index e960e923d..4a1930bb2 100755 --- a/test/pf/firewall-ipv6-2.fw.orig +++ b/test/pf/firewall-ipv6-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:32:03 2011 PST by vadim +# Generated Sun Feb 20 20:10:19 2011 PST by vadim # # files: * firewall-ipv6-2.fw pf.fw # files: firewall-ipv6-2.conf pf.conf @@ -179,7 +179,7 @@ configure_interfaces() { update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sat Feb 19 15:32:03 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:19 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall-ipv6-3.fw.orig b/test/pf/firewall-ipv6-3.fw.orig index 9ddb12bbf..b4116acde 100755 --- a/test/pf/firewall-ipv6-3.fw.orig +++ b/test/pf/firewall-ipv6-3.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:32:03 2011 PST by vadim +# Generated Sun Feb 20 20:10:19 2011 PST by vadim # # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw # files: firewall-ipv6-3.conf /etc/firewall-ipv6-3.conf diff --git a/test/pf/firewall.fw.orig b/test/pf/firewall.fw.orig index 775d2e6cd..2d36f9164 100755 --- a/test/pf/firewall.fw.orig +++ b/test/pf/firewall.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:26 2011 PST by vadim +# Generated Sun Feb 20 20:09:41 2011 PST by vadim # # files: * firewall.fw /etc/pf.fw # files: firewall.conf /etc/pf.conf @@ -167,7 +167,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sat Feb 19 15:31:26 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:41 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall1.fw.orig b/test/pf/firewall1.fw.orig index 461b0b954..1213d55d3 100755 --- a/test/pf/firewall1.fw.orig +++ b/test/pf/firewall1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:26 2011 PST by vadim +# Generated Sun Feb 20 20:09:41 2011 PST by vadim # # files: * firewall1.fw /etc/fw/firewall1.fw # files: firewall1.conf /etc/fw/firewall1.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:26 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:41 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-1.fw.orig b/test/pf/firewall10-1.fw.orig index 86dbd9eaf..ca29e9f40 100755 --- a/test/pf/firewall10-1.fw.orig +++ b/test/pf/firewall10-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:28 2011 PST by vadim +# Generated Sun Feb 20 20:09:43 2011 PST by vadim # # files: * firewall10-1.fw /etc/fw/firewall10-1.fw # files: firewall10-1.conf /etc/fw/firewall10-1.conf @@ -74,7 +74,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:28 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:43 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-2.fw.orig b/test/pf/firewall10-2.fw.orig index 6293fe5cf..7785bde07 100755 --- a/test/pf/firewall10-2.fw.orig +++ b/test/pf/firewall10-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:29 2011 PST by vadim +# Generated Sun Feb 20 20:09:44 2011 PST by vadim # # files: * firewall10-2.fw /etc/fw/firewall10-2.fw # files: firewall10-2.conf /etc/fw/firewall10-2.conf @@ -74,7 +74,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:29 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:44 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-3.fw.orig b/test/pf/firewall10-3.fw.orig index ecab15460..39d1d7dce 100755 --- a/test/pf/firewall10-3.fw.orig +++ b/test/pf/firewall10-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:30 2011 PST by vadim +# Generated Sun Feb 20 20:09:46 2011 PST by vadim # # files: * firewall10-3.fw /etc/fw/firewall10-3.fw # files: firewall10-3.conf /etc/fw/firewall10-3.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:30 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-4.fw.orig b/test/pf/firewall10-4.fw.orig index 0d23e6484..8e97d890a 100755 --- a/test/pf/firewall10-4.fw.orig +++ b/test/pf/firewall10-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:33 2011 PST by vadim +# Generated Sun Feb 20 20:09:48 2011 PST by vadim # # files: * firewall10-4.fw /etc/fw/firewall10-4.fw # files: firewall10-4.conf /etc/fw/firewall10-4.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:33 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:48 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-5.fw.orig b/test/pf/firewall10-5.fw.orig index a6ab72027..2d61edc87 100755 --- a/test/pf/firewall10-5.fw.orig +++ b/test/pf/firewall10-5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:35 2011 PST by vadim +# Generated Sun Feb 20 20:09:50 2011 PST by vadim # # files: * firewall10-5.fw /etc/fw/firewall10-5.fw # files: firewall10-5.conf /etc/fw/firewall10-5.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:35 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:50 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall10-6.fw.orig b/test/pf/firewall10-6.fw.orig index 1f5ae665d..5d26287cd 100755 --- a/test/pf/firewall10-6.fw.orig +++ b/test/pf/firewall10-6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:36 2011 PST by vadim +# Generated Sun Feb 20 20:09:51 2011 PST by vadim # # files: * firewall10-6.fw /etc/fw/firewall10-6.fw # files: firewall10-6.conf /etc/fw/firewall10-6.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:36 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:51 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall100.fw.orig b/test/pf/firewall100.fw.orig index 2bf7418cb..2c0cebf34 100755 --- a/test/pf/firewall100.fw.orig +++ b/test/pf/firewall100.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:27 2011 PST by vadim +# Generated Sun Feb 20 20:09:42 2011 PST by vadim # # files: * firewall100.fw /etc/fw/pf.fw # files: firewall100.conf /etc/fw/path\ with\ space/pf.conf @@ -161,7 +161,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:31:27 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:42 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall101.fw.orig b/test/pf/firewall101.fw.orig index e735ba559..5556ec55a 100755 --- a/test/pf/firewall101.fw.orig +++ b/test/pf/firewall101.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:27 2011 PST by vadim +# Generated Sun Feb 20 20:09:43 2011 PST by vadim # # files: * firewall101.fw /etc/fw/pf.fw # files: firewall101.conf /etc/fw/path\ with\ space/pf.conf @@ -164,7 +164,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:31:27 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:43 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall102.fw.orig b/test/pf/firewall102.fw.orig index af395ead4..f27faf0cc 100755 --- a/test/pf/firewall102.fw.orig +++ b/test/pf/firewall102.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:29 2011 PST by vadim +# Generated Sun Feb 20 20:09:44 2011 PST by vadim # # files: * firewall102.fw /etc/fw/pf.fw # files: firewall102.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall103-1.fw.orig b/test/pf/firewall103-1.fw.orig index c517dd268..7665534f9 100755 --- a/test/pf/firewall103-1.fw.orig +++ b/test/pf/firewall103-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:31 2011 PST by vadim +# Generated Sun Feb 20 20:09:46 2011 PST by vadim # # files: * firewall103-1.fw /etc/fw/pf.fw # files: firewall103-1.conf /etc/fw/path\ with\ space/pf.conf @@ -388,7 +388,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:31:31 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:46 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall103-2.fw.orig b/test/pf/firewall103-2.fw.orig index e86417c68..4473a9ddc 100755 --- a/test/pf/firewall103-2.fw.orig +++ b/test/pf/firewall103-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:32 2011 PST by vadim +# Generated Sun Feb 20 20:09:47 2011 PST by vadim # # files: * firewall103-2.fw /etc/fw/pf.fw # files: firewall103-2.conf /etc/fw/path\ with\ space/pf.conf @@ -388,7 +388,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:31:32 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:47 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall103.fw.orig b/test/pf/firewall103.fw.orig index 11b340896..804e68775 100755 --- a/test/pf/firewall103.fw.orig +++ b/test/pf/firewall103.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:30 2011 PST by vadim +# Generated Sun Feb 20 20:09:45 2011 PST by vadim # # files: * firewall103.fw /etc/fw/pf.fw # files: firewall103.conf /etc/fw/path\ with\ space/pf.conf @@ -391,7 +391,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:31:30 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:45 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall104-1.fw.orig b/test/pf/firewall104-1.fw.orig index 99e92ffd2..2c17b1ace 100755 --- a/test/pf/firewall104-1.fw.orig +++ b/test/pf/firewall104-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:33 2011 PST by vadim +# Generated Sun Feb 20 20:09:49 2011 PST by vadim # # files: * firewall104-1.fw /etc/fw/pf.fw # files: firewall104-1.conf /etc/fw/path\ with\ space/pf.conf @@ -387,7 +387,7 @@ configure_interfaces() { $IFCONFIG bridge0 -stp em3 } -log "Activating firewall script generated Sat Feb 19 15:31:33 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:49 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall104.fw.orig b/test/pf/firewall104.fw.orig index 416179e01..3d7749b67 100755 --- a/test/pf/firewall104.fw.orig +++ b/test/pf/firewall104.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:32 2011 PST by vadim +# Generated Sun Feb 20 20:09:47 2011 PST by vadim # # files: * firewall104.fw /etc/fw/pf.fw # files: firewall104.conf /etc/fw/path\ with\ space/pf.conf @@ -390,7 +390,7 @@ configure_interfaces() { $IFCONFIG bridge0 stp em3 } -log "Activating firewall script generated Sat Feb 19 15:31:32 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:47 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall105.fw.orig b/test/pf/firewall105.fw.orig index ecebc9db2..115ec3693 100755 --- a/test/pf/firewall105.fw.orig +++ b/test/pf/firewall105.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:34 2011 PST by vadim +# Generated Sun Feb 20 20:09:49 2011 PST by vadim # # files: * firewall105.fw /etc/fw/pf.fw # files: firewall105.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall106.fw.orig b/test/pf/firewall106.fw.orig index bc509f929..fcebb3766 100755 --- a/test/pf/firewall106.fw.orig +++ b/test/pf/firewall106.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:35 2011 PST by vadim +# Generated Sun Feb 20 20:09:50 2011 PST by vadim # # files: * firewall106.fw /etc/fw/pf.fw # files: firewall106.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall107.fw.orig b/test/pf/firewall107.fw.orig index b968cfb68..4b8d7aa66 100755 --- a/test/pf/firewall107.fw.orig +++ b/test/pf/firewall107.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:36 2011 PST by vadim +# Generated Sun Feb 20 20:09:51 2011 PST by vadim # # files: * firewall107.fw /etc/fw/pf.fw # files: firewall107.conf /etc/fw/path\ with\ space/pf.conf @@ -389,7 +389,7 @@ configure_interfaces() { update_addresses_of_interface "vlan102 192.168.102.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:31:36 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:51 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall108.fw.orig b/test/pf/firewall108.fw.orig index d35e5bb77..98d723112 100755 --- a/test/pf/firewall108.fw.orig +++ b/test/pf/firewall108.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:37 2011 PST by vadim +# Generated Sun Feb 20 20:09:52 2011 PST by vadim # # files: * firewall108.fw /etc/fw/pf.fw # files: firewall108.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall109-1.fw.orig b/test/pf/firewall109-1.fw.orig index 87ac615af..30369b085 100755 --- a/test/pf/firewall109-1.fw.orig +++ b/test/pf/firewall109-1.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:38 2011 PST by vadim +# Generated Sun Feb 20 20:09:53 2011 PST by vadim # # files: * firewall109-1.fw /etc/fw/pf.fw # files: firewall109-1.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall109-2.fw.orig b/test/pf/firewall109-2.fw.orig index 853d9a861..0a4437e6e 100755 --- a/test/pf/firewall109-2.fw.orig +++ b/test/pf/firewall109-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:39 2011 PST by vadim +# Generated Sun Feb 20 20:09:54 2011 PST by vadim # # files: * firewall109-2.fw /etc/fw/pf.fw # files: firewall109-2.conf /etc/fw/path\ with\ space/pf.conf @@ -394,7 +394,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:31:39 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:54 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall109-3.fw.orig b/test/pf/firewall109-3.fw.orig index 997b97b36..e73094ed0 100755 --- a/test/pf/firewall109-3.fw.orig +++ b/test/pf/firewall109-3.fw.orig @@ -1,9 +1,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:39 2011 PST by vadim +# Generated Sun Feb 20 20:09:55 2011 PST by vadim # # files: * firewall109-3.fw /etc/fw/pf.fw # files: firewall109-3.conf /etc/fw/path\ with\ space/pf.conf diff --git a/test/pf/firewall109.fw.orig b/test/pf/firewall109.fw.orig index 5ce14238e..b0c4bf90e 100755 --- a/test/pf/firewall109.fw.orig +++ b/test/pf/firewall109.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:37 2011 PST by vadim +# Generated Sun Feb 20 20:09:53 2011 PST by vadim # # files: * firewall109.fw /etc/fw/pf.fw # files: firewall109.conf /etc/fw/path\ with\ space/pf.conf @@ -395,7 +395,7 @@ configure_interfaces() { update_addresses_of_interface "bridge0 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:31:37 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:53 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall11.fw.orig b/test/pf/firewall11.fw.orig index fe89416fa..3d002199b 100755 --- a/test/pf/firewall11.fw.orig +++ b/test/pf/firewall11.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:40 2011 PST by vadim +# Generated Sun Feb 20 20:09:55 2011 PST by vadim # # files: * firewall11.fw /etc/firewall11.fw # files: firewall11.conf /etc/firewall11.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:40 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:55 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall110.fw.orig b/test/pf/firewall110.fw.orig index 3acadca4e..622b84e87 100755 --- a/test/pf/firewall110.fw.orig +++ b/test/pf/firewall110.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:40 2011 PST by vadim +# Generated Sun Feb 20 20:09:56 2011 PST by vadim # # files: * firewall110.fw /etc/fw/firewall110.fw # files: firewall110.conf /etc/fw/firewall110.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:40 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:56 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall12.fw.orig b/test/pf/firewall12.fw.orig index eb1cb38b9..d8674888b 100755 --- a/test/pf/firewall12.fw.orig +++ b/test/pf/firewall12.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:41 2011 PST by vadim +# Generated Sun Feb 20 20:09:56 2011 PST by vadim # # files: * firewall12.fw /etc/fw/firewall12.fw # files: firewall12.conf /etc/fw/firewall12.conf @@ -159,7 +159,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sat Feb 19 15:31:41 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:56 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall13.fw.orig b/test/pf/firewall13.fw.orig index c16427870..b536a7e34 100755 --- a/test/pf/firewall13.fw.orig +++ b/test/pf/firewall13.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:42 2011 PST by vadim +# Generated Sun Feb 20 20:09:57 2011 PST by vadim # # files: * firewall13.fw /etc/fw/firewall13.fw # files: firewall13.conf /etc/fw/firewall13.conf @@ -88,7 +88,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:42 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:57 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14-1.fw.orig b/test/pf/firewall14-1.fw.orig index 42b7c12e1..4a653fb68 100755 --- a/test/pf/firewall14-1.fw.orig +++ b/test/pf/firewall14-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:43 2011 PST by vadim +# Generated Sun Feb 20 20:09:58 2011 PST by vadim # # files: * firewall14-1.fw /etc/firewall14-1.fw # files: firewall14-1.conf /etc/firewall14-1.conf @@ -242,7 +242,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:31:43 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:58 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall14.fw.orig b/test/pf/firewall14.fw.orig index f67020548..b0885cb92 100755 --- a/test/pf/firewall14.fw.orig +++ b/test/pf/firewall14.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:42 2011 PST by vadim +# Generated Sun Feb 20 20:09:57 2011 PST by vadim # # files: * firewall14.fw /etc/firewall14.fw # files: firewall14.conf /etc/firewall14.conf @@ -242,7 +242,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:31:42 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:57 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2-1.fw.orig b/test/pf/firewall2-1.fw.orig index d9fa3c2b4..b8ec1b8ed 100755 --- a/test/pf/firewall2-1.fw.orig +++ b/test/pf/firewall2-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:45 2011 PST by vadim +# Generated Sun Feb 20 20:10:00 2011 PST by vadim # # files: * firewall2-1.fw /etc/fw/firewall2-1.fw # files: firewall2-1.conf /etc/fw/firewall2-1.conf @@ -13,7 +13,7 @@ # # testing different errors in NATCompiler_pf::VerifyRules -# firewall2-1:NAT:17: warning: Rule set NAT of firewall firewall2-1 has branching rule that loops back to it +# firewall2-1:NAT:17: warning: Rule branches to rule set NAT which branches back to it, creating a loop # firewall2-1:NAT:1: error: Negation in original service is not supported. # firewall2-1:NAT:2: error: Can not translate 'any' into a specific service. @@ -88,7 +88,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:45 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:00 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2-6.fw.orig b/test/pf/firewall2-6.fw.orig index 7cd2d0211..d554bf506 100755 --- a/test/pf/firewall2-6.fw.orig +++ b/test/pf/firewall2-6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:46 2011 PST by vadim +# Generated Sun Feb 20 20:10:02 2011 PST by vadim # # files: * firewall2-6.fw /etc/firewall2-6.fw # files: firewall2-6.conf /etc/firewall2-6.conf @@ -164,7 +164,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sat Feb 19 15:31:46 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:02 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall2.fw.orig b/test/pf/firewall2.fw.orig index 2c5e7834a..74a0e260a 100755 --- a/test/pf/firewall2.fw.orig +++ b/test/pf/firewall2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:43 2011 PST by vadim +# Generated Sun Feb 20 20:09:59 2011 PST by vadim # # files: * firewall2.fw /etc/fw/firewall2.fw # files: firewall2.conf /etc/fw/firewall2.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:43 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall20.fw.orig b/test/pf/firewall20.fw.orig index 41ccb02fa..25ce72497 100755 --- a/test/pf/firewall20.fw.orig +++ b/test/pf/firewall20.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:44 2011 PST by vadim +# Generated Sun Feb 20 20:09:59 2011 PST by vadim # # files: * firewall20.fw /etc/fw/firewall20.fw # files: firewall20.conf /etc/fw/firewall20.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:44 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:09:59 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall21.fw.orig b/test/pf/firewall21.fw.orig index 61e309f47..bb7eba335 100755 --- a/test/pf/firewall21.fw.orig +++ b/test/pf/firewall21.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:45 2011 PST by vadim +# Generated Sun Feb 20 20:10:00 2011 PST by vadim # # files: * firewall21.fw /etc/fw/firewall21.fw # files: firewall21.conf /etc/fw/firewall21.conf @@ -81,7 +81,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:45 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:00 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall22.fw.orig b/test/pf/firewall22.fw.orig index 5c8a9c591..3082e4552 100755 --- a/test/pf/firewall22.fw.orig +++ b/test/pf/firewall22.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:46 2011 PST by vadim +# Generated Sun Feb 20 20:10:01 2011 PST by vadim # # files: * firewall22.fw /etc/fw/firewall22.fw # files: firewall22.conf /etc/fw/firewall22.conf @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:46 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:01 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall3.fw.orig b/test/pf/firewall3.fw.orig index ab345139c..260eaca54 100755 --- a/test/pf/firewall3.fw.orig +++ b/test/pf/firewall3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:47 2011 PST by vadim +# Generated Sun Feb 20 20:10:03 2011 PST by vadim # # files: * firewall3.fw /etc/firewall3.fw # files: firewall3.conf /etc/firewall3.conf @@ -159,7 +159,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sat Feb 19 15:31:47 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall33.fw.orig b/test/pf/firewall33.fw.orig index eece85283..ed96210b7 100755 --- a/test/pf/firewall33.fw.orig +++ b/test/pf/firewall33.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:48 2011 PST by vadim +# Generated Sun Feb 20 20:10:03 2011 PST by vadim # # files: * firewall33.fw /etc/fw/firewall33.fw # files: firewall33.conf /etc/fw/firewall33.conf @@ -162,7 +162,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sat Feb 19 15:31:48 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:03 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall34.fw.orig b/test/pf/firewall34.fw.orig index 4e28d741b..738ede56d 100755 --- a/test/pf/firewall34.fw.orig +++ b/test/pf/firewall34.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:48 2011 PST by vadim +# Generated Sun Feb 20 20:10:04 2011 PST by vadim # # files: * firewall34.fw /etc/fw/firewall34.fw # files: firewall34.conf /etc/fw/firewall34.conf @@ -158,7 +158,7 @@ configure_interfaces() { update_addresses_of_interface "lo 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sat Feb 19 15:31:48 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:04 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall38.fw.orig b/test/pf/firewall38.fw.orig index 6472cfcf3..3abfd94ab 100755 --- a/test/pf/firewall38.fw.orig +++ b/test/pf/firewall38.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:49 2011 PST by vadim +# Generated Sun Feb 20 20:10:04 2011 PST by vadim # # files: * firewall38.fw /etc/fw/firewall38.fw # files: firewall38.conf /etc/fw/firewall38.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:49 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:04 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall39.fw.orig b/test/pf/firewall39.fw.orig index 5cf0f1ff2..bf5d6cc53 100755 --- a/test/pf/firewall39.fw.orig +++ b/test/pf/firewall39.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:50 2011 PST by vadim +# Generated Sun Feb 20 20:10:06 2011 PST by vadim # # files: * firewall39.fw pf.fw # files: firewall39.conf pf.conf @@ -79,7 +79,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:50 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall4.fw.orig b/test/pf/firewall4.fw.orig index 89408c139..8d86ae824 100755 --- a/test/pf/firewall4.fw.orig +++ b/test/pf/firewall4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:50 2011 PST by vadim +# Generated Sun Feb 20 20:10:06 2011 PST by vadim # # files: * firewall4.fw pf.fw # files: firewall4.conf /etc/fw/pf.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:50 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:06 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40-1.fw.orig b/test/pf/firewall40-1.fw.orig index af6655b05..dcb94bc15 100755 --- a/test/pf/firewall40-1.fw.orig +++ b/test/pf/firewall40-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:51 2011 PST by vadim +# Generated Sun Feb 20 20:10:08 2011 PST by vadim # # files: * firewall40-1.fw /etc/firewall40-1.fw # files: firewall40-1.conf /etc/firewall40-1.conf @@ -176,7 +176,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sat Feb 19 15:31:51 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:08 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall40.fw.orig b/test/pf/firewall40.fw.orig index f21ff3051..059bb344b 100755 --- a/test/pf/firewall40.fw.orig +++ b/test/pf/firewall40.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:51 2011 PST by vadim +# Generated Sun Feb 20 20:10:07 2011 PST by vadim # # files: * firewall40.fw /etc/firewall40.fw # files: firewall40.conf /etc/firewall40.conf @@ -160,7 +160,7 @@ configure_interfaces() { update_addresses_of_interface "lo0 127.0.0.1/0xff000000" "" } -log "Activating firewall script generated Sat Feb 19 15:31:51 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:07 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall41.fw.orig b/test/pf/firewall41.fw.orig index 1be4a0386..b832dcf17 100755 --- a/test/pf/firewall41.fw.orig +++ b/test/pf/firewall41.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:52 2011 PST by vadim +# Generated Sun Feb 20 20:10:08 2011 PST by vadim # # files: * firewall41.fw /etc/firewall41.fw # files: firewall41.conf /etc/firewall41.conf @@ -163,7 +163,7 @@ configure_interfaces() { update_addresses_of_interface "eth1 2.2.2.2/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:31:52 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:08 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall5.fw.orig b/test/pf/firewall5.fw.orig index dbd3e7f89..466e3c4de 100755 --- a/test/pf/firewall5.fw.orig +++ b/test/pf/firewall5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:53 2011 PST by vadim +# Generated Sun Feb 20 20:10:09 2011 PST by vadim # # files: * firewall5.fw /etc/fw/firewall5.fw # files: firewall5.conf /etc/fw/firewall5.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:53 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:09 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall51.fw.orig b/test/pf/firewall51.fw.orig index ea3438ae2..7f4a36bfb 100755 --- a/test/pf/firewall51.fw.orig +++ b/test/pf/firewall51.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:54 2011 PST by vadim +# Generated Sun Feb 20 20:10:10 2011 PST by vadim # # files: * firewall51.fw /etc/fw/firewall51.fw # files: firewall51.conf /etc/fw/firewall51.conf @@ -80,7 +80,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:54 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:10 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall6.fw.orig b/test/pf/firewall6.fw.orig index 30db52e7a..c6090a31f 100755 --- a/test/pf/firewall6.fw.orig +++ b/test/pf/firewall6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:54 2011 PST by vadim +# Generated Sun Feb 20 20:10:10 2011 PST by vadim # # files: * firewall6.fw /etc/fw/firewall6.fw # files: firewall6.conf /etc/fw/firewall6.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:54 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:10 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall62.fw.orig b/test/pf/firewall62.fw.orig index 739e5feb3..f5c616e25 100755 --- a/test/pf/firewall62.fw.orig +++ b/test/pf/firewall62.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:55 2011 PST by vadim +# Generated Sun Feb 20 20:10:11 2011 PST by vadim # # files: * firewall62.fw /etc/firewall62.fw # files: firewall62.conf /etc/firewall62.conf @@ -185,7 +185,7 @@ configure_interfaces() { update_addresses_of_interface "en1 222.222.222.222/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:31:55 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:11 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall63.fw.orig b/test/pf/firewall63.fw.orig index 7f51adaf0..37abc92a6 100755 --- a/test/pf/firewall63.fw.orig +++ b/test/pf/firewall63.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:55 2011 PST by vadim +# Generated Sun Feb 20 20:10:11 2011 PST by vadim # # files: * firewall63.fw /etc/fw/firewall63.fw # files: firewall63.conf /etc/fw/firewall63.conf @@ -77,7 +77,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:55 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:11 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall7.fw.orig b/test/pf/firewall7.fw.orig index a97b7af4d..e161eb003 100755 --- a/test/pf/firewall7.fw.orig +++ b/test/pf/firewall7.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:56 2011 PST by vadim +# Generated Sun Feb 20 20:10:12 2011 PST by vadim # # files: * firewall7.fw /etc/fw/firewall7.fw # files: firewall7.conf /etc/fw/firewall7.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:56 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:12 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall70.fw.orig b/test/pf/firewall70.fw.orig index 8fc78ec9a..e133f390a 100755 --- a/test/pf/firewall70.fw.orig +++ b/test/pf/firewall70.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:57 2011 PST by vadim +# Generated Sun Feb 20 20:10:13 2011 PST by vadim # # files: * firewall70.fw /etc/fw/firewall70.fw # files: firewall70.conf /etc/fw/firewall70.conf @@ -82,7 +82,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:57 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:13 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall8.fw.orig b/test/pf/firewall8.fw.orig index b8a56d61e..2e40ba2de 100755 --- a/test/pf/firewall8.fw.orig +++ b/test/pf/firewall8.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:58 2011 PST by vadim +# Generated Sun Feb 20 20:10:14 2011 PST by vadim # # files: * firewall8.fw /etc/firewall8.fw # files: firewall8.conf /etc/firewall8.conf @@ -72,7 +72,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:58 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:14 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall80-4.5.fw.orig b/test/pf/firewall80-4.5.fw.orig index da11a17e4..7f9d68a6d 100755 --- a/test/pf/firewall80-4.5.fw.orig +++ b/test/pf/firewall80-4.5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:59 2011 PST by vadim +# Generated Sun Feb 20 20:10:15 2011 PST by vadim # # files: * firewall80-4.5.fw /etc/firewall80-4.5.fw # files: firewall80-4.5.conf /etc/firewall80-4.5.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:59 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:15 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall80.fw.orig b/test/pf/firewall80.fw.orig index f29cb40ea..116b6a05b 100755 --- a/test/pf/firewall80.fw.orig +++ b/test/pf/firewall80.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:58 2011 PST by vadim +# Generated Sun Feb 20 20:10:14 2011 PST by vadim # # files: * firewall80.fw /etc/firewall80.fw # files: firewall80.conf /etc/firewall80.conf @@ -73,7 +73,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:58 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:14 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall9.fw.orig b/test/pf/firewall9.fw.orig index b07179b09..7ef62ba01 100755 --- a/test/pf/firewall9.fw.orig +++ b/test/pf/firewall9.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:31:59 2011 PST by vadim +# Generated Sun Feb 20 20:10:15 2011 PST by vadim # # files: * firewall9.fw /etc/fw/firewall9.fw # files: firewall9.conf /etc/fw/firewall9.conf @@ -76,7 +76,7 @@ configure_interfaces() { } -log "Activating firewall script generated Sat Feb 19 15:31:59 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:15 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall91.fw.orig b/test/pf/firewall91.fw.orig index 07976047b..2c546d8c3 100755 --- a/test/pf/firewall91.fw.orig +++ b/test/pf/firewall91.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:32:00 2011 PST by vadim +# Generated Sun Feb 20 20:10:16 2011 PST by vadim # # files: * firewall91.fw /etc/fw/pf.fw # files: firewall91.conf /etc/fw/pf.conf @@ -241,7 +241,7 @@ configure_interfaces() { update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:32:00 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:16 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/firewall92.fw.orig b/test/pf/firewall92.fw.orig index cc7d14690..0d4b63569 100755 --- a/test/pf/firewall92.fw.orig +++ b/test/pf/firewall92.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:32:00 2011 PST by vadim +# Generated Sun Feb 20 20:10:16 2011 PST by vadim # # files: * firewall92.fw /etc/fw/pf.fw # files: firewall92.conf /etc/fw/path\ with\ space/pf.conf @@ -160,7 +160,7 @@ configure_interfaces() { update_addresses_of_interface "em1 10.1.1.81/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:32:00 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:16 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_1_openbsd-1.fw.orig b/test/pf/pf_cluster_1_openbsd-1.fw.orig index 3877660be..d90ce01cd 100755 --- a/test/pf/pf_cluster_1_openbsd-1.fw.orig +++ b/test/pf/pf_cluster_1_openbsd-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:32:03 2011 PST by vadim +# Generated Sun Feb 20 20:10:20 2011 PST by vadim # # files: * pf_cluster_1_openbsd-1.fw /etc/pf_cluster_1_openbsd-1.fw # files: pf_cluster_1_openbsd-1.conf /etc/pf_cluster_1_openbsd-1.conf @@ -293,7 +293,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:32:03 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:20 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_1_openbsd-2.fw.orig b/test/pf/pf_cluster_1_openbsd-2.fw.orig index 42836cbdb..fc9ce9cba 100755 --- a/test/pf/pf_cluster_1_openbsd-2.fw.orig +++ b/test/pf/pf_cluster_1_openbsd-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:32:04 2011 PST by vadim +# Generated Sun Feb 20 20:10:20 2011 PST by vadim # # files: * pf_cluster_1_openbsd-2.fw /etc/pf_cluster_1_openbsd-2.fw # files: pf_cluster_1_openbsd-2.conf /etc/pf_cluster_1_openbsd-2.conf @@ -189,7 +189,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:32:04 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:20 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_2_freebsd-1.fw.orig b/test/pf/pf_cluster_2_freebsd-1.fw.orig index bb83ae8c1..24d328d7e 100755 --- a/test/pf/pf_cluster_2_freebsd-1.fw.orig +++ b/test/pf/pf_cluster_2_freebsd-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:32:04 2011 PST by vadim +# Generated Sun Feb 20 20:10:20 2011 PST by vadim # # files: * pf_cluster_2_freebsd-1.fw /etc/pf_cluster_2_freebsd-1.fw # files: pf_cluster_2_freebsd-1.conf /etc/pf_cluster_2_freebsd-1.conf @@ -295,7 +295,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:32:04 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:20 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_2_freebsd-2.fw.orig b/test/pf/pf_cluster_2_freebsd-2.fw.orig index ba6a88b77..d705e2a9d 100755 --- a/test/pf/pf_cluster_2_freebsd-2.fw.orig +++ b/test/pf/pf_cluster_2_freebsd-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:32:04 2011 PST by vadim +# Generated Sun Feb 20 20:10:20 2011 PST by vadim # # files: * pf_cluster_2_freebsd-2.fw /etc/pf_cluster_2_freebsd-2.fw # files: pf_cluster_2_freebsd-2.conf /etc/pf_cluster_2_freebsd-2.conf @@ -191,7 +191,7 @@ configure_interfaces() { update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:32:04 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:20 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_3_openbsd-3.fw.orig b/test/pf/pf_cluster_3_openbsd-3.fw.orig index 4679cda31..10d617888 100755 --- a/test/pf/pf_cluster_3_openbsd-3.fw.orig +++ b/test/pf/pf_cluster_3_openbsd-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:32:04 2011 PST by vadim +# Generated Sun Feb 20 20:10:20 2011 PST by vadim # # files: * pf_cluster_3_openbsd-3.fw /etc/pf_cluster_3_openbsd-3.fw # files: pf_cluster_3_openbsd-3.conf /etc/pf_cluster_3_openbsd-3.conf @@ -296,7 +296,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:32:04 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:20 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_3_openbsd-4.fw.orig b/test/pf/pf_cluster_3_openbsd-4.fw.orig index cf9581e6a..e6c4c23a0 100755 --- a/test/pf/pf_cluster_3_openbsd-4.fw.orig +++ b/test/pf/pf_cluster_3_openbsd-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:32:04 2011 PST by vadim +# Generated Sun Feb 20 20:10:20 2011 PST by vadim # # files: * pf_cluster_3_openbsd-4.fw /etc/pf_cluster_3_openbsd-4.fw # files: pf_cluster_3_openbsd-4.conf /etc/pf_cluster_3_openbsd-4.conf @@ -193,7 +193,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:32:04 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:20 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_4_rc.conf.local b/test/pf/pf_cluster_4_rc.conf.local index c37dec42d..7686e07f9 100755 --- a/test/pf/pf_cluster_4_rc.conf.local +++ b/test/pf/pf_cluster_4_rc.conf.local @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sun Feb 20 18:09:33 2011 PST by vadim +# Generated Sun Feb 20 20:10:20 2011 PST 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 diff --git a/test/pf/pf_cluster_5_openbsd-3.fw.orig b/test/pf/pf_cluster_5_openbsd-3.fw.orig index 40bd1b629..66c158094 100755 --- a/test/pf/pf_cluster_5_openbsd-3.fw.orig +++ b/test/pf/pf_cluster_5_openbsd-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:32:04 2011 PST by vadim +# Generated Sun Feb 20 20:10:20 2011 PST by vadim # # files: * pf_cluster_5_openbsd-3.fw /etc/pf_cluster_5_openbsd-3.fw # files: pf_cluster_5_openbsd-3.conf /etc/pf_cluster_5_openbsd-3.conf @@ -296,7 +296,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:32:04 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:20 2011 by vadim" set_kernel_vars configure_interfaces diff --git a/test/pf/pf_cluster_5_openbsd-4.fw.orig b/test/pf/pf_cluster_5_openbsd-4.fw.orig index 70c6bc1af..02eb00f21 100755 --- a/test/pf/pf_cluster_5_openbsd-4.fw.orig +++ b/test/pf/pf_cluster_5_openbsd-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_pf v4.2.0.3482 +# Firewall Builder fwb_pf v4.2.0.3483 # -# Generated Sat Feb 19 15:32:04 2011 PST by vadim +# Generated Sun Feb 20 20:10:20 2011 PST by vadim # # files: * pf_cluster_5_openbsd-4.fw /etc/pf_cluster_5_openbsd-4.fw # files: pf_cluster_5_openbsd-4.conf /etc/pf_cluster_5_openbsd-4.conf @@ -193,7 +193,7 @@ configure_interfaces() { update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" "" } -log "Activating firewall script generated Sat Feb 19 15:32:04 2011 by vadim" +log "Activating firewall script generated Sun Feb 20 20:10:20 2011 by vadim" set_kernel_vars configure_interfaces