From c26cadeb6a1b8d70b616e0143b5b9d4dc41ba280 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Mon, 28 Nov 2011 12:27:21 -0800 Subject: [PATCH] more fixes for SF bug #3439613. Adding "-i" / "-o" clause to match parent bridge interface. This allows us to correctly match which bridge the packet comes through in configurations using wildcard bridge port interfaces. For example, when br0 and br1 have "vnet+" bridge port interface, iptables can still correctly match which bridge the packet went through using "-o br0" or "-o br1" clause. This can be useful in installations with many bridged interfaces that get created and destroyed dynamically, e.g. with virtual machines. Note that the "-i br0" / "-o br0" clause is only added when there is more than one bridge interface and bridge port name ends with a wild card symbol "+" --- VERSION | 2 +- VERSION.h | 2 +- doc/ChangeLog | 17 +- packaging/fwbuilder-static-qt.spec | 2 +- packaging/fwbuilder.control | 2 +- packaging/fwbuilder.spec | 2 +- src/iptlib/PolicyCompiler_PrintRule.cpp | 52 +- src/iptlib/PolicyCompiler_ipt.cpp | 14 + src/iptlib/PolicyCompiler_ipt.h | 4 + src/res/help/en_US/release_notes_5.0.1.html | 12 +- test/ipt/cluster1_secuwall-1.fw.orig | 6 +- test/ipt/firewall-base-rulesets.fw.orig | 6 +- test/ipt/firewall-ipv6-1.fw.orig | 6 +- test/ipt/firewall-ipv6-2.fw.orig | 6 +- test/ipt/firewall-ipv6-3.fw.orig | 6 +- test/ipt/firewall-ipv6-4-1.fw.orig | 6 +- test/ipt/firewall-ipv6-4.fw.orig | 6 +- test/ipt/firewall-ipv6-5.fw.orig | 6 +- test/ipt/firewall-ipv6-6.fw.orig | 6 +- test/ipt/firewall-ipv6-7.fw.orig | 6 +- test/ipt/firewall-ipv6-8.fw.orig | 6 +- ...-ipv6-ipt-reset-prolog-after-flush.fw.orig | 6 +- ...-ipt-reset-prolog-after-interfaces.fw.orig | 6 +- ...firewall-ipv6-ipt-reset-prolog-top.fw.orig | 6 +- test/ipt/firewall-ipv6-nd-ns-1.fw.orig | 6 +- test/ipt/firewall-ipv6-nd-ns-2.fw.orig | 6 +- .../firewall-ipv6-prolog-after-flush.fw.orig | 6 +- ...ewall-ipv6-prolog-after-interfaces.fw.orig | 6 +- test/ipt/firewall-ipv6-prolog-top.fw.orig | 6 +- test/ipt/firewall-server-1-s.fw.orig | 6 +- test/ipt/firewall.fw.orig | 6 +- test/ipt/firewall1.fw.orig | 6 +- test/ipt/firewall10.fw.orig | 6 +- test/ipt/firewall11.fw.orig | 6 +- test/ipt/firewall12.fw.orig | 6 +- test/ipt/firewall13.fw.orig | 6 +- test/ipt/firewall14.fw.orig | 6 +- test/ipt/firewall15.fw.orig | 6 +- test/ipt/firewall16.fw.orig | 6 +- test/ipt/firewall17.fw.orig | 6 +- test/ipt/firewall18.fw.orig | 6 +- test/ipt/firewall19.fw.orig | 6 +- test/ipt/firewall2-1.fw.orig | 6 +- test/ipt/firewall2-2.fw.orig | 6 +- test/ipt/firewall2-3.fw.orig | 6 +- test/ipt/firewall2-4.fw.orig | 6 +- test/ipt/firewall2-5.fw.orig | 6 +- test/ipt/firewall2-6.fw.orig | 6 +- test/ipt/firewall2-7.fw.orig | 6 +- test/ipt/firewall2.fw.orig | 6 +- test/ipt/firewall20-ipv6.fw.orig | 6 +- test/ipt/firewall20.fw.orig | 6 +- test/ipt/firewall21-1.fw.orig | 6 +- test/ipt/firewall21.fw.orig | 6 +- test/ipt/firewall22.fw.orig | 6 +- test/ipt/firewall23-1.fw.orig | 6 +- test/ipt/firewall23-2.fw.orig | 462 ++++++++++++++++++ test/ipt/firewall23-3.fw.orig | 448 +++++++++++++++++ test/ipt/firewall23.fw.orig | 6 +- test/ipt/firewall24.fw.orig | 6 +- test/ipt/firewall25.fw.orig | 6 +- test/ipt/firewall26.fw.orig | 6 +- test/ipt/firewall27.fw.orig | 6 +- test/ipt/firewall28.fw.orig | 6 +- test/ipt/firewall29.fw.orig | 6 +- test/ipt/firewall3.fw.orig | 6 +- test/ipt/firewall30.fw.orig | 6 +- test/ipt/firewall31.fw.orig | 6 +- test/ipt/firewall32.fw.orig | 6 +- test/ipt/firewall33-1.fw.orig | 6 +- test/ipt/firewall33.fw.orig | 6 +- test/ipt/firewall34.fw.orig | 6 +- test/ipt/firewall35.fw.orig | 6 +- test/ipt/firewall36-1.fw.orig | 6 +- test/ipt/firewall36-2.fw.orig | 6 +- test/ipt/firewall36.fw.orig | 6 +- test/ipt/firewall37-1.fw.orig | 6 +- test/ipt/firewall37-2.fw.orig | 6 +- test/ipt/firewall37.fw.orig | 6 +- test/ipt/firewall38.fw.orig | 6 +- test/ipt/firewall39.fw.orig | 6 +- test/ipt/firewall4.fw.orig | 6 +- test/ipt/firewall40-1.fw.orig | 6 +- test/ipt/firewall40-2.fw.orig | 6 +- test/ipt/firewall40.fw.orig | 6 +- test/ipt/firewall41-1.fw.orig | 6 +- test/ipt/firewall41.fw.orig | 6 +- test/ipt/firewall42.fw.orig | 6 +- test/ipt/firewall5.fw.orig | 6 +- test/ipt/firewall50.fw.orig | 6 +- test/ipt/firewall51.fw.orig | 6 +- test/ipt/firewall6.fw.orig | 6 +- test/ipt/firewall60.fw.orig | 6 +- test/ipt/firewall61-1.2.5.fw.orig | 6 +- test/ipt/firewall61-1.2.6.fw.orig | 6 +- test/ipt/firewall61-1.3.x.fw.orig | 6 +- test/ipt/firewall61-1.4.fw.orig | 6 +- test/ipt/firewall62.fw.orig | 6 +- test/ipt/firewall63.fw.orig | 6 +- test/ipt/firewall7.fw.orig | 6 +- test/ipt/firewall70.fw.orig | 6 +- test/ipt/firewall71.fw.orig | 6 +- test/ipt/firewall72-1.3.x.fw.orig | 6 +- test/ipt/firewall72-1.4.3.fw.orig | 6 +- test/ipt/firewall73.fw.orig | 6 +- test/ipt/firewall74.fw.orig | 6 +- test/ipt/firewall8.fw.orig | 6 +- test/ipt/firewall80.fw.orig | 6 +- test/ipt/firewall81.fw.orig | 6 +- test/ipt/firewall82.fw.orig | 6 +- test/ipt/firewall82_A.fw.orig | 6 +- test/ipt/firewall82_B.fw.orig | 6 +- test/ipt/firewall9.fw.orig | 6 +- test/ipt/firewall90.fw.orig | 6 +- test/ipt/firewall91.fw.orig | 6 +- test/ipt/firewall92.fw.orig | 6 +- test/ipt/firewall93.fw.orig | 6 +- test/ipt/firewall94.fw.orig | 6 +- test/ipt/firewall95.fw.orig | 6 +- test/ipt/fw-A.fw.orig | 6 +- test/ipt/fw1.fw.orig | 6 +- test/ipt/fwbuilder.fw.orig | 6 +- .../heartbeat_cluster_1_d_linux-1-d.fw.orig | 6 +- .../heartbeat_cluster_1_d_linux-2-d.fw.orig | 6 +- test/ipt/heartbeat_cluster_1_linux-1.fw.orig | 6 +- test/ipt/heartbeat_cluster_1_linux-2.fw.orig | 6 +- test/ipt/heartbeat_cluster_2_linux-1.fw.orig | 6 +- test/ipt/heartbeat_cluster_2_linux-2.fw.orig | 6 +- test/ipt/host.fw.orig | 6 +- test/ipt/objects-for-regression-tests.fwb | 404 ++++++++++++++- test/ipt/openais_cluster_1_linux-1.fw.orig | 6 +- test/ipt/openais_cluster_1_linux-2.fw.orig | 6 +- test/ipt/rc.firewall.local | 4 +- test/ipt/rh90.fw.orig | 6 +- .../ipt/secuwall_cluster_1_secuwall-1.fw.orig | 6 +- test/ipt/server-cluster-1_server-1.fw.orig | 6 +- test/ipt/server-cluster-1_server-2.fw.orig | 6 +- test/ipt/test-shadowing-1.fw.orig | 6 +- test/ipt/test-shadowing-2.fw.orig | 6 +- test/ipt/test-shadowing-3.fw.orig | 6 +- test/ipt/test_fw.fw.orig | 6 +- test/ipt/vrrp_cluster_1_linux-1.fw.orig | 6 +- test/ipt/vrrp_cluster_1_linux-2.fw.orig | 6 +- test/ipt/vrrp_cluster_2_linux-1.fw.orig | 6 +- test/ipt/vrrp_cluster_2_linux-2.fw.orig | 6 +- test/ipt/vrrp_cluster_2_linux-3.fw.orig | 6 +- 146 files changed, 1800 insertions(+), 419 deletions(-) create mode 100755 test/ipt/firewall23-2.fw.orig create mode 100755 test/ipt/firewall23-3.fw.orig diff --git a/VERSION b/VERSION index 513eacceb..87a128d24 100644 --- a/VERSION +++ b/VERSION @@ -7,7 +7,7 @@ FWB_MICRO_VERSION=1 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3589" +BUILD_NUM="3590" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index 454104dbf..69f6fb45f 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "5.0.1.3589" +#define VERSION "5.0.1.3590" #define GENERATION "5.0" diff --git a/doc/ChangeLog b/doc/ChangeLog index 598e396cf..b73b426ee 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,18 @@ +2011-11-28 Vadim Kurland + + * PolicyCompiler_PrintRule.cpp (_printDirectionAndInterface): more + fixes for SF bug #3439613. Adding "-i" / "-o" clause to match + parent bridge interface. This allows us to correctly match which + bridge the packet comes through in configurations using wildcard + bridge port interfaces. For example, when br0 and br1 have "vnet+" + bridge port interface, iptables can still correctly match which + bridge the packet went through using "-o br0" or "-o br1" + clause. This can be useful in installations with many bridged + interfaces that get created and destroyed dynamically, e.g. with + virtual machines. Note that the "-i br0" / "-o br0" clause is only + added when there is more than one bridge interface and bridge + port name ends with a wild card symbol "+" + 2011-11-21 Vadim Kurland * TableFactory.cpp (TableFactory::createTablesForRE): see #2671 @@ -21,7 +36,7 @@ table that exactly reflects configuration user created in the GUI (i.e. includes both ipv4 and ipv6 addresses) and then uses this table in both "inet" and "inet6" rules. - + * PolicyCompiler_pf.cpp (createTables): With this fix, when option "preserve group and addresses table object names" is in effect, compiler for PF will create named tables for the user-defined diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index a9720e09d..e2ad4e83e 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 5.0.1.3589 +%define version 5.0.1.3590 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index ab4b619ee..ca8737c5a 100644 --- a/packaging/fwbuilder.control +++ b/packaging/fwbuilder.control @@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu Priority: extra Section: checkinstall Maintainer: vadim@fwbuilder.org -Version: 5.0.1.3589-1 +Version: 5.0.1.3590-1 Depends: libqt4-gui (>= 4.4.0), libqt4-network (>= 4.4.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Description: Firewall Builder GUI and policy compilers diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec index ac95bfd89..dd072e117 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 5.0.1.3589 +%define version 5.0.1.3590 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/iptlib/PolicyCompiler_PrintRule.cpp b/src/iptlib/PolicyCompiler_PrintRule.cpp index 6bab2af68..6d1859a2b 100644 --- a/src/iptlib/PolicyCompiler_PrintRule.cpp +++ b/src/iptlib/PolicyCompiler_PrintRule.cpp @@ -452,6 +452,7 @@ string PolicyCompiler_ipt::PrintRule::_printMultiport(PolicyRule *rule) string PolicyCompiler_ipt::PrintRule::_printDirectionAndInterface(PolicyRule *rule) { + PolicyCompiler_ipt *ipt_comp = dynamic_cast(compiler); QStringList res; if (rule->getStr(".iface") == "nil") return ""; @@ -467,28 +468,53 @@ string PolicyCompiler_ipt::PrintRule::_printDirectionAndInterface(PolicyRule *ru rule_iface_obj = FWObjectReference::getObject(itfrel->front()); rule_iface = Interface::cast(rule_iface_obj); iface_name = rule_iface_obj->getName().c_str(); - if (iface_name.endsWith("*")) iface_name.replace("*", "+"); if (rule_iface && rule_iface->isBridgePort() && (version.empty() || XMLTools::version_compare(version, "1.3.0")>=0)) { - // http://www.netfilter.org/projects/iptables/files/changes-iptables-1.2.9.txt - // See SF bug #3439613 - // https://sourceforge.net/tracker/index.php?func=detail&aid=3439613&group_id=5314&atid=1129518# - // - // physdev module does not allow --physdev-out for - // non-bridged traffic anymore. We should add - // --physdev-is-bridged to make sure this matches only - // bridged packets. + /* + http://www.netfilter.org/projects/iptables/files/changes-iptables-1.2.9.txt + See SF bug #3439613 + https://sourceforge.net/tracker/index.php?func=detail&aid=3439613&group_id=5314&atid=1129518# + + physdev module does not allow --physdev-out for + non-bridged traffic anymore. We should add + --physdev-is-bridged to make sure this matches only + bridged packets. - if (rule->getDirection()==PolicyRule::Inbound) + Also, adding "-i" / "-o" clause to match parent bridge + interface. This allows us to correctly match which + bridge the packet comes through in configurations using + wildcard bridge port interfaces. For example, when br0 + and br1 have "vnet+" bridge port interface, iptables can + still correctly match which bridge the packet went + through using "-o br0" or "-o br1" clause. This can be + useful in installations with many bridged interfaces + that get created and destroyed dynamically, e.g. with + virtual machines. + + However add "-i br0" / "-o br0" only when there is more + than one bridge interface _and_ bridge port name ends with + a wild card symbol "+" + */ + + QString parent_name = rule_iface->getParent()->getName().c_str(); + + if (rule->getDirection()==PolicyRule::Inbound) + { + if (ipt_comp->bridge_count > 1 && iface_name.endsWith("+")) + res << "-i" << parent_name; res << "-m physdev --physdev-in" << iface_name; + } - if (rule->getDirection()==PolicyRule::Outbound) - res << "-m physdev --physdev-is-bridged --physdev-out" << iface_name; - + if (rule->getDirection()==PolicyRule::Outbound) + { + if (ipt_comp->bridge_count > 1 && iface_name.endsWith("+")) + res << "-o" << parent_name; + res << "-m physdev --physdev-is-bridged --physdev-out" << iface_name; + } } else { if (rule->getDirection()==PolicyRule::Inbound) diff --git a/src/iptlib/PolicyCompiler_ipt.cpp b/src/iptlib/PolicyCompiler_ipt.cpp index 89755fe07..cea015f98 100644 --- a/src/iptlib/PolicyCompiler_ipt.cpp +++ b/src/iptlib/PolicyCompiler_ipt.cpp @@ -480,6 +480,20 @@ int PolicyCompiler_ipt::prolog() actually_used_module_set = false; build_interface_groups(dbcopy, persistent_objects, fw, ipv6, regular_interfaces); + + // count bridge interfaces. We need this later in + // PrintRule::_printDirectionAndInterface + + list l2 = fw->getByTypeDeep(Interface::TYPENAME); + for (list::iterator i=l2.begin(); i!=l2.end(); ++i) + { + Interface *iface = Interface::cast(*i); + assert(iface); + + string interface_type = iface->getOptionsObject()->getStr("type"); + if (interface_type == "bridge") bridge_count++; + } + return n; } diff --git a/src/iptlib/PolicyCompiler_ipt.h b/src/iptlib/PolicyCompiler_ipt.h index 7f1bc7d69..c9b438439 100644 --- a/src/iptlib/PolicyCompiler_ipt.h +++ b/src/iptlib/PolicyCompiler_ipt.h @@ -82,6 +82,9 @@ protected: typedef std::list chain_list; std::map chains; + // number of bridge interfaces (br0 / br1 / etc) + int bridge_count; + // use minus_n_commands map to track creation of chains. // Using external map object for this to be able to track // new chains across different compiler runs (used to process @@ -1006,6 +1009,7 @@ public: have_connmark_in_output = false; my_table = "filter"; minus_n_commands = m_n_commands_map; + bridge_count = 0; } virtual ~PolicyCompiler_ipt(); diff --git a/src/res/help/en_US/release_notes_5.0.1.html b/src/res/help/en_US/release_notes_5.0.1.html index 9be043ab1..ecba1b71b 100644 --- a/src/res/help/en_US/release_notes_5.0.1.html +++ b/src/res/help/en_US/release_notes_5.0.1.html @@ -351,7 +351,17 @@ SF bug #3439613. physdev module does not allow --physdev-out for non-bridged traffic anymore. We should add --physdev-is-bridged to make sure this matches only bridged - packets. + packets. Also adding "-i" / "-o" clause to match parent bridge + interface. This allows us to correctly match which bridge the + packet comes through in configurations using wildcard bridge + port interfaces. For example, when br0 and br1 have "vnet+" + bridge port interface, iptables can still correctly match which + bridge the packet went through using "-o br0" or "-o br1" + clause. This can be useful in installations with many bridged + interfaces that get created and destroyed dynamically, e.g. + with virtual machines. Note that the "-i br0" / "-o br0" clause + is only added when there is more than one bridge interface and + bridge port name ends with a wild card symbol "+" diff --git a/test/ipt/cluster1_secuwall-1.fw.orig b/test/ipt/cluster1_secuwall-1.fw.orig index 8d0ec51d8..4500ca446 100755 --- a/test/ipt/cluster1_secuwall-1.fw.orig +++ b/test/ipt/cluster1_secuwall-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:21 2011 PST by vadim +# Generated Mon Nov 28 12:23:42 2011 PST by vadim # # files: * cluster1_secuwall-1.fw /etc/cluster1_secuwall-1.fw # @@ -610,7 +610,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:21 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:42 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 43fa90623..5ad97e5c5 100755 --- a/test/ipt/firewall-base-rulesets.fw.orig +++ b/test/ipt/firewall-base-rulesets.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:48 2011 PST by vadim +# Generated Mon Nov 28 12:23:04 2011 PST by vadim # # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw # @@ -467,7 +467,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:48 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:04 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 749176565..cca17d4b8 100755 --- a/test/ipt/firewall-ipv6-1.fw.orig +++ b/test/ipt/firewall-ipv6-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:53 2011 PST by vadim +# Generated Mon Nov 28 12:23:10 2011 PST by vadim # # files: * firewall-ipv6-1.fw /etc/firewall-ipv6-1.fw # @@ -724,7 +724,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:53 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:10 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 fdf35daa8..ab132e49d 100755 --- a/test/ipt/firewall-ipv6-2.fw.orig +++ b/test/ipt/firewall-ipv6-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:54 2011 PST by vadim +# Generated Mon Nov 28 12:23:10 2011 PST by vadim # # files: * firewall-ipv6-2.fw /etc/firewall-ipv6-2.fw # @@ -988,7 +988,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:54 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:10 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 2df8f36b6..0e4aeef43 100755 --- a/test/ipt/firewall-ipv6-3.fw.orig +++ b/test/ipt/firewall-ipv6-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:54 2011 PST by vadim +# Generated Mon Nov 28 12:23:10 2011 PST by vadim # # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw # @@ -618,7 +618,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:54 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:10 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 317aa0503..64d39b4c5 100755 --- a/test/ipt/firewall-ipv6-4-1.fw.orig +++ b/test/ipt/firewall-ipv6-4-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:59 2011 PST by vadim +# Generated Mon Nov 28 12:23:18 2011 PST by vadim # # files: * firewall-ipv6-4-1.fw /etc/firewall-ipv6-4-1.fw # @@ -569,7 +569,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:59 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:18 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 2a98f0ea4..5196823d2 100755 --- a/test/ipt/firewall-ipv6-4.fw.orig +++ b/test/ipt/firewall-ipv6-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:54 2011 PST by vadim +# Generated Mon Nov 28 12:23:11 2011 PST by vadim # # files: * firewall-ipv6-4.fw /etc/firewall-ipv6-4.fw # @@ -605,7 +605,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:54 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:11 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 f4b058e46..869db6f81 100755 --- a/test/ipt/firewall-ipv6-5.fw.orig +++ b/test/ipt/firewall-ipv6-5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:59 2011 PST by vadim +# Generated Mon Nov 28 12:23:16 2011 PST by vadim # # files: * firewall-ipv6-5.fw /etc/firewall-ipv6-5.fw # @@ -434,7 +434,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:59 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:16 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 a54a4db42..f8f46255f 100755 --- a/test/ipt/firewall-ipv6-6.fw.orig +++ b/test/ipt/firewall-ipv6-6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:59 2011 PST by vadim +# Generated Mon Nov 28 12:23:16 2011 PST by vadim # # files: * firewall-ipv6-6.fw /etc/firewall-ipv6-6.fw # @@ -423,7 +423,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:59 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:16 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 1bb99a33b..85c5ce7e3 100755 --- a/test/ipt/firewall-ipv6-7.fw.orig +++ b/test/ipt/firewall-ipv6-7.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:59 2011 PST by vadim +# Generated Mon Nov 28 12:23:16 2011 PST by vadim # # files: * firewall-ipv6-7.fw /etc/firewall-ipv6-7.fw # @@ -467,7 +467,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:59 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:16 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 ba9892ca0..0986eba4b 100755 --- a/test/ipt/firewall-ipv6-8.fw.orig +++ b/test/ipt/firewall-ipv6-8.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:04 2011 PST by vadim +# Generated Mon Nov 28 12:23:22 2011 PST by vadim # # files: * firewall-ipv6-8.fw /etc/firewall-ipv6-8.fw # @@ -540,7 +540,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:04 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:22 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 96b0e76b1..082508540 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 @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:04 2011 PST by vadim +# Generated Mon Nov 28 12:23:22 2011 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-after-flush.fw /etc/firewall-ipv6-ipt-reset-prolog-after-flush.fw # @@ -464,7 +464,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:04 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:22 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 6d72a6792..274f84799 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 @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:04 2011 PST by vadim +# Generated Mon Nov 28 12:23:23 2011 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-after-interfaces.fw /etc/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw # @@ -464,7 +464,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:04 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23: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 d03b4fbdc..9e50dfd44 100755 --- a/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig +++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:04 2011 PST by vadim +# Generated Mon Nov 28 12:23:23 2011 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-top.fw /etc/firewall-ipv6-ipt-reset-prolog-top.fw # @@ -464,7 +464,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:04 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:23 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-nd-ns-1.fw.orig b/test/ipt/firewall-ipv6-nd-ns-1.fw.orig index ddaa4d400..6a998f830 100755 --- a/test/ipt/firewall-ipv6-nd-ns-1.fw.orig +++ b/test/ipt/firewall-ipv6-nd-ns-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:09 2011 PST by vadim +# Generated Mon Nov 28 12:23:28 2011 PST by vadim # # files: * firewall-ipv6-nd-ns-1.fw /etc/firewall-ipv6-nd-ns-1.fw # @@ -464,7 +464,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:09 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:28 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall-ipv6-nd-ns-2.fw.orig b/test/ipt/firewall-ipv6-nd-ns-2.fw.orig index cd2b636ef..8c4a8576f 100755 --- a/test/ipt/firewall-ipv6-nd-ns-2.fw.orig +++ b/test/ipt/firewall-ipv6-nd-ns-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:09 2011 PST by vadim +# Generated Mon Nov 28 12:23:29 2011 PST by vadim # # files: * firewall-ipv6-nd-ns-2.fw /etc/firewall-ipv6-nd-ns-2.fw # @@ -468,7 +468,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:09 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:29 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 9919e2c4d..8b8c021cb 100755 --- a/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig +++ b/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:10 2011 PST by vadim +# Generated Mon Nov 28 12:23:29 2011 PST by vadim # # files: * firewall-ipv6-prolog-after-flush.fw /etc/firewall-ipv6-prolog-after-flush.fw # @@ -442,7 +442,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:10 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:29 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 224dd7d62..84316e37a 100755 --- a/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig +++ b/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:10 2011 PST by vadim +# Generated Mon Nov 28 12:23:29 2011 PST by vadim # # files: * firewall-ipv6-prolog-after-interfaces.fw /etc/firewall-ipv6-prolog-after-interfaces.fw # @@ -442,7 +442,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:10 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:29 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 5c1bd9018..ebce4f9bb 100755 --- a/test/ipt/firewall-ipv6-prolog-top.fw.orig +++ b/test/ipt/firewall-ipv6-prolog-top.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:15 2011 PST by vadim +# Generated Mon Nov 28 12:23:34 2011 PST by vadim # # files: * firewall-ipv6-prolog-top.fw /etc/firewall-ipv6-prolog-top.fw # @@ -442,7 +442,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:15 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:34 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 c26112db8..f27734db6 100755 --- a/test/ipt/firewall-server-1-s.fw.orig +++ b/test/ipt/firewall-server-1-s.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:15 2011 PST by vadim +# Generated Mon Nov 28 12:23:35 2011 PST by vadim # # files: * firewall-server-1-s.fw /etc/fw/firewall-server-1-s.fw # @@ -415,7 +415,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:15 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23: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 70f81ac5c..fc7ff9e01 100755 --- a/test/ipt/firewall.fw.orig +++ b/test/ipt/firewall.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:03 2011 PST by vadim +# Generated Mon Nov 28 12:20:46 2011 PST by vadim # # files: * firewall.fw /etc/fw/firewall.fw # @@ -1398,7 +1398,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:03 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:20:46 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 b8d7ee2fc..20105a165 100755 --- a/test/ipt/firewall1.fw.orig +++ b/test/ipt/firewall1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:03 2011 PST by vadim +# Generated Mon Nov 28 12:20:46 2011 PST by vadim # # files: * firewall1.fw /etc/fw/firewall1.fw # @@ -1270,7 +1270,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:03 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:20:46 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 51ae36017..341826a4c 100755 --- a/test/ipt/firewall10.fw.orig +++ b/test/ipt/firewall10.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:02 2011 PST by vadim +# Generated Mon Nov 28 12:20:45 2011 PST by vadim # # files: * firewall10.fw /etc/fw/firewall10.fw # @@ -495,7 +495,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:02 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:20:45 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 d08cdba7c..7061e99ac 100755 --- a/test/ipt/firewall11.fw.orig +++ b/test/ipt/firewall11.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:07 2011 PST by vadim +# Generated Mon Nov 28 12:20:51 2011 PST by vadim # # files: * firewall11.fw /etc/fw/firewall11.fw # @@ -615,7 +615,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:07 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:20:51 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 e8d2e952b..408a0eac1 100755 --- a/test/ipt/firewall12.fw.orig +++ b/test/ipt/firewall12.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:07 2011 PST by vadim +# Generated Mon Nov 28 12:20:51 2011 PST by vadim # # files: * firewall12.fw /etc/fw/firewall12.fw # @@ -533,7 +533,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:07 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:20:51 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 ec54e5e54..848c01b7b 100755 --- a/test/ipt/firewall13.fw.orig +++ b/test/ipt/firewall13.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:07 2011 PST by vadim +# Generated Mon Nov 28 12:20:52 2011 PST by vadim # # files: * firewall13.fw /etc/fw/firewall13.fw # @@ -407,7 +407,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:07 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:20:52 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 7cbb69a80..fb9986b75 100755 --- a/test/ipt/firewall14.fw.orig +++ b/test/ipt/firewall14.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:07 2011 PST by vadim +# Generated Mon Nov 28 12:20:52 2011 PST by vadim # # files: * firewall14.fw /etc/fw/firewall14.fw # @@ -426,7 +426,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:07 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:20:52 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 70c6fab0d..731c45387 100755 --- a/test/ipt/firewall15.fw.orig +++ b/test/ipt/firewall15.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:12 2011 PST by vadim +# Generated Mon Nov 28 12:20:57 2011 PST by vadim # # files: * firewall15.fw /etc/fw/firewall15.fw # @@ -410,7 +410,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:12 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:20:57 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 acbc138be..e622653d7 100755 --- a/test/ipt/firewall16.fw.orig +++ b/test/ipt/firewall16.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:12 2011 PST by vadim +# Generated Mon Nov 28 12:20:57 2011 PST by vadim # # files: * firewall16.fw /etc/fw/firewall16.fw # @@ -514,7 +514,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:12 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:20:57 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 f63b19447..15c26b9f7 100755 --- a/test/ipt/firewall17.fw.orig +++ b/test/ipt/firewall17.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:12 2011 PST by vadim +# Generated Mon Nov 28 12:20:58 2011 PST by vadim # # files: * firewall17.fw /etc/fw/firewall17.fw # @@ -493,7 +493,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:12 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:20:58 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 eae65ba21..9bf61dde4 100755 --- a/test/ipt/firewall18.fw.orig +++ b/test/ipt/firewall18.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:12 2011 PST by vadim +# Generated Mon Nov 28 12:20:58 2011 PST by vadim # # files: * firewall18.fw /etc/fw/firewall18.fw # @@ -528,7 +528,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:12 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:20:58 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 432feb7ee..9f7e9b503 100755 --- a/test/ipt/firewall19.fw.orig +++ b/test/ipt/firewall19.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:17 2011 PST by vadim +# Generated Mon Nov 28 12:21:02 2011 PST by vadim # # files: * firewall19.fw /etc/fw/firewall19.fw # @@ -532,7 +532,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:17 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:02 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 7d22b05c2..93a146bc3 100755 --- a/test/ipt/firewall2-1.fw.orig +++ b/test/ipt/firewall2-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:24 2011 PST by vadim +# Generated Mon Nov 28 12:21:12 2011 PST by vadim # # files: * firewall2-1.fw /etc/fw/firewall2-1.fw # @@ -1452,7 +1452,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:24 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:12 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 4c834d63a..70c1381ae 100755 --- a/test/ipt/firewall2-2.fw.orig +++ b/test/ipt/firewall2-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:29 2011 PST by vadim +# Generated Mon Nov 28 12:21:14 2011 PST by vadim # # files: * firewall2-2.fw /etc/fw/firewall2-2.fw # @@ -1282,7 +1282,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:29 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:14 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 6d887673e..525e0aaf3 100755 --- a/test/ipt/firewall2-3.fw.orig +++ b/test/ipt/firewall2-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:29 2011 PST by vadim +# Generated Mon Nov 28 12:21:19 2011 PST by vadim # # files: * firewall2-3.fw /etc/fw/firewall2-3.fw # @@ -1140,7 +1140,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:29 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:19 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 15b05bb73..820d2b24a 100755 --- a/test/ipt/firewall2-4.fw.orig +++ b/test/ipt/firewall2-4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:34 2011 PST by vadim +# Generated Mon Nov 28 12:21:25 2011 PST by vadim # # files: * firewall2-4.fw /etc/fw/firewall2-4.fw # @@ -446,7 +446,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:34 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:25 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 f8927f0f9..f0971ca54 100755 --- a/test/ipt/firewall2-5.fw.orig +++ b/test/ipt/firewall2-5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:34 2011 PST by vadim +# Generated Mon Nov 28 12:21:30 2011 PST by vadim # # files: * firewall2-5.fw /etc/fw/firewall2-5.fw # @@ -477,7 +477,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:34 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:30 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 589c2923a..a353bb68d 100755 --- a/test/ipt/firewall2-6.fw.orig +++ b/test/ipt/firewall2-6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:39 2011 PST by vadim +# Generated Mon Nov 28 12:21:31 2011 PST by vadim # # files: * firewall2-6.fw /etc/fw/firewall2-6.fw # @@ -502,7 +502,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:39 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:31 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 31a819b92..ba6a2bc8d 100755 --- a/test/ipt/firewall2-7.fw.orig +++ b/test/ipt/firewall2-7.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:39 2011 PST by vadim +# Generated Mon Nov 28 12:21:36 2011 PST by vadim # # files: * firewall2-7.fw /etc/fw/firewall2-7.fw # @@ -442,7 +442,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:39 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:36 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 f0afad223..eeb405392 100755 --- a/test/ipt/firewall2.fw.orig +++ b/test/ipt/firewall2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:18 2011 PST by vadim +# Generated Mon Nov 28 12:21:05 2011 PST by vadim # # files: * firewall2.fw /etc/fw/firewall2.fw # @@ -1504,7 +1504,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:18 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:05 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 58782d496..5a577e841 100755 --- a/test/ipt/firewall20-ipv6.fw.orig +++ b/test/ipt/firewall20-ipv6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:17 2011 PST by vadim +# Generated Mon Nov 28 12:21:04 2011 PST by vadim # # files: * firewall20-ipv6.fw /etc/fw/firewall20-ipv6.fw # @@ -478,7 +478,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:17 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:04 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 b5b04c00c..9c66a2c75 100755 --- a/test/ipt/firewall20.fw.orig +++ b/test/ipt/firewall20.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:17 2011 PST by vadim +# Generated Mon Nov 28 12:21:04 2011 PST by vadim # # files: * firewall20.fw /etc/fw/firewall20.fw # @@ -696,7 +696,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:17 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:04 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 632a4620b..4d3c6feeb 100755 --- a/test/ipt/firewall21-1.fw.orig +++ b/test/ipt/firewall21-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:23 2011 PST by vadim +# Generated Mon Nov 28 12:21:11 2011 PST by vadim # # files: * firewall21-1.fw /etc/fw/firewall21-1.fw # @@ -496,7 +496,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:23 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:11 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 0719d8e49..84d3b2f53 100755 --- a/test/ipt/firewall21.fw.orig +++ b/test/ipt/firewall21.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:23 2011 PST by vadim +# Generated Mon Nov 28 12:21:08 2011 PST by vadim # # files: * firewall21.fw /etc/fw/firewall21.fw # @@ -495,7 +495,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:23 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:08 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 a31f33b95..13375d8cd 100755 --- a/test/ipt/firewall22.fw.orig +++ b/test/ipt/firewall22.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:23 2011 PST by vadim +# Generated Mon Nov 28 12:21:11 2011 PST by vadim # # files: * firewall22.fw /etc/fw/firewall22.fw # @@ -412,7 +412,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:23 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:11 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 241f0c405..9aea63933 100755 --- a/test/ipt/firewall23-1.fw.orig +++ b/test/ipt/firewall23-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3588 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Mon Nov 21 11:50:27 2011 PST by vadim +# Generated Mon Nov 28 12:21:18 2011 PST by vadim # # files: * firewall23-1.fw /etc/fw/firewall23-1.fw # @@ -586,7 +586,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Nov 21 11:50:27 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:18 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall23-2.fw.orig b/test/ipt/firewall23-2.fw.orig new file mode 100755 index 000000000..086ac7337 --- /dev/null +++ b/test/ipt/firewall23-2.fw.orig @@ -0,0 +1,462 @@ +#!/bin/sh +# +# This is automatically generated file. DO NOT MODIFY ! +# +# Firewall Builder fwb_ipt v5.0.1.3590 +# +# Generated Mon Nov 28 12:21:20 2011 PST by vadim +# +# files: * firewall23-2.fw /etc/fw/firewall23-2.fw +# +# Compiled for iptables 1.3.0 +# +# This is BRIDGING FIREWALL +# with two bridges and wildcard bridge port interfaces + +# see SF bug #3439613 + + + + +FWBDEBUG="" + +PATH="/sbin:/usr/sbin:/bin:/usr/bin:${PATH}" +export PATH + + + +LSMOD="/sbin/lsmod" +MODPROBE="/sbin/modprobe" +IPTABLES="/sbin/iptables" +IP6TABLES="/sbin/ip6tables" +IPTABLES_RESTORE="/sbin/iptables-restore" +IP6TABLES_RESTORE="/sbin/ip6tables-restore" +IP="/sbin/ip" +IFCONFIG="/sbin/ifconfig" +VCONFIG="/sbin/vconfig" +BRCTL="/sbin/brctl" +IFENSLAVE="/sbin/ifenslave" +IPSET="/usr/sbin/ipset" +LOGGER="/usr/bin/logger" + +log() { + echo "$1" + which "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1" +} + +getInterfaceVarName() { + echo $1 | sed 's/\./_/' +} + +getaddr_internal() { + dev=$1 + name=$2 + af=$3 + L=$($IP $af addr show dev $dev | sed -n '/inet/{s!.*inet6* !!;s!/.*!!p}' | sed 's/peer.*//') + test -z "$L" && { + eval "$name=''" + return + } + eval "${name}_list=\"$L\"" +} + +getnet_internal() { + dev=$1 + name=$2 + af=$3 + L=$($IP route list proto kernel | grep $dev | grep -v default | sed 's! .*$!!') + test -z "$L" && { + eval "$name=''" + return + } + eval "${name}_list=\"$L\"" +} + + +getaddr() { + getaddr_internal $1 $2 "-4" +} + +getaddr6() { + getaddr_internal $1 $2 "-6" +} + +getnet() { + getnet_internal $1 $2 "-4" +} + +getnet6() { + getnet_internal $1 $2 "-6" +} + +# function getinterfaces is used to process wildcard interfaces +getinterfaces() { + NAME=$1 + $IP link show | grep ": $NAME" | while read L; do + OIFS=$IFS + IFS=" :" + set $L + IFS=$OIFS + echo $2 + done +} + +diff_intf() { + func=$1 + list1=$2 + list2=$3 + cmd=$4 + for intf in $list1 + do + echo $list2 | grep -q $intf || { + # $vlan is absent in list 2 + $func $intf $cmd + } + done +} + +find_program() { + PGM=$1 + which $PGM >/dev/null 2>&1 || { + echo "\"$PGM\" not found" + exit 1 + } +} +check_tools() { + find_program which + find_program $IPTABLES + find_program $IP +} +reset_iptables_v4() { + $IPTABLES -P OUTPUT DROP + $IPTABLES -P INPUT DROP + $IPTABLES -P FORWARD DROP + +cat /proc/net/ip_tables_names | while read table; do + $IPTABLES -t $table -L -n | while read c chain rest; do + if test "X$c" = "XChain" ; then + $IPTABLES -t $table -F $chain + fi + done + $IPTABLES -t $table -X +done +} + +reset_iptables_v6() { + $IP6TABLES -P OUTPUT DROP + $IP6TABLES -P INPUT DROP + $IP6TABLES -P FORWARD DROP + +cat /proc/net/ip6_tables_names | while read table; do + $IP6TABLES -t $table -L -n | while read c chain rest; do + if test "X$c" = "XChain" ; then + $IP6TABLES -t $table -F $chain + fi + done + $IP6TABLES -t $table -X +done +} + + +P2P_INTERFACE_WARNING="" + +missing_address() { + address=$1 + cmd=$2 + + oldIFS=$IFS + IFS="@" + set $address + addr=$1 + interface=$2 + IFS=$oldIFS + + + + $IP addr show dev $interface | grep -q POINTOPOINT && { + test -z "$P2P_INTERFACE_WARNING" && echo "Warning: Can not update address of interface $interface. fwbuilder can not manage addresses of point-to-point interfaces yet" + P2P_INTERFACE_WARNING="yes" + return + } + + test "$cmd" = "add" && { + echo "# Adding ip address: $interface $addr" + echo $addr | grep -q ':' && { + $FWBDEBUG $IP addr $cmd $addr dev $interface + } || { + $FWBDEBUG $IP addr $cmd $addr broadcast + dev $interface + } + } + + test "$cmd" = "del" && { + echo "# Removing ip address: $interface $addr" + $FWBDEBUG $IP addr $cmd $addr dev $interface || exit 1 + } + + $FWBDEBUG $IP link set $interface up +} + +list_addresses_by_scope() { + interface=$1 + scope=$2 + ignore_list=$3 + $IP addr ls dev $interface | \ + awk -v IGNORED="$ignore_list" -v SCOPE="$scope" \ + 'BEGIN { + split(IGNORED,ignored_arr); + for (a in ignored_arr) {ignored_dict[ignored_arr[a]]=1;} + } + (/inet |inet6 / && $0 ~ SCOPE && !($2 in ignored_dict)) {print $2;}' | \ + while read addr; do + echo "${addr}@$interface" + done | sort +} + + +update_addresses_of_interface() { + ignore_list=$2 + set $1 + interface=$1 + shift + + FWB_ADDRS=$( + for addr in $*; do + echo "${addr}@$interface" + done | sort + ) + + CURRENT_ADDRS_ALL_SCOPES="" + CURRENT_ADDRS_GLOBAL_SCOPE="" + + $IP link show dev $interface >/dev/null 2>&1 && { + CURRENT_ADDRS_ALL_SCOPES=$(list_addresses_by_scope $interface 'scope .*' "$ignore_list") + CURRENT_ADDRS_GLOBAL_SCOPE=$(list_addresses_by_scope $interface 'scope global' "$ignore_list") + } || { + echo "# Interface $interface does not exist" + # Stop the script if we are not in test mode + test -z "$FWBDEBUG" && exit 1 + } + + diff_intf missing_address "$FWB_ADDRS" "$CURRENT_ADDRS_ALL_SCOPES" add + diff_intf missing_address "$CURRENT_ADDRS_GLOBAL_SCOPE" "$FWB_ADDRS" del +} + +clear_addresses_except_known_interfaces() { + $IP link show | sed 's/://g' | awk -v IGNORED="$*" \ + 'BEGIN { + split(IGNORED,ignored_arr); + for (a in ignored_arr) {ignored_dict[ignored_arr[a]]=1;} + } + (/state/ && !($2 in ignored_dict)) {print $2;}' | \ + while read intf; do + echo "# Removing addresses not configured in fwbuilder from interface $intf" + $FWBDEBUG $IP addr flush dev $intf scope global + $FWBDEBUG $IP link set $intf down + done +} + +check_file() { + test -r "$2" || { + echo "Can not find file $2 referenced by address table object $1" + exit 1 + } +} + +check_run_time_address_table_files() { + : + +} + +load_modules() { + : + +} + +verify_interfaces() { + : + +} + +prolog_commands() { + echo "Running prolog script" + +} + +epilog_commands() { + echo "Running epilog script" + +} + +run_epilog_and_exit() { + epilog_commands + exit $1 +} + +configure_interfaces() { + : + # Configure interfaces + update_addresses_of_interface "lo 127.0.0.1/8" "" +} + +script_body() { + echo 30 > /proc/sys/net/ipv4/tcp_fin_timeout + echo 1800 > /proc/sys/net/ipv4/tcp_keepalive_intvl + + + # ================ IPv4 + + + # ================ Table 'filter', automatic rules + # accept established sessions + $IPTABLES -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT + $IPTABLES -A OUTPUT -m state --state ESTABLISHED,RELATED -j ACCEPT + $IPTABLES -A FORWARD -m state --state ESTABLISHED,RELATED -j ACCEPT + # ================ Table 'mangle', automatic rules + $IPTABLES -t mangle -A FORWARD -p tcp -m tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu + + + + + + # ================ Table 'filter', rule set Policy + # + # Rule 0 (vnet+) + # + echo "Rule 0 (vnet+)" + # + # -i br0 + $IPTABLES -A INPUT -i br0 -m physdev --physdev-in vnet+ -m state --state NEW -j ACCEPT + # + # Rule 1 (vnet+) + # + echo "Rule 1 (vnet+)" + # + # -i br1 + $IPTABLES -A INPUT -i br1 -m physdev --physdev-in vnet+ -m state --state NEW -j ACCEPT + # + # Rule 2 (vnet+) + # + echo "Rule 2 (vnet+)" + # + # -o br0 + $IPTABLES -A OUTPUT -o br0 -m physdev --physdev-is-bridged --physdev-out vnet+ -m state --state NEW -j ACCEPT + # + # Rule 3 (vnet+) + # + echo "Rule 3 (vnet+)" + # + # -o br1 + $IPTABLES -A OUTPUT -o br1 -m physdev --physdev-is-bridged --physdev-out vnet+ -m state --state NEW -j ACCEPT +} + +ip_forward() { + : + +} + +reset_all() { + : + reset_iptables_v4 +} + +block_action() { + reset_all +} + +stop_action() { + reset_all + $IPTABLES -P OUTPUT ACCEPT + $IPTABLES -P INPUT ACCEPT + $IPTABLES -P FORWARD ACCEPT +} + +check_iptables() { + IP_TABLES="$1" + [ ! -e $IP_TABLES ] && return 151 + NF_TABLES=$(cat $IP_TABLES 2>/dev/null) + [ -z "$NF_TABLES" ] && return 152 + return 0 +} +status_action() { + check_iptables "/proc/net/ip_tables_names" + ret_ipv4=$? + check_iptables "/proc/net/ip6_tables_names" + ret_ipv6=$? + [ $ret_ipv4 -eq 0 -o $ret_ipv6 -eq 0 ] && return 0 + [ $ret_ipv4 -eq 151 -o $ret_ipv6 -eq 151 ] && { + echo "iptables modules are not loaded" + } + [ $ret_ipv4 -eq 152 -o $ret_ipv6 -eq 152 ] && { + echo "Firewall is not configured" + } + exit 3 +} + +# See how we were called. +# For backwards compatibility missing argument is equivalent to 'start' + +cmd=$1 +test -z "$cmd" && { + cmd="start" +} + +case "$cmd" in + start) + log "Activating firewall script generated Mon Nov 28 12:21:20 2011 by vadim" + check_tools + prolog_commands + check_run_time_address_table_files + + load_modules " " + configure_interfaces + verify_interfaces + + reset_all + + script_body + ip_forward + epilog_commands + RETVAL=$? + ;; + + stop) + stop_action + RETVAL=$? + ;; + + status) + status_action + RETVAL=$? + ;; + + block) + block_action + RETVAL=$? + ;; + + reload) + $0 stop + $0 start + RETVAL=$? + ;; + + interfaces) + configure_interfaces + RETVAL=$? + ;; + + test_interfaces) + FWBDEBUG="echo" + configure_interfaces + RETVAL=$? + ;; + + + + *) + echo "Usage $0 [start|stop|status|block|reload|interfaces|test_interfaces]" + ;; + +esac + +exit $RETVAL \ No newline at end of file diff --git a/test/ipt/firewall23-3.fw.orig b/test/ipt/firewall23-3.fw.orig new file mode 100755 index 000000000..6b820729d --- /dev/null +++ b/test/ipt/firewall23-3.fw.orig @@ -0,0 +1,448 @@ +#!/bin/sh +# +# This is automatically generated file. DO NOT MODIFY ! +# +# Firewall Builder fwb_ipt v5.0.1.3590 +# +# Generated Mon Nov 28 12:21:24 2011 PST by vadim +# +# files: * firewall23-3.fw /etc/fw/firewall23-3.fw +# +# Compiled for iptables 1.3.0 +# +# This is BRIDGING FIREWALL +# with one bridge and wildcard bridge port interfaces. +# Since there is only one bridge, there is no need to add -i br0 / -o br0 + +# see SF bug #3439613 + + + + +FWBDEBUG="" + +PATH="/sbin:/usr/sbin:/bin:/usr/bin:${PATH}" +export PATH + + + +LSMOD="/sbin/lsmod" +MODPROBE="/sbin/modprobe" +IPTABLES="/sbin/iptables" +IP6TABLES="/sbin/ip6tables" +IPTABLES_RESTORE="/sbin/iptables-restore" +IP6TABLES_RESTORE="/sbin/ip6tables-restore" +IP="/sbin/ip" +IFCONFIG="/sbin/ifconfig" +VCONFIG="/sbin/vconfig" +BRCTL="/sbin/brctl" +IFENSLAVE="/sbin/ifenslave" +IPSET="/usr/sbin/ipset" +LOGGER="/usr/bin/logger" + +log() { + echo "$1" + which "$LOGGER" >/dev/null 2>&1 && $LOGGER -p info "$1" +} + +getInterfaceVarName() { + echo $1 | sed 's/\./_/' +} + +getaddr_internal() { + dev=$1 + name=$2 + af=$3 + L=$($IP $af addr show dev $dev | sed -n '/inet/{s!.*inet6* !!;s!/.*!!p}' | sed 's/peer.*//') + test -z "$L" && { + eval "$name=''" + return + } + eval "${name}_list=\"$L\"" +} + +getnet_internal() { + dev=$1 + name=$2 + af=$3 + L=$($IP route list proto kernel | grep $dev | grep -v default | sed 's! .*$!!') + test -z "$L" && { + eval "$name=''" + return + } + eval "${name}_list=\"$L\"" +} + + +getaddr() { + getaddr_internal $1 $2 "-4" +} + +getaddr6() { + getaddr_internal $1 $2 "-6" +} + +getnet() { + getnet_internal $1 $2 "-4" +} + +getnet6() { + getnet_internal $1 $2 "-6" +} + +# function getinterfaces is used to process wildcard interfaces +getinterfaces() { + NAME=$1 + $IP link show | grep ": $NAME" | while read L; do + OIFS=$IFS + IFS=" :" + set $L + IFS=$OIFS + echo $2 + done +} + +diff_intf() { + func=$1 + list1=$2 + list2=$3 + cmd=$4 + for intf in $list1 + do + echo $list2 | grep -q $intf || { + # $vlan is absent in list 2 + $func $intf $cmd + } + done +} + +find_program() { + PGM=$1 + which $PGM >/dev/null 2>&1 || { + echo "\"$PGM\" not found" + exit 1 + } +} +check_tools() { + find_program which + find_program $IPTABLES + find_program $IP +} +reset_iptables_v4() { + $IPTABLES -P OUTPUT DROP + $IPTABLES -P INPUT DROP + $IPTABLES -P FORWARD DROP + +cat /proc/net/ip_tables_names | while read table; do + $IPTABLES -t $table -L -n | while read c chain rest; do + if test "X$c" = "XChain" ; then + $IPTABLES -t $table -F $chain + fi + done + $IPTABLES -t $table -X +done +} + +reset_iptables_v6() { + $IP6TABLES -P OUTPUT DROP + $IP6TABLES -P INPUT DROP + $IP6TABLES -P FORWARD DROP + +cat /proc/net/ip6_tables_names | while read table; do + $IP6TABLES -t $table -L -n | while read c chain rest; do + if test "X$c" = "XChain" ; then + $IP6TABLES -t $table -F $chain + fi + done + $IP6TABLES -t $table -X +done +} + + +P2P_INTERFACE_WARNING="" + +missing_address() { + address=$1 + cmd=$2 + + oldIFS=$IFS + IFS="@" + set $address + addr=$1 + interface=$2 + IFS=$oldIFS + + + + $IP addr show dev $interface | grep -q POINTOPOINT && { + test -z "$P2P_INTERFACE_WARNING" && echo "Warning: Can not update address of interface $interface. fwbuilder can not manage addresses of point-to-point interfaces yet" + P2P_INTERFACE_WARNING="yes" + return + } + + test "$cmd" = "add" && { + echo "# Adding ip address: $interface $addr" + echo $addr | grep -q ':' && { + $FWBDEBUG $IP addr $cmd $addr dev $interface + } || { + $FWBDEBUG $IP addr $cmd $addr broadcast + dev $interface + } + } + + test "$cmd" = "del" && { + echo "# Removing ip address: $interface $addr" + $FWBDEBUG $IP addr $cmd $addr dev $interface || exit 1 + } + + $FWBDEBUG $IP link set $interface up +} + +list_addresses_by_scope() { + interface=$1 + scope=$2 + ignore_list=$3 + $IP addr ls dev $interface | \ + awk -v IGNORED="$ignore_list" -v SCOPE="$scope" \ + 'BEGIN { + split(IGNORED,ignored_arr); + for (a in ignored_arr) {ignored_dict[ignored_arr[a]]=1;} + } + (/inet |inet6 / && $0 ~ SCOPE && !($2 in ignored_dict)) {print $2;}' | \ + while read addr; do + echo "${addr}@$interface" + done | sort +} + + +update_addresses_of_interface() { + ignore_list=$2 + set $1 + interface=$1 + shift + + FWB_ADDRS=$( + for addr in $*; do + echo "${addr}@$interface" + done | sort + ) + + CURRENT_ADDRS_ALL_SCOPES="" + CURRENT_ADDRS_GLOBAL_SCOPE="" + + $IP link show dev $interface >/dev/null 2>&1 && { + CURRENT_ADDRS_ALL_SCOPES=$(list_addresses_by_scope $interface 'scope .*' "$ignore_list") + CURRENT_ADDRS_GLOBAL_SCOPE=$(list_addresses_by_scope $interface 'scope global' "$ignore_list") + } || { + echo "# Interface $interface does not exist" + # Stop the script if we are not in test mode + test -z "$FWBDEBUG" && exit 1 + } + + diff_intf missing_address "$FWB_ADDRS" "$CURRENT_ADDRS_ALL_SCOPES" add + diff_intf missing_address "$CURRENT_ADDRS_GLOBAL_SCOPE" "$FWB_ADDRS" del +} + +clear_addresses_except_known_interfaces() { + $IP link show | sed 's/://g' | awk -v IGNORED="$*" \ + 'BEGIN { + split(IGNORED,ignored_arr); + for (a in ignored_arr) {ignored_dict[ignored_arr[a]]=1;} + } + (/state/ && !($2 in ignored_dict)) {print $2;}' | \ + while read intf; do + echo "# Removing addresses not configured in fwbuilder from interface $intf" + $FWBDEBUG $IP addr flush dev $intf scope global + $FWBDEBUG $IP link set $intf down + done +} + +check_file() { + test -r "$2" || { + echo "Can not find file $2 referenced by address table object $1" + exit 1 + } +} + +check_run_time_address_table_files() { + : + +} + +load_modules() { + : + +} + +verify_interfaces() { + : + +} + +prolog_commands() { + echo "Running prolog script" + +} + +epilog_commands() { + echo "Running epilog script" + +} + +run_epilog_and_exit() { + epilog_commands + exit $1 +} + +configure_interfaces() { + : + # Configure interfaces + update_addresses_of_interface "lo 127.0.0.1/8" "" +} + +script_body() { + echo 30 > /proc/sys/net/ipv4/tcp_fin_timeout + echo 1800 > /proc/sys/net/ipv4/tcp_keepalive_intvl + + + # ================ IPv4 + + + # ================ Table 'filter', automatic rules + # accept established sessions + $IPTABLES -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT + $IPTABLES -A OUTPUT -m state --state ESTABLISHED,RELATED -j ACCEPT + $IPTABLES -A FORWARD -m state --state ESTABLISHED,RELATED -j ACCEPT + # ================ Table 'mangle', automatic rules + $IPTABLES -t mangle -A FORWARD -p tcp -m tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu + + + + + + # ================ Table 'filter', rule set Policy + # + # Rule 0 (vnet+) + # + echo "Rule 0 (vnet+)" + # + $IPTABLES -A INPUT -m physdev --physdev-in vnet+ -m state --state NEW -j ACCEPT + # + # Rule 1 (vnet+) + # + echo "Rule 1 (vnet+)" + # + # -o br0 + $IPTABLES -A OUTPUT -m physdev --physdev-is-bridged --physdev-out vnet+ -m state --state NEW -j ACCEPT +} + +ip_forward() { + : + +} + +reset_all() { + : + reset_iptables_v4 +} + +block_action() { + reset_all +} + +stop_action() { + reset_all + $IPTABLES -P OUTPUT ACCEPT + $IPTABLES -P INPUT ACCEPT + $IPTABLES -P FORWARD ACCEPT +} + +check_iptables() { + IP_TABLES="$1" + [ ! -e $IP_TABLES ] && return 151 + NF_TABLES=$(cat $IP_TABLES 2>/dev/null) + [ -z "$NF_TABLES" ] && return 152 + return 0 +} +status_action() { + check_iptables "/proc/net/ip_tables_names" + ret_ipv4=$? + check_iptables "/proc/net/ip6_tables_names" + ret_ipv6=$? + [ $ret_ipv4 -eq 0 -o $ret_ipv6 -eq 0 ] && return 0 + [ $ret_ipv4 -eq 151 -o $ret_ipv6 -eq 151 ] && { + echo "iptables modules are not loaded" + } + [ $ret_ipv4 -eq 152 -o $ret_ipv6 -eq 152 ] && { + echo "Firewall is not configured" + } + exit 3 +} + +# See how we were called. +# For backwards compatibility missing argument is equivalent to 'start' + +cmd=$1 +test -z "$cmd" && { + cmd="start" +} + +case "$cmd" in + start) + log "Activating firewall script generated Mon Nov 28 12:21:24 2011 by vadim" + check_tools + prolog_commands + check_run_time_address_table_files + + load_modules " " + configure_interfaces + verify_interfaces + + reset_all + + script_body + ip_forward + epilog_commands + RETVAL=$? + ;; + + stop) + stop_action + RETVAL=$? + ;; + + status) + status_action + RETVAL=$? + ;; + + block) + block_action + RETVAL=$? + ;; + + reload) + $0 stop + $0 start + RETVAL=$? + ;; + + interfaces) + configure_interfaces + RETVAL=$? + ;; + + test_interfaces) + FWBDEBUG="echo" + configure_interfaces + RETVAL=$? + ;; + + + + *) + echo "Usage $0 [start|stop|status|block|reload|interfaces|test_interfaces]" + ;; + +esac + +exit $RETVAL \ No newline at end of file diff --git a/test/ipt/firewall23.fw.orig b/test/ipt/firewall23.fw.orig index fc01cc68e..6c2cc56fa 100755 --- a/test/ipt/firewall23.fw.orig +++ b/test/ipt/firewall23.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:29 2011 PST by vadim +# Generated Mon Nov 28 12:21:18 2011 PST by vadim # # files: * firewall23.fw /etc/fw/firewall23.fw # @@ -498,7 +498,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:29 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:18 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 18942e44e..704a4dc2a 100755 --- a/test/ipt/firewall24.fw.orig +++ b/test/ipt/firewall24.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:34 2011 PST by vadim +# Generated Mon Nov 28 12:21:25 2011 PST by vadim # # files: * firewall24.fw /etc/fw/firewall24.fw # @@ -515,7 +515,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:34 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:25 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 b630e58e4..3c438e88a 100755 --- a/test/ipt/firewall25.fw.orig +++ b/test/ipt/firewall25.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:34 2011 PST by vadim +# Generated Mon Nov 28 12:21:26 2011 PST by vadim # # files: * firewall25.fw /etc/fw/firewall25.fw # @@ -706,7 +706,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:34 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:26 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 4549cb7fc..d7fe55e3d 100755 --- a/test/ipt/firewall26.fw.orig +++ b/test/ipt/firewall26.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:38 2011 PST by vadim +# Generated Mon Nov 28 12:21:32 2011 PST by vadim # # files: * firewall26.fw /etc/fw/firewall26.fw # @@ -586,7 +586,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:38 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:32 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 c96f3b208..b1230cc62 100755 --- a/test/ipt/firewall27.fw.orig +++ b/test/ipt/firewall27.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:39 2011 PST by vadim +# Generated Mon Nov 28 12:21:32 2011 PST by vadim # # files: * firewall27.fw /etc/fw/firewall27.fw # @@ -568,7 +568,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:39 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:32 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 5a33dd243..f8b22d8f8 100755 --- a/test/ipt/firewall28.fw.orig +++ b/test/ipt/firewall28.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:43 2011 PST by vadim +# Generated Mon Nov 28 12:21:37 2011 PST by vadim # # files: * firewall28.fw /etc/fw/firewall28.fw # @@ -431,7 +431,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:43 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:37 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 c834207d0..569436000 100755 --- a/test/ipt/firewall29.fw.orig +++ b/test/ipt/firewall29.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:44 2011 PST by vadim +# Generated Mon Nov 28 12:21:38 2011 PST by vadim # # files: * firewall29.fw /etc/fw/firewall29.fw # @@ -466,7 +466,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:44 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:38 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 754ba4b79..e759c9bf7 100755 --- a/test/ipt/firewall3.fw.orig +++ b/test/ipt/firewall3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:44 2011 PST by vadim +# Generated Mon Nov 28 12:21:38 2011 PST by vadim # # files: * firewall3.fw /etc/fw/firewall3.fw # @@ -600,7 +600,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:44 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:38 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 993c9b92d..fc903018f 100755 --- a/test/ipt/firewall30.fw.orig +++ b/test/ipt/firewall30.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:44 2011 PST by vadim +# Generated Mon Nov 28 12:21:41 2011 PST by vadim # # files: * firewall30.fw /etc/fw/firewall30.fw # @@ -397,7 +397,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:44 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:41 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 15865e51f..407eefe12 100755 --- a/test/ipt/firewall31.fw.orig +++ b/test/ipt/firewall31.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:47 2011 PST by vadim +# Generated Mon Nov 28 12:21:44 2011 PST by vadim # # files: * firewall31.fw /etc/fw/firewall31.fw # @@ -469,7 +469,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:47 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:44 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 0b5216f09..b77fc7546 100755 --- a/test/ipt/firewall32.fw.orig +++ b/test/ipt/firewall32.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:48 2011 PST by vadim +# Generated Mon Nov 28 12:21:44 2011 PST by vadim # # files: * firewall32.fw /etc/fw/firewall32.fw # @@ -440,7 +440,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:48 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:44 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 9734e9510..76ef36385 100755 --- a/test/ipt/firewall33-1.fw.orig +++ b/test/ipt/firewall33-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:50 2011 PST by vadim +# Generated Mon Nov 28 12:21:48 2011 PST by vadim # # files: * firewall33-1.fw /etc/fw/firewall33-1.fw # @@ -539,7 +539,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:50 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:48 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 9f1194d3d..29fdfb723 100755 --- a/test/ipt/firewall33.fw.orig +++ b/test/ipt/firewall33.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:50 2011 PST by vadim +# Generated Mon Nov 28 12:21:46 2011 PST by vadim # # files: * firewall33.fw /etc/fw/firewall33.fw # @@ -584,7 +584,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:50 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:46 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 bca17028b..5bf11d155 100755 --- a/test/ipt/firewall34.fw.orig +++ b/test/ipt/firewall34.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:51 2011 PST by vadim +# Generated Mon Nov 28 12:21:50 2011 PST by vadim # # files: * firewall34.fw /etc/fw/firewall34.fw # @@ -672,7 +672,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:51 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:50 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 60abeaa0b..bab053d36 100755 --- a/test/ipt/firewall35.fw.orig +++ b/test/ipt/firewall35.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:53 2011 PST by vadim +# Generated Mon Nov 28 12:21:51 2011 PST by vadim # # files: * firewall35.fw /etc/fw/firewall35.fw # @@ -564,7 +564,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:53 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:51 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 1f9798eca..4d5d866f4 100755 --- a/test/ipt/firewall36-1.fw.orig +++ b/test/ipt/firewall36-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:55 2011 PST by vadim +# Generated Mon Nov 28 12:21:55 2011 PST by vadim # # files: * firewall36-1.fw /etc/firewall36-1.fw # @@ -455,7 +455,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:55 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:55 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 dd1ab404a..5b46ca553 100755 --- a/test/ipt/firewall36-2.fw.orig +++ b/test/ipt/firewall36-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:55 2011 PST by vadim +# Generated Mon Nov 28 12:21:56 2011 PST by vadim # # files: * firewall36-2.fw /etc/firewall36-2.fw # @@ -455,7 +455,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:55 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:56 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 64d026c02..6767d02c8 100755 --- a/test/ipt/firewall36.fw.orig +++ b/test/ipt/firewall36.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:55 2011 PST by vadim +# Generated Mon Nov 28 12:21:52 2011 PST by vadim # # files: * firewall36.fw /etc/firewall36.fw # @@ -519,7 +519,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:55 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:52 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 91ccacfa0..aa3d7b8c7 100755 --- a/test/ipt/firewall37-1.fw.orig +++ b/test/ipt/firewall37-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:59 2011 PST by vadim +# Generated Mon Nov 28 12:21:58 2011 PST by vadim # # files: * firewall37-1.fw /etc/fw/firewall37-1.fw # @@ -988,7 +988,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:59 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:58 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall37-2.fw.orig b/test/ipt/firewall37-2.fw.orig index 8ae925842..1cf7f83f5 100755 --- a/test/ipt/firewall37-2.fw.orig +++ b/test/ipt/firewall37-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:59 2011 PST by vadim +# Generated Mon Nov 28 12:22:01 2011 PST by vadim # # files: * firewall37-2.fw /etc/fw/firewall37-2.fw # @@ -705,7 +705,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:59 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:01 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 4bafcddb3..317efccc7 100755 --- a/test/ipt/firewall37.fw.orig +++ b/test/ipt/firewall37.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:58 2011 PST by vadim +# Generated Mon Nov 28 12:21:58 2011 PST by vadim # # files: * firewall37.fw /etc/fw/firewall37.fw # @@ -1314,7 +1314,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:58 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:21:58 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 d2e367a6a..84d084e49 100755 --- a/test/ipt/firewall38.fw.orig +++ b/test/ipt/firewall38.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:57:59 2011 PST by vadim +# Generated Mon Nov 28 12:22:02 2011 PST by vadim # # files: * firewall38.fw /etc/fw/firewall38.fw # @@ -541,7 +541,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:57:59 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:02 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 c8c2b1691..28acfcb93 100755 --- a/test/ipt/firewall39.fw.orig +++ b/test/ipt/firewall39.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:01 2011 PST by vadim +# Generated Mon Nov 28 12:22:05 2011 PST by vadim # # files: * firewall39.fw /etc/fw/firewall39.fw # @@ -821,7 +821,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:01 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:05 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 381abe592..d20fe0c2d 100755 --- a/test/ipt/firewall4.fw.orig +++ b/test/ipt/firewall4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:05 2011 PST by vadim +# Generated Mon Nov 28 12:22:05 2011 PST by vadim # # files: * firewall4.fw /etc/fw/firewall4.fw # @@ -734,7 +734,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:05 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:05 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 b1be7fb43..f396c3fba 100755 --- a/test/ipt/firewall40-1.fw.orig +++ b/test/ipt/firewall40-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:04 2011 PST by vadim +# Generated Mon Nov 28 12:22:09 2011 PST by vadim # # files: * firewall40-1.fw /etc/firewall40-1.fw # @@ -463,7 +463,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:04 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:09 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 6d7faaaa5..65394886c 100755 --- a/test/ipt/firewall40-2.fw.orig +++ b/test/ipt/firewall40-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:05 2011 PST by vadim +# Generated Mon Nov 28 12:22:11 2011 PST by vadim # # files: * firewall40-2.fw /etc/firewall40-2.fw # @@ -450,7 +450,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:05 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:11 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 af1ef5fee..47b33e811 100755 --- a/test/ipt/firewall40.fw.orig +++ b/test/ipt/firewall40.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:04 2011 PST by vadim +# Generated Mon Nov 28 12:22:07 2011 PST by vadim # # files: * firewall40.fw /etc/firewall40.fw # @@ -456,7 +456,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:04 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:07 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 52bd4aa64..00398eacd 100755 --- a/test/ipt/firewall41-1.fw.orig +++ b/test/ipt/firewall41-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:09 2011 PST by vadim +# Generated Mon Nov 28 12:22:13 2011 PST by vadim # # files: * firewall41-1.fw /etc/firewall41-1.fw # @@ -597,7 +597,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:09 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:13 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 5fe67a379..1b298c9ea 100755 --- a/test/ipt/firewall41.fw.orig +++ b/test/ipt/firewall41.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:09 2011 PST by vadim +# Generated Mon Nov 28 12:22:11 2011 PST by vadim # # files: * firewall41.fw /etc/firewall41.fw # @@ -481,7 +481,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:09 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:11 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 fa58a8d6c..f0f23da11 100755 --- a/test/ipt/firewall42.fw.orig +++ b/test/ipt/firewall42.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:09 2011 PST by vadim +# Generated Mon Nov 28 12:22:17 2011 PST by vadim # # files: * firewall42.fw /etc/fw/firewall42.fw # @@ -406,7 +406,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:09 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:17 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 a1ef37daa..5790b8d27 100755 --- a/test/ipt/firewall5.fw.orig +++ b/test/ipt/firewall5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:15 2011 PST by vadim +# Generated Mon Nov 28 12:22:18 2011 PST by vadim # # files: * firewall5.fw /etc/fw/firewall5.fw # @@ -648,7 +648,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:15 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:18 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 b1c98fb57..89ea4db82 100755 --- a/test/ipt/firewall50.fw.orig +++ b/test/ipt/firewall50.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:14 2011 PST by vadim +# Generated Mon Nov 28 12:22:19 2011 PST by vadim # # files: * firewall50.fw /etc/fw/firewall50.fw # @@ -440,7 +440,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:14 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:19 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 59e97a244..e8f33ac43 100755 --- a/test/ipt/firewall51.fw.orig +++ b/test/ipt/firewall51.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:15 2011 PST by vadim +# Generated Mon Nov 28 12:22:21 2011 PST by vadim # # files: * firewall51.fw /etc/fw/firewall51.fw # @@ -513,7 +513,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:15 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:21 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 5764b15c1..80ded76b8 100755 --- a/test/ipt/firewall6.fw.orig +++ b/test/ipt/firewall6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:15 2011 PST by vadim +# Generated Mon Nov 28 12:22:24 2011 PST by vadim # # files: * firewall6.fw /etc/fw/firewall6.fw # @@ -535,7 +535,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:15 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:24 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 4dba55eff..82e142329 100755 --- a/test/ipt/firewall60.fw.orig +++ b/test/ipt/firewall60.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:20 2011 PST by vadim +# Generated Mon Nov 28 12:22:24 2011 PST by vadim # # files: * firewall60.fw /etc/firewall60.fw # @@ -441,7 +441,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:20 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:24 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 67384f84a..59f2468e6 100755 --- a/test/ipt/firewall61-1.2.5.fw.orig +++ b/test/ipt/firewall61-1.2.5.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:20 2011 PST by vadim +# Generated Mon Nov 28 12:22:25 2011 PST by vadim # # files: * firewall61-1.2.5.fw /etc/firewall61-1.2.5.fw # @@ -521,7 +521,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:20 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:25 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 0882717d6..dd228f0e0 100755 --- a/test/ipt/firewall61-1.2.6.fw.orig +++ b/test/ipt/firewall61-1.2.6.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:20 2011 PST by vadim +# Generated Mon Nov 28 12:22:26 2011 PST by vadim # # files: * firewall61-1.2.6.fw /etc/firewall61-1.2.6.fw # @@ -527,7 +527,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:20 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:26 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 9b8fef55a..843e627e2 100755 --- a/test/ipt/firewall61-1.3.x.fw.orig +++ b/test/ipt/firewall61-1.3.x.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:20 2011 PST by vadim +# Generated Mon Nov 28 12:22:30 2011 PST by vadim # # files: * firewall61-1.3.x.fw /etc/firewall61-1.3.x.fw # @@ -514,7 +514,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:20 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:30 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 fe327227c..ce975c09f 100755 --- a/test/ipt/firewall61-1.4.fw.orig +++ b/test/ipt/firewall61-1.4.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:25 2011 PST by vadim +# Generated Mon Nov 28 12:22:30 2011 PST by vadim # # files: * firewall61-1.4.fw /etc/firewall61-1.4.fw # @@ -515,7 +515,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:25 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:30 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 843bd63e4..b7b4f6108 100755 --- a/test/ipt/firewall62.fw.orig +++ b/test/ipt/firewall62.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:25 2011 PST by vadim +# Generated Mon Nov 28 12:22:31 2011 PST by vadim # # files: * firewall62.fw /etc/firewall62.fw # @@ -591,7 +591,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:25 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:31 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 3372d78eb..a42bfcc96 100755 --- a/test/ipt/firewall63.fw.orig +++ b/test/ipt/firewall63.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:25 2011 PST by vadim +# Generated Mon Nov 28 12:22:32 2011 PST by vadim # # files: * firewall63.fw /etc/firewall63.fw # @@ -411,7 +411,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:25 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22: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 1d8f7748a..ba745ad34 100755 --- a/test/ipt/firewall7.fw.orig +++ b/test/ipt/firewall7.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:25 2011 PST by vadim +# Generated Mon Nov 28 12:22:36 2011 PST by vadim # # files: * firewall7.fw /etc/fw/firewall7.fw # @@ -495,7 +495,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:25 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:36 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 63665f643..1a996cd7a 100755 --- a/test/ipt/firewall70.fw.orig +++ b/test/ipt/firewall70.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:29 2011 PST by vadim +# Generated Mon Nov 28 12:22:37 2011 PST by vadim # # files: * firewall70.fw iptables.sh # @@ -434,7 +434,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:29 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22: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 b39409c35..7d26b0fa7 100755 --- a/test/ipt/firewall71.fw.orig +++ b/test/ipt/firewall71.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:30 2011 PST by vadim +# Generated Mon Nov 28 12:22:37 2011 PST by vadim # # files: * firewall71.fw /etc/fw/firewall71.fw # @@ -450,7 +450,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:30 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22: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 c7385bf5d..3809c1460 100755 --- a/test/ipt/firewall72-1.3.x.fw.orig +++ b/test/ipt/firewall72-1.3.x.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:30 2011 PST by vadim +# Generated Mon Nov 28 12:22:38 2011 PST by vadim # # files: * firewall72-1.3.x.fw /etc/fw/firewall72-1.3.x.fw # @@ -582,7 +582,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:30 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:38 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 d183d9648..e68639e5c 100755 --- a/test/ipt/firewall72-1.4.3.fw.orig +++ b/test/ipt/firewall72-1.4.3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:30 2011 PST by vadim +# Generated Mon Nov 28 12:22:42 2011 PST by vadim # # files: * firewall72-1.4.3.fw /etc/fw/firewall72-1.4.3.fw # @@ -582,7 +582,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:30 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:42 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 ad557fae2..aa6e69460 100755 --- a/test/ipt/firewall73.fw.orig +++ b/test/ipt/firewall73.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:34 2011 PST by vadim +# Generated Mon Nov 28 12:22:43 2011 PST by vadim # # files: * firewall73.fw /etc/fw/firewall73.fw # @@ -545,7 +545,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:34 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22: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 a044e1252..e746c2201 100755 --- a/test/ipt/firewall74.fw.orig +++ b/test/ipt/firewall74.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:34 2011 PST by vadim +# Generated Mon Nov 28 12:22:43 2011 PST by vadim # # files: * firewall74.fw /etc/fw/firewall74.fw # @@ -397,7 +397,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:34 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:43 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 7ab87adf5..774660c0d 100755 --- a/test/ipt/firewall8.fw.orig +++ b/test/ipt/firewall8.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:34 2011 PST by vadim +# Generated Mon Nov 28 12:22:44 2011 PST by vadim # # files: * firewall8.fw /etc/fw/firewall8.fw # @@ -382,7 +382,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:34 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:44 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 e50db1d3a..7b162bab9 100755 --- a/test/ipt/firewall80.fw.orig +++ b/test/ipt/firewall80.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:34 2011 PST by vadim +# Generated Mon Nov 28 12:22:48 2011 PST by vadim # # files: * firewall80.fw /etc/fw/firewall80.fw # @@ -421,7 +421,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:34 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22: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 30998b589..f3cb835dd 100755 --- a/test/ipt/firewall81.fw.orig +++ b/test/ipt/firewall81.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:38 2011 PST by vadim +# Generated Mon Nov 28 12:22:49 2011 PST by vadim # # files: * firewall81.fw /etc/fw/firewall81.fw # @@ -442,7 +442,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:38 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:49 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 2dafd0b2f..d2f31b159 100755 --- a/test/ipt/firewall82.fw.orig +++ b/test/ipt/firewall82.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:39 2011 PST by vadim +# Generated Mon Nov 28 12:22:49 2011 PST by vadim # # files: * firewall82.fw /etc/firewall82.fw # @@ -435,7 +435,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:39 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:49 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 65d2a34c1..2f6d4d922 100755 --- a/test/ipt/firewall82_A.fw.orig +++ b/test/ipt/firewall82_A.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:39 2011 PST by vadim +# Generated Mon Nov 28 12:22:50 2011 PST by vadim # # files: * firewall82_A.fw /etc/fw/firewall82_A.fw # @@ -422,7 +422,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:39 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:50 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 baa16c10b..bd25ad1aa 100755 --- a/test/ipt/firewall82_B.fw.orig +++ b/test/ipt/firewall82_B.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:39 2011 PST by vadim +# Generated Mon Nov 28 12:22:53 2011 PST by vadim # # files: * firewall82_B.fw /etc/fw/firewall82_B.fw # @@ -385,7 +385,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:39 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:53 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 a80599e59..830695ba4 100755 --- a/test/ipt/firewall9.fw.orig +++ b/test/ipt/firewall9.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:43 2011 PST by vadim +# Generated Mon Nov 28 12:22:56 2011 PST by vadim # # files: * firewall9.fw /etc/fw/firewall9.fw # @@ -643,7 +643,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:43 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:56 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 916f2d9eb..8ea044a64 100755 --- a/test/ipt/firewall90.fw.orig +++ b/test/ipt/firewall90.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:43 2011 PST by vadim +# Generated Mon Nov 28 12:22:56 2011 PST by vadim # # files: * firewall90.fw /etc/fw/firewall90.fw # @@ -405,7 +405,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:43 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:56 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 66e69cff1..b0daf2dba 100755 --- a/test/ipt/firewall91.fw.orig +++ b/test/ipt/firewall91.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:43 2011 PST by vadim +# Generated Mon Nov 28 12:22:56 2011 PST by vadim # # files: * firewall91.fw /etc/fw/firewall91.fw # @@ -405,7 +405,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:43 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:56 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 58d092dda..d1efcc253 100755 --- a/test/ipt/firewall92.fw.orig +++ b/test/ipt/firewall92.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:44 2011 PST by vadim +# Generated Mon Nov 28 12:22:58 2011 PST by vadim # # files: * firewall92.fw /etc/fw/firewall92.fw # @@ -441,7 +441,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:44 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:58 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 1d33eb130..7c4accad0 100755 --- a/test/ipt/firewall93.fw.orig +++ b/test/ipt/firewall93.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:47 2011 PST by vadim +# Generated Mon Nov 28 12:23:02 2011 PST by vadim # # files: * firewall93.fw /etc/fw/firewall93.fw # @@ -484,7 +484,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:47 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:02 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall94.fw.orig b/test/ipt/firewall94.fw.orig index 01b200e32..15631cffe 100755 --- a/test/ipt/firewall94.fw.orig +++ b/test/ipt/firewall94.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:48 2011 PST by vadim +# Generated Mon Nov 28 12:23:02 2011 PST by vadim # # files: * firewall94.fw /etc/fw/firewall94.fw # @@ -536,7 +536,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:58:48 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:02 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall95.fw.orig b/test/ipt/firewall95.fw.orig index c79002b38..f1d054914 100755 --- a/test/ipt/firewall95.fw.orig +++ b/test/ipt/firewall95.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Wed Nov 16 10:13:00 2011 PST by vadim +# Generated Mon Nov 28 12:23:02 2011 PST by vadim # # files: * firewall95.fw /etc/fw/firewall95.fw # @@ -393,7 +393,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Wed Nov 16 10:13:00 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:02 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 8f2011d20..d2abf8081 100755 --- a/test/ipt/fw-A.fw.orig +++ b/test/ipt/fw-A.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:15 2011 PST by vadim +# Generated Mon Nov 28 12:23:35 2011 PST by vadim # # files: * fw-A.fw /sw/FWbuilder/fw-A.fw # @@ -746,7 +746,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:15 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:35 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 93f3d686c..025ba61fc 100755 --- a/test/ipt/fw1.fw.orig +++ b/test/ipt/fw1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:15 2011 PST by vadim +# Generated Mon Nov 28 12:23:35 2011 PST by vadim # # files: * fw1.fw /etc/fw1.fw # @@ -547,7 +547,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:15 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23: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 d03c9cc1c..18c5d499c 100755 --- a/test/ipt/fwbuilder.fw.orig +++ b/test/ipt/fwbuilder.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:58:10 2011 PST by vadim +# Generated Mon Nov 28 12:22:15 2011 PST by vadim # # files: * fwbuilder.fw /etc/init.d/fwbuilder.fw # @@ -505,7 +505,7 @@ status_action() { } start() { - log "Activating firewall script generated Thu Nov 10 11:58:10 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:22:15 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 f69a94002..05bcb365c 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 @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:22 2011 PST by vadim +# Generated Mon Nov 28 12:23:44 2011 PST by vadim # # files: * heartbeat_cluster_1_d_linux-1-d.fw firewall.sh # @@ -748,7 +748,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:22 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:44 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 70ffe216b..9ae82e840 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 @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:22 2011 PST by vadim +# Generated Mon Nov 28 12:23:44 2011 PST by vadim # # files: * heartbeat_cluster_1_d_linux-2-d.fw firewall.sh # @@ -750,7 +750,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:22 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:44 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 57e8547ed..22d548766 100755 --- a/test/ipt/heartbeat_cluster_1_linux-1.fw.orig +++ b/test/ipt/heartbeat_cluster_1_linux-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:21 2011 PST by vadim +# Generated Mon Nov 28 12:23:43 2011 PST by vadim # # files: * heartbeat_cluster_1_linux-1.fw /etc/heartbeat_cluster_1_linux-1.fw # @@ -865,7 +865,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:21 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:43 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 6e61cbb05..3c7958dd4 100755 --- a/test/ipt/heartbeat_cluster_1_linux-2.fw.orig +++ b/test/ipt/heartbeat_cluster_1_linux-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:22 2011 PST by vadim +# Generated Mon Nov 28 12:23:43 2011 PST by vadim # # files: * heartbeat_cluster_1_linux-2.fw /etc/heartbeat_cluster_1_linux-2.fw # @@ -763,7 +763,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:22 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:43 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 5df689ad9..1a17ead80 100755 --- a/test/ipt/heartbeat_cluster_2_linux-1.fw.orig +++ b/test/ipt/heartbeat_cluster_2_linux-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:23 2011 PST by vadim +# Generated Mon Nov 28 12:23:45 2011 PST by vadim # # files: * heartbeat_cluster_2_linux-1.fw /etc/heartbeat_cluster_2_linux-1.fw # @@ -729,7 +729,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:23 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:45 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 a6c8259e3..63007b176 100755 --- a/test/ipt/heartbeat_cluster_2_linux-2.fw.orig +++ b/test/ipt/heartbeat_cluster_2_linux-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:23 2011 PST by vadim +# Generated Mon Nov 28 12:23:45 2011 PST by vadim # # files: * heartbeat_cluster_2_linux-2.fw /etc/heartbeat_cluster_2_linux-2.fw # @@ -642,7 +642,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:23 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:45 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 3900840ea..667ab3c25 100755 --- a/test/ipt/host.fw.orig +++ b/test/ipt/host.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:19 2011 PST by vadim +# Generated Mon Nov 28 12:23:39 2011 PST by vadim # # files: * host.fw /etc/fw/host.fw # @@ -444,7 +444,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:19 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:39 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 1537344e7..4fa0df3fe 100644 --- a/test/ipt/objects-for-regression-tests.fwb +++ b/test/ipt/objects-for-regression-tests.fwb @@ -1,6 +1,6 @@ - + @@ -4868,6 +4868,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -65557,6 +65578,387 @@ 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 68a1ff536..cc4d995ff 100755 --- a/test/ipt/openais_cluster_1_linux-1.fw.orig +++ b/test/ipt/openais_cluster_1_linux-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:24 2011 PST by vadim +# Generated Mon Nov 28 12:23:46 2011 PST by vadim # # files: * openais_cluster_1_linux-1.fw /etc/openais_cluster_1_linux-1.fw # @@ -729,7 +729,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:24 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:46 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 713ef1c2e..675734ecb 100755 --- a/test/ipt/openais_cluster_1_linux-2.fw.orig +++ b/test/ipt/openais_cluster_1_linux-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:24 2011 PST by vadim +# Generated Mon Nov 28 12:23:46 2011 PST by vadim # # files: * openais_cluster_1_linux-2.fw /etc/openais_cluster_1_linux-2.fw # @@ -633,7 +633,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:24 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:46 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 3bc3b8ded..dec949210 100755 --- a/test/ipt/rc.firewall.local +++ b/test/ipt/rc.firewall.local @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Wed Nov 16 10:13:40 2011 PST by vadim +# Generated Mon Nov 28 12:23:41 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 13f26366e..24004cbf8 100755 --- a/test/ipt/rh90.fw.orig +++ b/test/ipt/rh90.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:20 2011 PST by vadim +# Generated Mon Nov 28 12:23:41 2011 PST by vadim # # files: * rh90.fw /etc/rh90.fw # @@ -443,7 +443,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:20 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:41 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 822bfc87c..fcab93313 100755 --- a/test/ipt/secuwall_cluster_1_secuwall-1.fw.orig +++ b/test/ipt/secuwall_cluster_1_secuwall-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:24 2011 PST by vadim +# Generated Mon Nov 28 12:23:46 2011 PST by vadim # # files: * secuwall_cluster_1_secuwall-1.fw /etc/secuwall_cluster_1_secuwall-1.fw # @@ -427,7 +427,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:24 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:46 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 0c8d08dbf..b09b58c8e 100755 --- a/test/ipt/server-cluster-1_server-1.fw.orig +++ b/test/ipt/server-cluster-1_server-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:25 2011 PST by vadim +# Generated Mon Nov 28 12:23:47 2011 PST by vadim # # files: * server-cluster-1_server-1.fw /etc/fw/server-cluster-1_server-1.fw # @@ -422,7 +422,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:25 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:47 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 579ea629f..3f36d37d9 100755 --- a/test/ipt/server-cluster-1_server-2.fw.orig +++ b/test/ipt/server-cluster-1_server-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:25 2011 PST by vadim +# Generated Mon Nov 28 12:23:47 2011 PST by vadim # # files: * server-cluster-1_server-2.fw /etc/fw/server-cluster-1_server-2.fw # @@ -419,7 +419,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:25 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:47 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 f8d531fb3..97aef5ef0 100755 --- a/test/ipt/test-shadowing-1.fw.orig +++ b/test/ipt/test-shadowing-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:24 2011 PST by vadim +# Generated Mon Nov 28 12:23:45 2011 PST by vadim # # files: * test-shadowing-1.fw /etc/test-shadowing-1.fw # @@ -493,7 +493,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:24 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:45 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 c529cc9a4..fdeb281ec 100755 --- a/test/ipt/test-shadowing-2.fw.orig +++ b/test/ipt/test-shadowing-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:24 2011 PST by vadim +# Generated Mon Nov 28 12:23:47 2011 PST by vadim # # files: * test-shadowing-2.fw /etc/test-shadowing-2.fw # @@ -451,7 +451,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:24 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:47 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 2ba0bfc74..3731f0631 100755 --- a/test/ipt/test-shadowing-3.fw.orig +++ b/test/ipt/test-shadowing-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3588 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Mon Nov 21 11:52:38 2011 PST by vadim +# Generated Mon Nov 28 12:23:47 2011 PST by vadim # # files: * test-shadowing-3.fw /etc/test-shadowing-3.fw # @@ -552,7 +552,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Nov 21 11:52:38 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:47 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 394d0e8fb..2821d54d4 100755 --- a/test/ipt/test_fw.fw.orig +++ b/test/ipt/test_fw.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:20 2011 PST by vadim +# Generated Mon Nov 28 12:23:41 2011 PST by vadim # # files: * test_fw.fw /etc/test_fw.fw # @@ -592,7 +592,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:20 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:41 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 e211a02e2..03e792e95 100755 --- a/test/ipt/vrrp_cluster_1_linux-1.fw.orig +++ b/test/ipt/vrrp_cluster_1_linux-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:25 2011 PST by vadim +# Generated Mon Nov 28 12:23:47 2011 PST by vadim # # files: * vrrp_cluster_1_linux-1.fw /etc/vrrp_cluster_1_linux-1.fw # @@ -732,7 +732,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:25 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:47 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 0ba883178..468ae3bf7 100755 --- a/test/ipt/vrrp_cluster_1_linux-2.fw.orig +++ b/test/ipt/vrrp_cluster_1_linux-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:25 2011 PST by vadim +# Generated Mon Nov 28 12:23:47 2011 PST by vadim # # files: * vrrp_cluster_1_linux-2.fw /etc/vrrp_cluster_1_linux-2.fw # @@ -637,7 +637,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:25 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:47 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 768098e15..c1a70b8e0 100755 --- a/test/ipt/vrrp_cluster_2_linux-1.fw.orig +++ b/test/ipt/vrrp_cluster_2_linux-1.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:25 2011 PST by vadim +# Generated Mon Nov 28 12:23:47 2011 PST by vadim # # files: * vrrp_cluster_2_linux-1.fw /etc/vrrp_cluster_2_linux-1.fw # @@ -664,7 +664,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:25 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:47 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 b8f3b2416..87e0ed6ec 100755 --- a/test/ipt/vrrp_cluster_2_linux-2.fw.orig +++ b/test/ipt/vrrp_cluster_2_linux-2.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:25 2011 PST by vadim +# Generated Mon Nov 28 12:23:47 2011 PST by vadim # # files: * vrrp_cluster_2_linux-2.fw /etc/vrrp_cluster_2_linux-2.fw # @@ -569,7 +569,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:25 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:47 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 d51202b46..094e70703 100755 --- a/test/ipt/vrrp_cluster_2_linux-3.fw.orig +++ b/test/ipt/vrrp_cluster_2_linux-3.fw.orig @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.1.3585 +# Firewall Builder fwb_ipt v5.0.1.3590 # -# Generated Thu Nov 10 11:59:25 2011 PST by vadim +# Generated Mon Nov 28 12:23:47 2011 PST by vadim # # files: * vrrp_cluster_2_linux-3.fw /etc/vrrp_cluster_2_linux-3.fw # @@ -545,7 +545,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Thu Nov 10 11:59:25 2011 by vadim" + log "Activating firewall script generated Mon Nov 28 12:23:47 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files