From 99498dc90beccde263920166abe2957e66c88b8c Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Thu, 10 Nov 2011 12:06:08 -0800 Subject: [PATCH] fixes #2664 Update error message when "which" command fails. Generated iptables script uses "which" to check if all utilities it uses exist on the machine. We should also check if "which" itself exists and issue meaningful error message if not. --- doc/ChangeLog | 6 ++++++ src/res/configlets/dd-wrt-jffs/check_utilities | 3 ++- src/res/configlets/dd-wrt-nvram/check_utilities | 3 ++- src/res/configlets/linux24/check_utilities | 5 +++-- src/res/configlets/openwrt/check_utilities | 3 ++- test/ipt/cluster1_secuwall-1.fw.orig | 11 ++++++----- test/ipt/firewall-base-rulesets.fw.orig | 11 ++++++----- test/ipt/firewall-ipv6-1.fw.orig | 11 ++++++----- test/ipt/firewall-ipv6-2.fw.orig | 11 ++++++----- test/ipt/firewall-ipv6-3.fw.orig | 11 ++++++----- test/ipt/firewall-ipv6-4-1.fw.orig | 11 ++++++----- test/ipt/firewall-ipv6-4.fw.orig | 11 ++++++----- test/ipt/firewall-ipv6-5.fw.orig | 11 ++++++----- test/ipt/firewall-ipv6-6.fw.orig | 11 ++++++----- test/ipt/firewall-ipv6-7.fw.orig | 11 ++++++----- test/ipt/firewall-ipv6-8.fw.orig | 11 ++++++----- ...firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig | 11 ++++++----- ...all-ipv6-ipt-reset-prolog-after-interfaces.fw.orig | 11 ++++++----- test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig | 11 ++++++----- test/ipt/firewall-ipv6-nd-ns-1.fw.orig | 11 ++++++----- test/ipt/firewall-ipv6-nd-ns-2.fw.orig | 11 ++++++----- test/ipt/firewall-ipv6-prolog-after-flush.fw.orig | 11 ++++++----- .../ipt/firewall-ipv6-prolog-after-interfaces.fw.orig | 11 ++++++----- test/ipt/firewall-ipv6-prolog-top.fw.orig | 11 ++++++----- test/ipt/firewall-server-1-s.fw.orig | 11 ++++++----- test/ipt/firewall.fw.orig | 11 ++++++----- test/ipt/firewall1.fw.orig | 9 +++++---- test/ipt/firewall10.fw.orig | 9 +++++---- test/ipt/firewall11.fw.orig | 9 +++++---- test/ipt/firewall12.fw.orig | 11 ++++++----- test/ipt/firewall13.fw.orig | 11 ++++++----- test/ipt/firewall14.fw.orig | 11 ++++++----- test/ipt/firewall15.fw.orig | 11 ++++++----- test/ipt/firewall16.fw.orig | 11 ++++++----- test/ipt/firewall17.fw.orig | 9 +++++---- test/ipt/firewall18.fw.orig | 11 ++++++----- test/ipt/firewall19.fw.orig | 11 ++++++----- test/ipt/firewall2-1.fw.orig | 9 +++++---- test/ipt/firewall2-2.fw.orig | 9 +++++---- test/ipt/firewall2-3.fw.orig | 9 +++++---- test/ipt/firewall2-4.fw.orig | 9 +++++---- test/ipt/firewall2-5.fw.orig | 9 +++++---- test/ipt/firewall2-6.fw.orig | 9 +++++---- test/ipt/firewall2-7.fw.orig | 9 +++++---- test/ipt/firewall2.fw.orig | 9 +++++---- test/ipt/firewall20-ipv6.fw.orig | 9 +++++---- test/ipt/firewall20.fw.orig | 9 +++++---- test/ipt/firewall21-1.fw.orig | 9 +++++---- test/ipt/firewall21.fw.orig | 9 +++++---- test/ipt/firewall22.fw.orig | 9 +++++---- test/ipt/firewall23-1.fw.orig | 9 +++++---- test/ipt/firewall23.fw.orig | 9 +++++---- test/ipt/firewall24.fw.orig | 9 +++++---- test/ipt/firewall25.fw.orig | 9 +++++---- test/ipt/firewall26.fw.orig | 9 +++++---- test/ipt/firewall27.fw.orig | 9 +++++---- test/ipt/firewall28.fw.orig | 11 ++++++----- test/ipt/firewall29.fw.orig | 9 +++++---- test/ipt/firewall3.fw.orig | 9 +++++---- test/ipt/firewall30.fw.orig | 9 +++++---- test/ipt/firewall31.fw.orig | 11 ++++++----- test/ipt/firewall32.fw.orig | 9 +++++---- test/ipt/firewall33-1.fw.orig | 11 ++++++----- test/ipt/firewall33.fw.orig | 9 +++++---- test/ipt/firewall34.fw.orig | 9 +++++---- test/ipt/firewall35.fw.orig | 9 +++++---- test/ipt/firewall36-1.fw.orig | 11 ++++++----- test/ipt/firewall36-2.fw.orig | 11 ++++++----- test/ipt/firewall36.fw.orig | 11 ++++++----- test/ipt/firewall37-1.fw.orig | 11 ++++++----- test/ipt/firewall37-2.fw.orig | 11 ++++++----- test/ipt/firewall37.fw.orig | 11 ++++++----- test/ipt/firewall38.fw.orig | 11 ++++++----- test/ipt/firewall39.fw.orig | 11 ++++++----- test/ipt/firewall4.fw.orig | 9 +++++---- test/ipt/firewall40-1.fw.orig | 11 ++++++----- test/ipt/firewall40-2.fw.orig | 11 ++++++----- test/ipt/firewall40.fw.orig | 11 ++++++----- test/ipt/firewall41-1.fw.orig | 11 ++++++----- test/ipt/firewall41.fw.orig | 11 ++++++----- test/ipt/firewall42.fw.orig | 9 +++++---- test/ipt/firewall5.fw.orig | 9 +++++---- test/ipt/firewall50.fw.orig | 9 +++++---- test/ipt/firewall51.fw.orig | 9 +++++---- test/ipt/firewall6.fw.orig | 9 +++++---- test/ipt/firewall60.fw.orig | 11 ++++++----- test/ipt/firewall61-1.2.5.fw.orig | 11 ++++++----- test/ipt/firewall61-1.2.6.fw.orig | 11 ++++++----- test/ipt/firewall61-1.3.x.fw.orig | 11 ++++++----- test/ipt/firewall61-1.4.fw.orig | 11 ++++++----- test/ipt/firewall62.fw.orig | 11 ++++++----- test/ipt/firewall63.fw.orig | 11 ++++++----- test/ipt/firewall7.fw.orig | 9 +++++---- test/ipt/firewall70.fw.orig | 11 ++++++----- test/ipt/firewall71.fw.orig | 9 +++++---- test/ipt/firewall72-1.3.x.fw.orig | 11 ++++++----- test/ipt/firewall72-1.4.3.fw.orig | 11 ++++++----- test/ipt/firewall73.fw.orig | 11 ++++++----- test/ipt/firewall74.fw.orig | 9 +++++---- test/ipt/firewall8.fw.orig | 11 ++++++----- test/ipt/firewall80.fw.orig | 9 +++++---- test/ipt/firewall81.fw.orig | 9 +++++---- test/ipt/firewall82.fw.orig | 11 ++++++----- test/ipt/firewall82_A.fw.orig | 11 ++++++----- test/ipt/firewall82_B.fw.orig | 11 ++++++----- test/ipt/firewall9.fw.orig | 9 +++++---- test/ipt/firewall90.fw.orig | 11 ++++++----- test/ipt/firewall91.fw.orig | 11 ++++++----- test/ipt/firewall92.fw.orig | 11 ++++++----- test/ipt/firewall93.fw.orig | 11 ++++++----- test/ipt/firewall94.fw.orig | 11 ++++++----- test/ipt/firewall95.fw.orig | 11 ++++++----- test/ipt/fw-A.fw.orig | 11 ++++++----- test/ipt/fw1.fw.orig | 11 ++++++----- test/ipt/fwbuilder.fw.orig | 9 +++++---- test/ipt/heartbeat_cluster_1_d_linux-1-d.fw.orig | 11 ++++++----- test/ipt/heartbeat_cluster_1_d_linux-2-d.fw.orig | 11 ++++++----- test/ipt/heartbeat_cluster_1_linux-1.fw.orig | 11 ++++++----- test/ipt/heartbeat_cluster_1_linux-2.fw.orig | 11 ++++++----- test/ipt/heartbeat_cluster_2_linux-1.fw.orig | 11 ++++++----- test/ipt/heartbeat_cluster_2_linux-2.fw.orig | 11 ++++++----- test/ipt/host.fw.orig | 11 ++++++----- test/ipt/openais_cluster_1_linux-1.fw.orig | 11 ++++++----- test/ipt/openais_cluster_1_linux-2.fw.orig | 11 ++++++----- test/ipt/rh90.fw.orig | 11 ++++++----- test/ipt/secuwall_cluster_1_secuwall-1.fw.orig | 11 ++++++----- test/ipt/server-cluster-1_server-1.fw.orig | 11 ++++++----- test/ipt/server-cluster-1_server-2.fw.orig | 11 ++++++----- test/ipt/test-shadowing-1.fw.orig | 11 ++++++----- test/ipt/test-shadowing-2.fw.orig | 11 ++++++----- test/ipt/test-shadowing-3.fw.orig | 11 ++++++----- test/ipt/test_fw.fw.orig | 11 ++++++----- test/ipt/vrrp_cluster_1_linux-1.fw.orig | 11 ++++++----- test/ipt/vrrp_cluster_1_linux-2.fw.orig | 11 ++++++----- test/ipt/vrrp_cluster_2_linux-1.fw.orig | 11 ++++++----- test/ipt/vrrp_cluster_2_linux-2.fw.orig | 11 ++++++----- test/ipt/vrrp_cluster_2_linux-3.fw.orig | 11 ++++++----- 137 files changed, 764 insertions(+), 622 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index e2be1c096..052312cde 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,11 @@ 2011-11-10 Vadim Kurland + * configlets/linux24/check_utilities: fixes #2664 Update error + message when "which" command fails. Generated iptables script uses + "which" to check if all utilities it uses exist on the machine. + We should also check if "which" itself exists and issue meaningful + error message if not. + * IC_PlatformWarningPage.cpp (initializePage): fixes #2668 Remove "static routes" from the explanation text in ASA/PIX import dialog. We can not import PIX/ASA routing configuration at this diff --git a/src/res/configlets/dd-wrt-jffs/check_utilities b/src/res/configlets/dd-wrt-jffs/check_utilities index 9b46877f6..8a0b66c26 100644 --- a/src/res/configlets/dd-wrt-jffs/check_utilities +++ b/src/res/configlets/dd-wrt-jffs/check_utilities @@ -32,12 +32,13 @@ find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES {{if need_iptables_restore}} find_program $IPTABLES_RESTORE{{endif}} {{if need_ip6tables_restore}} find_program $IP6TABLES_RESTORE{{endif}} diff --git a/src/res/configlets/dd-wrt-nvram/check_utilities b/src/res/configlets/dd-wrt-nvram/check_utilities index 7d8d50de3..c87092240 100644 --- a/src/res/configlets/dd-wrt-nvram/check_utilities +++ b/src/res/configlets/dd-wrt-nvram/check_utilities @@ -31,12 +31,13 @@ find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES {{if need_iptables_restore}} find_program $IPTABLES_RESTORE{{endif}} {{if need_ip6tables_restore}} find_program $IP6TABLES_RESTORE{{endif}} diff --git a/src/res/configlets/linux24/check_utilities b/src/res/configlets/linux24/check_utilities index c198665bc..ae7fc51e4 100644 --- a/src/res/configlets/linux24/check_utilities +++ b/src/res/configlets/linux24/check_utilities @@ -31,16 +31,17 @@ find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES {{if need_iptables_restore}} find_program $IPTABLES_RESTORE{{endif}} {{if need_ip6tables_restore}} find_program $IP6TABLES_RESTORE{{endif}} -{{if need_modprobe}} find_program $MODPROBE {{endif}} +{{if need_modprobe}} find_program $MODPROBE {{endif}} find_program $IP {{if need_vconfig}} find_program $VCONFIG {{endif}} {{if need_brctl}} find_program $BRCTL {{endif}} diff --git a/src/res/configlets/openwrt/check_utilities b/src/res/configlets/openwrt/check_utilities index aebc31110..3b284bb33 100644 --- a/src/res/configlets/openwrt/check_utilities +++ b/src/res/configlets/openwrt/check_utilities @@ -15,12 +15,13 @@ find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IP {{if need_vconfig}} find_program $VCONFIG {{endif}} {{if need_brctl}} find_program $BRCTL {{endif}} diff --git a/test/ipt/cluster1_secuwall-1.fw.orig b/test/ipt/cluster1_secuwall-1.fw.orig index df70d80c4..8d0ec51d8 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:40 2011 PST by vadim +# Generated Thu Nov 10 11:59:21 2011 PST by vadim # # files: * cluster1_secuwall-1.fw /etc/cluster1_secuwall-1.fw # @@ -116,13 +116,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -609,7 +610,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:40 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:21 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 d295a3481..43fa90623 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:04 2011 PST by vadim +# Generated Thu Nov 10 11:58:48 2011 PST by vadim # # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -466,7 +467,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:04 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:48 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 334ba3cd1..749176565 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:06 2011 PST by vadim +# Generated Thu Nov 10 11:58:53 2011 PST by vadim # # files: * firewall-ipv6-1.fw /etc/firewall-ipv6-1.fw # @@ -147,13 +147,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -723,7 +724,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:06 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:53 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 0659631be..fdf35daa8 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:06 2011 PST by vadim +# Generated Thu Nov 10 11:58:54 2011 PST by vadim # # files: * firewall-ipv6-2.fw /etc/firewall-ipv6-2.fw # @@ -175,13 +175,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -987,7 +988,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:06 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:54 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 eee50caf3..2df8f36b6 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:11 2011 PST by vadim +# Generated Thu Nov 10 11:58:54 2011 PST by vadim # # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw # @@ -124,13 +124,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -617,7 +618,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:11 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:54 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 98f0308fc..317aa0503 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:12 2011 PST by vadim +# Generated Thu Nov 10 11:58:59 2011 PST by vadim # # files: * firewall-ipv6-4-1.fw /etc/firewall-ipv6-4-1.fw # @@ -126,15 +126,16 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP6TABLES_RESTORE - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -568,7 +569,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:12 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:59 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 e8d8132d8..2a98f0ea4 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:11 2011 PST by vadim +# Generated Thu Nov 10 11:58:54 2011 PST by vadim # # files: * firewall-ipv6-4.fw /etc/firewall-ipv6-4.fw # @@ -124,15 +124,16 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP6TABLES_RESTORE - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -604,7 +605,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:11 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:54 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 a380a8c63..f4b058e46 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:11 2011 PST by vadim +# Generated Thu Nov 10 11:58:59 2011 PST by vadim # # files: * firewall-ipv6-5.fw /etc/firewall-ipv6-5.fw # @@ -117,13 +117,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -433,7 +434,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:11 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:59 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 aaf322764..a54a4db42 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:17 2011 PST by vadim +# Generated Thu Nov 10 11:58:59 2011 PST by vadim # # files: * firewall-ipv6-6.fw /etc/firewall-ipv6-6.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -422,7 +423,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:17 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:59 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 fce44134b..1bb99a33b 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:17 2011 PST by vadim +# Generated Thu Nov 10 11:58:59 2011 PST by vadim # # files: * firewall-ipv6-7.fw /etc/firewall-ipv6-7.fw # @@ -115,15 +115,16 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP6TABLES_RESTORE - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -466,7 +467,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:17 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:59 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 7b3713ca5..ba9892ca0 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:17 2011 PST by vadim +# Generated Thu Nov 10 11:59:04 2011 PST by vadim # # files: * firewall-ipv6-8.fw /etc/firewall-ipv6-8.fw # @@ -115,15 +115,16 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP6TABLES_RESTORE - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -539,7 +540,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:17 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:04 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 34ff79daa..96b0e76b1 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:17 2011 PST by vadim +# Generated Thu Nov 10 11:59:04 2011 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-after-flush.fw /etc/firewall-ipv6-ipt-reset-prolog-after-flush.fw # @@ -115,15 +115,16 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP6TABLES_RESTORE - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -463,7 +464,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:17 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:04 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 b98682c83..6d72a6792 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:22 2011 PST by vadim +# Generated Thu Nov 10 11:59:04 2011 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-after-interfaces.fw /etc/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw # @@ -115,15 +115,16 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP6TABLES_RESTORE - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -463,7 +464,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:22 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:04 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 94d374c00..d03b4fbdc 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:23 2011 PST by vadim +# Generated Thu Nov 10 11:59:04 2011 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-top.fw /etc/firewall-ipv6-ipt-reset-prolog-top.fw # @@ -115,15 +115,16 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP6TABLES_RESTORE - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -463,7 +464,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:23 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:04 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 0372ced01..ddaa4d400 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:22 2011 PST by vadim +# Generated Thu Nov 10 11:59:09 2011 PST by vadim # # files: * firewall-ipv6-nd-ns-1.fw /etc/firewall-ipv6-nd-ns-1.fw # @@ -115,15 +115,16 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP6TABLES_RESTORE - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -463,7 +464,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:22 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:09 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 d5c165989..cd2b636ef 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:23 2011 PST by vadim +# Generated Thu Nov 10 11:59:09 2011 PST by vadim # # files: * firewall-ipv6-nd-ns-2.fw /etc/firewall-ipv6-nd-ns-2.fw # @@ -115,15 +115,16 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP6TABLES_RESTORE - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -467,7 +468,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:23 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:09 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 3fee351b2..9919e2c4d 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:27 2011 PST by vadim +# Generated Thu Nov 10 11:59:10 2011 PST by vadim # # files: * firewall-ipv6-prolog-after-flush.fw /etc/firewall-ipv6-prolog-after-flush.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -441,7 +442,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:27 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:10 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 f0107d08f..224dd7d62 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:28 2011 PST by vadim +# Generated Thu Nov 10 11:59:10 2011 PST by vadim # # files: * firewall-ipv6-prolog-after-interfaces.fw /etc/firewall-ipv6-prolog-after-interfaces.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -441,7 +442,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:28 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:10 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 13a919e39..5c1bd9018 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:28 2011 PST by vadim +# Generated Thu Nov 10 11:59:15 2011 PST by vadim # # files: * firewall-ipv6-prolog-top.fw /etc/firewall-ipv6-prolog-top.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -441,7 +442,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:28 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:15 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 c5d5bf486..c26112db8 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:28 2011 PST by vadim +# Generated Thu Nov 10 11:59:15 2011 PST by vadim # # files: * firewall-server-1-s.fw /etc/fw/firewall-server-1-s.fw # @@ -118,13 +118,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -414,7 +415,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:28 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:15 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 904e5c369..70f81ac5c 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:03 2011 PST by vadim +# Generated Thu Nov 10 11:57:03 2011 PST by vadim # # files: * firewall.fw /etc/fw/firewall.fw # @@ -145,13 +145,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -1397,7 +1398,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:03 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:03 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 a7d5b43d3..b8d7ee2fc 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:03 2011 PST by vadim +# Generated Thu Nov 10 11:57:03 2011 PST by vadim # # files: * firewall1.fw /etc/fw/firewall1.fw # @@ -116,11 +116,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -1269,7 +1270,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:03 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:03 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 1e7880e54..51ae36017 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:02 2011 PST by vadim +# Generated Thu Nov 10 11:57:02 2011 PST by vadim # # files: * firewall10.fw /etc/fw/firewall10.fw # @@ -117,11 +117,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -494,7 +495,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:02 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:02 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 117dd65eb..d08cdba7c 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:08 2011 PST by vadim +# Generated Thu Nov 10 11:57:07 2011 PST by vadim # # files: * firewall11.fw /etc/fw/firewall11.fw # @@ -120,11 +120,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -614,7 +615,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:08 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:07 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 c05b1800a..e8d2e952b 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:08 2011 PST by vadim +# Generated Thu Nov 10 11:57:07 2011 PST by vadim # # files: * firewall12.fw /etc/fw/firewall12.fw # @@ -129,13 +129,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -532,7 +533,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:08 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:07 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 b6d29a721..ec54e5e54 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:08 2011 PST by vadim +# Generated Thu Nov 10 11:57:07 2011 PST by vadim # # files: * firewall13.fw /etc/fw/firewall13.fw # @@ -127,13 +127,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -406,7 +407,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:08 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:07 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 71dbd5fc1..7cbb69a80 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:08 2011 PST by vadim +# Generated Thu Nov 10 11:57:07 2011 PST by vadim # # files: * firewall14.fw /etc/fw/firewall14.fw # @@ -116,13 +116,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -425,7 +426,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:08 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:07 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 a314a8565..70c6fab0d 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:13 2011 PST by vadim +# Generated Thu Nov 10 11:57:12 2011 PST by vadim # # files: * firewall15.fw /etc/fw/firewall15.fw # @@ -117,13 +117,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -409,7 +410,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:13 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:12 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 35aafac22..acbc138be 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:14 2011 PST by vadim +# Generated Thu Nov 10 11:57:12 2011 PST by vadim # # files: * firewall16.fw /etc/fw/firewall16.fw # @@ -117,13 +117,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -513,7 +514,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:14 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:12 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 10d8076b2..f63b19447 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:14 2011 PST by vadim +# Generated Thu Nov 10 11:57:12 2011 PST by vadim # # files: * firewall17.fw /etc/fw/firewall17.fw # @@ -126,11 +126,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -492,7 +493,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:14 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:12 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 36a03ab83..eae65ba21 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:14 2011 PST by vadim +# Generated Thu Nov 10 11:57:12 2011 PST by vadim # # files: * firewall18.fw /etc/fw/firewall18.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -527,7 +528,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:14 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:12 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 dc06ae2ec..432feb7ee 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:19 2011 PST by vadim +# Generated Thu Nov 10 11:57:17 2011 PST by vadim # # files: * firewall19.fw /etc/fw/firewall19.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -531,7 +532,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:19 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:17 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 b70d4ee9f..7d22b05c2 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:27 2011 PST by vadim +# Generated Thu Nov 10 11:57:24 2011 PST by vadim # # files: * firewall2-1.fw /etc/fw/firewall2-1.fw # @@ -138,11 +138,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -1451,7 +1452,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:27 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:24 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 2fe42f171..4c834d63a 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:31 2011 PST by vadim +# Generated Thu Nov 10 11:57:29 2011 PST by vadim # # files: * firewall2-2.fw /etc/fw/firewall2-2.fw # @@ -138,11 +138,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -1281,7 +1282,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:31 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:29 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 eece02268..6d887673e 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:33 2011 PST by vadim +# Generated Thu Nov 10 11:57:29 2011 PST by vadim # # files: * firewall2-3.fw /etc/fw/firewall2-3.fw # @@ -122,11 +122,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -1139,7 +1140,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:33 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:29 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 3446805de..15b05bb73 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:38 2011 PST by vadim +# Generated Thu Nov 10 11:57:34 2011 PST by vadim # # files: * firewall2-4.fw /etc/fw/firewall2-4.fw # @@ -129,11 +129,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -445,7 +446,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:38 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:34 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 429b37293..f8927f0f9 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:38 2011 PST by vadim +# Generated Thu Nov 10 11:57:34 2011 PST by vadim # # files: * firewall2-5.fw /etc/fw/firewall2-5.fw # @@ -119,11 +119,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -476,7 +477,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:38 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:34 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 c0c2a32bf..589c2923a 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:44 2011 PST by vadim +# Generated Thu Nov 10 11:57:39 2011 PST by vadim # # files: * firewall2-6.fw /etc/fw/firewall2-6.fw # @@ -129,11 +129,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -501,7 +502,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:44 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:39 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 20fb9d61f..31a819b92 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:44 2011 PST by vadim +# Generated Thu Nov 10 11:57:39 2011 PST by vadim # # files: * firewall2-7.fw /etc/fw/firewall2-7.fw # @@ -115,11 +115,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -441,7 +442,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:44 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:39 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 dd092e75f..f0afad223 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:21 2011 PST by vadim +# Generated Thu Nov 10 11:57:18 2011 PST by vadim # # files: * firewall2.fw /etc/fw/firewall2.fw # @@ -147,11 +147,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -1503,7 +1504,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:21 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:18 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 8b265a33d..58782d496 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:19 2011 PST by vadim +# Generated Thu Nov 10 11:57:17 2011 PST by vadim # # files: * firewall20-ipv6.fw /etc/fw/firewall20-ipv6.fw # @@ -118,11 +118,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -477,7 +478,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:19 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:17 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 a7520fadc..b5b04c00c 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:19 2011 PST by vadim +# Generated Thu Nov 10 11:57:17 2011 PST by vadim # # files: * firewall20.fw /etc/fw/firewall20.fw # @@ -125,11 +125,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -695,7 +696,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:19 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:17 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 0fa97a854..632a4620b 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:26 2011 PST by vadim +# Generated Thu Nov 10 11:57:23 2011 PST by vadim # # files: * firewall21-1.fw /etc/fw/firewall21-1.fw # @@ -117,11 +117,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -495,7 +496,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:26 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:23 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 f79d30806..0719d8e49 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:25 2011 PST by vadim +# Generated Thu Nov 10 11:57:23 2011 PST by vadim # # files: * firewall21.fw /etc/fw/firewall21.fw # @@ -116,11 +116,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -494,7 +495,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:25 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:23 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 541d24edb..a31f33b95 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:26 2011 PST by vadim +# Generated Thu Nov 10 11:57:23 2011 PST by vadim # # files: * firewall22.fw /etc/fw/firewall22.fw # @@ -115,11 +115,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -411,7 +412,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:26 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:23 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 93b6be400..d6be637a0 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:32 2011 PST by vadim +# Generated Thu Nov 10 11:57:29 2011 PST by vadim # # files: * firewall23-1.fw /etc/fw/firewall23-1.fw # @@ -116,11 +116,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -585,7 +586,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:32 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:29 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall23.fw.orig b/test/ipt/firewall23.fw.orig index ac4f91d25..fc01cc68e 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:32 2011 PST by vadim +# Generated Thu Nov 10 11:57:29 2011 PST by vadim # # files: * firewall23.fw /etc/fw/firewall23.fw # @@ -115,11 +115,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -497,7 +498,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:32 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:29 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 0733f0cc2..18942e44e 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:37 2011 PST by vadim +# Generated Thu Nov 10 11:57:34 2011 PST by vadim # # files: * firewall24.fw /etc/fw/firewall24.fw # @@ -115,11 +115,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -514,7 +515,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:37 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:34 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 2c7607096..b630e58e4 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:38 2011 PST by vadim +# Generated Thu Nov 10 11:57:34 2011 PST by vadim # # files: * firewall25.fw /etc/fw/firewall25.fw # @@ -123,11 +123,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP @@ -705,7 +706,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:38 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:34 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 a611762be..4549cb7fc 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:42 2011 PST by vadim +# Generated Thu Nov 10 11:57:38 2011 PST by vadim # # files: * firewall26.fw /etc/fw/firewall26.fw # @@ -117,11 +117,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP @@ -585,7 +586,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:42 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:38 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 2d17c8255..c96f3b208 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:44 2011 PST by vadim +# Generated Thu Nov 10 11:57:39 2011 PST by vadim # # files: * firewall27.fw /etc/fw/firewall27.fw # @@ -117,11 +117,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP @@ -567,7 +568,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:44 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:39 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 d9612045d..5a33dd243 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:47 2011 PST by vadim +# Generated Thu Nov 10 11:57:43 2011 PST by vadim # # files: * firewall28.fw /etc/fw/firewall28.fw # @@ -114,13 +114,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -430,7 +431,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:47 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:43 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 62aa6339b..c834207d0 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:49 2011 PST by vadim +# Generated Thu Nov 10 11:57:44 2011 PST by vadim # # files: * firewall29.fw /etc/fw/firewall29.fw # @@ -116,11 +116,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -465,7 +466,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:49 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:44 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 ca8f7f0ac..754ba4b79 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:50 2011 PST by vadim +# Generated Thu Nov 10 11:57:44 2011 PST by vadim # # files: * firewall3.fw /etc/fw/firewall3.fw # @@ -115,11 +115,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -599,7 +600,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:50 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:44 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 e77781489..993c9b92d 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:50 2011 PST by vadim +# Generated Thu Nov 10 11:57:44 2011 PST by vadim # # files: * firewall30.fw /etc/fw/firewall30.fw # @@ -115,11 +115,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -396,7 +397,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:50 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:44 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 cf2c19289..15865e51f 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:52 2011 PST by vadim +# Generated Thu Nov 10 11:57:47 2011 PST by vadim # # files: * firewall31.fw /etc/fw/firewall31.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -468,7 +469,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:52 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:47 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 b64f2e6b3..0b5216f09 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:55 2011 PST by vadim +# Generated Thu Nov 10 11:57:48 2011 PST by vadim # # files: * firewall32.fw /etc/fw/firewall32.fw # @@ -115,11 +115,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -439,7 +440,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:55 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:48 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 74ec6e53a..9734e9510 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:57 2011 PST by vadim +# Generated Thu Nov 10 11:57:50 2011 PST by vadim # # files: * firewall33-1.fw /etc/fw/firewall33-1.fw # @@ -119,13 +119,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -538,7 +539,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:57 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:50 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 253e6f000..9f1194d3d 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:57 2011 PST by vadim +# Generated Thu Nov 10 11:57:50 2011 PST by vadim # # files: * firewall33.fw /etc/fw/firewall33.fw # @@ -119,11 +119,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -583,7 +584,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:57 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:50 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 4bb38da2a..bca17028b 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:26:57 2011 PST by vadim +# Generated Thu Nov 10 11:57:51 2011 PST by vadim # # files: * firewall34.fw /etc/fw/firewall34.fw # @@ -117,11 +117,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -671,7 +672,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:26:57 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:51 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 57b6cb5ca..60abeaa0b 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:00 2011 PST by vadim +# Generated Thu Nov 10 11:57:53 2011 PST by vadim # # files: * firewall35.fw /etc/fw/firewall35.fw # @@ -117,11 +117,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP @@ -563,7 +564,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:00 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:53 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 63ecf38f1..1f9798eca 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:02 2011 PST by vadim +# Generated Thu Nov 10 11:57:55 2011 PST by vadim # # files: * firewall36-1.fw /etc/firewall36-1.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -454,7 +455,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:02 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57: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 90f3b5750..dd1ab404a 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:03 2011 PST by vadim +# Generated Thu Nov 10 11:57:55 2011 PST by vadim # # files: * firewall36-2.fw /etc/firewall36-2.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -454,7 +455,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:03 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:55 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 71117ca0c..64d026c02 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:02 2011 PST by vadim +# Generated Thu Nov 10 11:57:55 2011 PST by vadim # # files: * firewall36.fw /etc/firewall36.fw # @@ -118,13 +118,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -518,7 +519,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:02 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:55 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 66cace1d7..91ccacfa0 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:08 2011 PST by vadim +# Generated Thu Nov 10 11:57:59 2011 PST by vadim # # files: * firewall37-1.fw /etc/fw/firewall37-1.fw # @@ -117,13 +117,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -987,7 +988,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:08 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:59 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 ba605ca10..8ae925842 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:08 2011 PST by vadim +# Generated Thu Nov 10 11:57:59 2011 PST by vadim # # files: * firewall37-2.fw /etc/fw/firewall37-2.fw # @@ -117,13 +117,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -704,7 +705,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:08 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:59 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 213e3a974..4bafcddb3 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:05 2011 PST by vadim +# Generated Thu Nov 10 11:57:58 2011 PST by vadim # # files: * firewall37.fw /etc/fw/firewall37.fw # @@ -122,13 +122,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -1313,7 +1314,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:05 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57: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 4d2d5b2df..d2e367a6a 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:08 2011 PST by vadim +# Generated Thu Nov 10 11:57:59 2011 PST by vadim # # files: * firewall38.fw /etc/fw/firewall38.fw # @@ -117,14 +117,15 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -540,7 +541,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:08 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:57:59 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 2875c13d3..c8c2b1691 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:10 2011 PST by vadim +# Generated Thu Nov 10 11:58:01 2011 PST by vadim # # files: * firewall39.fw /etc/fw/firewall39.fw # @@ -118,13 +118,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -820,7 +821,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:10 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:01 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 882d3d0b8..381abe592 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:14 2011 PST by vadim +# Generated Thu Nov 10 11:58:05 2011 PST by vadim # # files: * firewall4.fw /etc/fw/firewall4.fw # @@ -115,11 +115,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -733,7 +734,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:14 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58: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 168ab8c25..b1be7fb43 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:14 2011 PST by vadim +# Generated Thu Nov 10 11:58:04 2011 PST by vadim # # files: * firewall40-1.fw /etc/firewall40-1.fw # @@ -116,13 +116,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -462,7 +463,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:14 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:04 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 718174a93..6d7faaaa5 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:15 2011 PST by vadim +# Generated Thu Nov 10 11:58:05 2011 PST by vadim # # files: * firewall40-2.fw /etc/firewall40-2.fw # @@ -116,13 +116,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -449,7 +450,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:15 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:05 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 9931f05e5..af1ef5fee 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:14 2011 PST by vadim +# Generated Thu Nov 10 11:58:04 2011 PST by vadim # # files: * firewall40.fw /etc/firewall40.fw # @@ -116,13 +116,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -455,7 +456,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:14 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:04 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 47f94136e..52bd4aa64 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:20 2011 PST by vadim +# Generated Thu Nov 10 11:58:09 2011 PST by vadim # # files: * firewall41-1.fw /etc/firewall41-1.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP find_program $IPSET } @@ -596,7 +597,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:20 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:09 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 37662dc21..5fe67a379 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:20 2011 PST by vadim +# Generated Thu Nov 10 11:58:09 2011 PST by vadim # # files: * firewall41.fw /etc/firewall41.fw # @@ -122,13 +122,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -480,7 +481,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:20 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:09 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall42.fw.orig b/test/ipt/firewall42.fw.orig index bd897d3e6..fa58a8d6c 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:20 2011 PST by vadim +# Generated Thu Nov 10 11:58:09 2011 PST by vadim # # files: * firewall42.fw /etc/fw/firewall42.fw # @@ -115,11 +115,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -405,7 +406,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:20 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:09 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 671ca9fb6..a1ef37daa 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:25 2011 PST by vadim +# Generated Thu Nov 10 11:58:15 2011 PST by vadim # # files: * firewall5.fw /etc/fw/firewall5.fw # @@ -119,11 +119,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -647,7 +648,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:25 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:15 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 3c019b132..b1c98fb57 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:26 2011 PST by vadim +# Generated Thu Nov 10 11:58:14 2011 PST by vadim # # files: * firewall50.fw /etc/fw/firewall50.fw # @@ -115,11 +115,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -439,7 +440,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:26 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:14 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall51.fw.orig b/test/ipt/firewall51.fw.orig index fd485dbe2..59e97a244 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:26 2011 PST by vadim +# Generated Thu Nov 10 11:58:15 2011 PST by vadim # # files: * firewall51.fw /etc/fw/firewall51.fw # @@ -117,11 +117,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -512,7 +513,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:26 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:15 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 b79afb79e..5764b15c1 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:26 2011 PST by vadim +# Generated Thu Nov 10 11:58:15 2011 PST by vadim # # files: * firewall6.fw /etc/fw/firewall6.fw # @@ -117,11 +117,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -534,7 +535,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:26 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:15 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 2301bb46f..4dba55eff 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:31 2011 PST by vadim +# Generated Thu Nov 10 11:58:20 2011 PST by vadim # # files: * firewall60.fw /etc/firewall60.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -440,7 +441,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:31 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:20 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall61-1.2.5.fw.orig b/test/ipt/firewall61-1.2.5.fw.orig index 279da735d..67384f84a 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:31 2011 PST by vadim +# Generated Thu Nov 10 11:58:20 2011 PST by vadim # # files: * firewall61-1.2.5.fw /etc/firewall61-1.2.5.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -520,7 +521,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:31 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:20 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 471a5a795..0882717d6 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:31 2011 PST by vadim +# Generated Thu Nov 10 11:58:20 2011 PST by vadim # # files: * firewall61-1.2.6.fw /etc/firewall61-1.2.6.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -526,7 +527,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:31 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:20 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 538875317..9b8fef55a 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:31 2011 PST by vadim +# Generated Thu Nov 10 11:58:20 2011 PST by vadim # # files: * firewall61-1.3.x.fw /etc/firewall61-1.3.x.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -513,7 +514,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:31 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:20 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 9745d24f4..fe327227c 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:36 2011 PST by vadim +# Generated Thu Nov 10 11:58:25 2011 PST by vadim # # files: * firewall61-1.4.fw /etc/firewall61-1.4.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -514,7 +515,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:36 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:25 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 76d680201..843bd63e4 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:37 2011 PST by vadim +# Generated Thu Nov 10 11:58:25 2011 PST by vadim # # files: * firewall62.fw /etc/firewall62.fw # @@ -140,13 +140,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -590,7 +591,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:37 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:25 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 a4e8dcc6f..3372d78eb 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:37 2011 PST by vadim +# Generated Thu Nov 10 11:58:25 2011 PST by vadim # # files: * firewall63.fw /etc/firewall63.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -410,7 +411,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:37 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:25 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 7ca6d4e12..1d8f7748a 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:37 2011 PST by vadim +# Generated Thu Nov 10 11:58:25 2011 PST by vadim # # files: * firewall7.fw /etc/fw/firewall7.fw # @@ -117,11 +117,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -494,7 +495,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:37 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:25 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 e57b432cb..63665f643 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:41 2011 PST by vadim +# Generated Thu Nov 10 11:58:29 2011 PST by vadim # # files: * firewall70.fw iptables.sh # @@ -127,13 +127,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -433,7 +434,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:41 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:29 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 95a3fa6e1..b39409c35 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:42 2011 PST by vadim +# Generated Thu Nov 10 11:58:30 2011 PST by vadim # # files: * firewall71.fw /etc/fw/firewall71.fw # @@ -120,11 +120,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP @@ -449,7 +450,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:42 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:30 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 41085cbcb..c7385bf5d 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:42 2011 PST by vadim +# Generated Thu Nov 10 11:58:30 2011 PST by vadim # # files: * firewall72-1.3.x.fw /etc/fw/firewall72-1.3.x.fw # @@ -120,13 +120,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -581,7 +582,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:42 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:30 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 620cb5709..d183d9648 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:42 2011 PST by vadim +# Generated Thu Nov 10 11:58:30 2011 PST by vadim # # files: * firewall72-1.4.3.fw /etc/fw/firewall72-1.4.3.fw # @@ -120,13 +120,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -581,7 +582,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:42 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:30 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 70cae0cde..ad557fae2 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:44 2011 PST by vadim +# Generated Thu Nov 10 11:58:34 2011 PST by vadim # # files: * firewall73.fw /etc/fw/firewall73.fw # @@ -119,13 +119,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -544,7 +545,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:44 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:34 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 2576a859a..a044e1252 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:48 2011 PST by vadim +# Generated Thu Nov 10 11:58:34 2011 PST by vadim # # files: * firewall74.fw /etc/fw/firewall74.fw # @@ -115,11 +115,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IPTABLES_RESTORE find_program $IP @@ -396,7 +397,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:48 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:34 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 4ee8093e5..7ab87adf5 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:48 2011 PST by vadim +# Generated Thu Nov 10 11:58:34 2011 PST by vadim # # files: * firewall8.fw /etc/fw/firewall8.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -381,7 +382,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:48 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:34 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 dc43a8a1f..e50db1d3a 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:48 2011 PST by vadim +# Generated Thu Nov 10 11:58:34 2011 PST by vadim # # files: * firewall80.fw /etc/fw/firewall80.fw # @@ -115,11 +115,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -420,7 +421,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:48 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:34 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 159d10d25..30998b589 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:48 2011 PST by vadim +# Generated Thu Nov 10 11:58:38 2011 PST by vadim # # files: * firewall81.fw /etc/fw/firewall81.fw # @@ -123,11 +123,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -441,7 +442,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:48 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:38 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 d7cf7eeae..2dafd0b2f 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:53 2011 PST by vadim +# Generated Thu Nov 10 11:58:39 2011 PST by vadim # # files: * firewall82.fw /etc/firewall82.fw # @@ -116,13 +116,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -434,7 +435,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:53 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:39 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 686d6051b..65d2a34c1 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:53 2011 PST by vadim +# Generated Thu Nov 10 11:58:39 2011 PST by vadim # # files: * firewall82_A.fw /etc/fw/firewall82_A.fw # @@ -117,13 +117,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -421,7 +422,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:53 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:39 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 fdc7d59f2..baa16c10b 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:53 2011 PST by vadim +# Generated Thu Nov 10 11:58:39 2011 PST by vadim # # files: * firewall82_B.fw /etc/fw/firewall82_B.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -384,7 +385,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:53 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:39 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 bd63514ec..a80599e59 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:54 2011 PST by vadim +# Generated Thu Nov 10 11:58:43 2011 PST by vadim # # files: * firewall9.fw /etc/fw/firewall9.fw # @@ -118,11 +118,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES find_program $IP } @@ -642,7 +643,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:54 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:43 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 5e40a98a5..916f2d9eb 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:59 2011 PST by vadim +# Generated Thu Nov 10 11:58:43 2011 PST by vadim # # files: * firewall90.fw /etc/fw/firewall90.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -404,7 +405,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:59 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:43 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 04f97f83a..66e69cff1 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:59 2011 PST by vadim +# Generated Thu Nov 10 11:58:43 2011 PST by vadim # # files: * firewall91.fw /etc/fw/firewall91.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -404,7 +405,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:59 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:43 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 8f4000378..58d092dda 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:59 2011 PST by vadim +# Generated Thu Nov 10 11:58:44 2011 PST by vadim # # files: * firewall92.fw /etc/fw/firewall92.fw # @@ -118,13 +118,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -440,7 +441,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:59 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:44 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 803daa845..1d33eb130 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:59 2011 PST by vadim +# Generated Thu Nov 10 11:58:47 2011 PST by vadim # # files: * firewall93.fw /etc/fw/firewall93.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -483,7 +484,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:27:59 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:47 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 b082f91b3..01b200e32 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:04 2011 PST by vadim +# Generated Thu Nov 10 11:58:48 2011 PST by vadim # # files: * firewall94.fw /etc/fw/firewall94.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -535,7 +536,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:04 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:48 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 be570edfd..826e0f4dc 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:37:40 2011 PST by vadim +# Generated Thu Nov 10 11:58:48 2011 PST by vadim # # files: * firewall95.fw /etc/fw/firewall95.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -392,7 +393,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:37:40 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:48 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 e07f848b3..8f2011d20 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:33 2011 PST by vadim +# Generated Thu Nov 10 11:59:15 2011 PST by vadim # # files: * fw-A.fw /sw/FWbuilder/fw-A.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP find_program $VCONFIG find_program $IFENSLAVE @@ -745,7 +746,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:33 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:15 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 2365b9e0f..93f3d686c 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:33 2011 PST by vadim +# Generated Thu Nov 10 11:59:15 2011 PST by vadim # # files: * fw1.fw /etc/fw1.fw # @@ -128,13 +128,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -546,7 +547,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:33 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:15 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 255daf280..d03c9cc1c 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:27:20 2011 PST by vadim +# Generated Thu Nov 10 11:58:10 2011 PST by vadim # # files: * fwbuilder.fw /etc/init.d/fwbuilder.fw # @@ -120,11 +120,12 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IP } reset_iptables_v4() { @@ -504,7 +505,7 @@ status_action() { } start() { - log "Activating firewall script generated Tue Nov 8 18:27:20 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:58:10 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 85a512c51..f69a94002 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:40 2011 PST by vadim +# Generated Thu Nov 10 11:59:22 2011 PST by vadim # # files: * heartbeat_cluster_1_d_linux-1-d.fw firewall.sh # @@ -117,13 +117,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -747,7 +748,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:40 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:22 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 9384cf1b4..70ffe216b 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:40 2011 PST by vadim +# Generated Thu Nov 10 11:59:22 2011 PST by vadim # # files: * heartbeat_cluster_1_d_linux-2-d.fw firewall.sh # @@ -120,13 +120,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -749,7 +750,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:40 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:22 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 24fd5a742..57e8547ed 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:40 2011 PST by vadim +# Generated Thu Nov 10 11:59:21 2011 PST by vadim # # files: * heartbeat_cluster_1_linux-1.fw /etc/heartbeat_cluster_1_linux-1.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP find_program $VCONFIG } @@ -864,7 +865,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:40 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:21 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 f956bce32..6e61cbb05 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:40 2011 PST by vadim +# Generated Thu Nov 10 11:59:22 2011 PST by vadim # # files: * heartbeat_cluster_1_linux-2.fw /etc/heartbeat_cluster_1_linux-2.fw # @@ -114,13 +114,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -762,7 +763,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:40 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:22 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 7f8598e4f..5df689ad9 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:41 2011 PST by vadim +# Generated Thu Nov 10 11:59:23 2011 PST by vadim # # files: * heartbeat_cluster_2_linux-1.fw /etc/heartbeat_cluster_2_linux-1.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP find_program $VCONFIG } @@ -728,7 +729,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:41 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:23 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 563f02b39..a6c8259e3 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:41 2011 PST by vadim +# Generated Thu Nov 10 11:59:23 2011 PST by vadim # # files: * heartbeat_cluster_2_linux-2.fw /etc/heartbeat_cluster_2_linux-2.fw # @@ -114,13 +114,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -641,7 +642,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:41 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:23 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 46ee5717e..3900840ea 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:34 2011 PST by vadim +# Generated Thu Nov 10 11:59:19 2011 PST by vadim # # files: * host.fw /etc/fw/host.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -443,7 +444,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:34 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:19 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/openais_cluster_1_linux-1.fw.orig b/test/ipt/openais_cluster_1_linux-1.fw.orig index ff3d59907..68a1ff536 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:41 2011 PST by vadim +# Generated Thu Nov 10 11:59:24 2011 PST by vadim # # files: * openais_cluster_1_linux-1.fw /etc/openais_cluster_1_linux-1.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP find_program $VCONFIG } @@ -728,7 +729,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:41 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:24 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 6c31aac20..713ef1c2e 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:41 2011 PST by vadim +# Generated Thu Nov 10 11:59:24 2011 PST by vadim # # files: * openais_cluster_1_linux-2.fw /etc/openais_cluster_1_linux-2.fw # @@ -114,13 +114,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -632,7 +633,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:41 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:24 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/rh90.fw.orig b/test/ipt/rh90.fw.orig index 5bfd629cd..13f26366e 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:37 2011 PST by vadim +# Generated Thu Nov 10 11:59:20 2011 PST by vadim # # files: * rh90.fw /etc/rh90.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -442,7 +443,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:37 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:20 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 14ee9df1b..822bfc87c 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:41 2011 PST by vadim +# Generated Thu Nov 10 11:59:24 2011 PST by vadim # # files: * secuwall_cluster_1_secuwall-1.fw /etc/secuwall_cluster_1_secuwall-1.fw # @@ -116,13 +116,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -426,7 +427,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:41 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:24 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 c98ce43f4..0c8d08dbf 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:41 2011 PST by vadim +# Generated Thu Nov 10 11:59:25 2011 PST by vadim # # files: * server-cluster-1_server-1.fw /etc/fw/server-cluster-1_server-1.fw # @@ -117,13 +117,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -421,7 +422,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:41 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:25 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 6f7104cb2..579ea629f 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:41 2011 PST by vadim +# Generated Thu Nov 10 11:59:25 2011 PST by vadim # # files: * server-cluster-1_server-2.fw /etc/fw/server-cluster-1_server-2.fw # @@ -116,13 +116,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -418,7 +419,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:41 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:25 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 6ea6d6045..f8d531fb3 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:39 2011 PST by vadim +# Generated Thu Nov 10 11:59:24 2011 PST by vadim # # files: * test-shadowing-1.fw /etc/test-shadowing-1.fw # @@ -123,13 +123,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -492,7 +493,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:39 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:24 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 b9c9359a1..c529cc9a4 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:39 2011 PST by vadim +# Generated Thu Nov 10 11:59:24 2011 PST by vadim # # files: * test-shadowing-2.fw /etc/test-shadowing-2.fw # @@ -121,13 +121,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -450,7 +451,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:39 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:24 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 ef603e96a..572f7aa3c 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:41 2011 PST by vadim +# Generated Thu Nov 10 11:59:25 2011 PST by vadim # # files: * test-shadowing-3.fw /etc/test-shadowing-3.fw # @@ -119,13 +119,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -499,7 +500,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:41 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:25 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 8e498b9b2..394d0e8fb 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:39 2011 PST by vadim +# Generated Thu Nov 10 11:59:20 2011 PST by vadim # # files: * test_fw.fw /etc/test_fw.fw # @@ -116,13 +116,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -591,7 +592,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:39 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:20 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 a2dbc042a..e211a02e2 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:41 2011 PST by vadim +# Generated Thu Nov 10 11:59:25 2011 PST by vadim # # files: * vrrp_cluster_1_linux-1.fw /etc/vrrp_cluster_1_linux-1.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP find_program $VCONFIG } @@ -731,7 +732,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:41 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:25 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 d41023bef..0ba883178 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:42 2011 PST by vadim +# Generated Thu Nov 10 11:59:25 2011 PST by vadim # # files: * vrrp_cluster_1_linux-2.fw /etc/vrrp_cluster_1_linux-2.fw # @@ -114,13 +114,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -636,7 +637,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:42 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:25 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 8105dc259..768098e15 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:42 2011 PST by vadim +# Generated Thu Nov 10 11:59:25 2011 PST by vadim # # files: * vrrp_cluster_2_linux-1.fw /etc/vrrp_cluster_2_linux-1.fw # @@ -115,13 +115,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP find_program $VCONFIG } @@ -663,7 +664,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:42 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:25 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 50452e9a8..b8f3b2416 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:42 2011 PST by vadim +# Generated Thu Nov 10 11:59:25 2011 PST by vadim # # files: * vrrp_cluster_2_linux-2.fw /etc/vrrp_cluster_2_linux-2.fw # @@ -114,13 +114,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -568,7 +569,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:42 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:25 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 cc3ddd6ae..d51202b46 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.3584 +# Firewall Builder fwb_ipt v5.0.1.3585 # -# Generated Tue Nov 8 18:28:42 2011 PST by vadim +# Generated Thu Nov 10 11:59:25 2011 PST by vadim # # files: * vrrp_cluster_2_linux-3.fw /etc/vrrp_cluster_2_linux-3.fw # @@ -114,13 +114,14 @@ diff_intf() { find_program() { PGM=$1 which $PGM >/dev/null 2>&1 || { - echo "$PGM not found" + echo "\"$PGM\" not found" exit 1 } } check_tools() { + find_program which find_program $IPTABLES - find_program $MODPROBE + find_program $MODPROBE find_program $IP } reset_iptables_v4() { @@ -544,7 +545,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Tue Nov 8 18:28:42 2011 by vadim" + log "Activating firewall script generated Thu Nov 10 11:59:25 2011 by vadim" check_tools prolog_commands check_run_time_address_table_files