From c5ca42940f1f9101ee3ded6a3003d673d5ac5535 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Mon, 20 Feb 2012 14:18:10 -0800 Subject: [PATCH] fixes SF bug 3489096, Shell code that restores old static routing table entries in case of an error with commands adding new routing entries was broken and left the machine with no routes at all. Also, using mktemp to create temporary directory. If mktemp is not available, fall back onto less secure but guaranteed to work method where I generate randomized the name of the temporary directory using process ID. --- doc/ChangeLog | 12 +++++++++ src/res/configlets/linux24/routing_functions | 21 ++++++++++++---- test/ipt/cluster1_secuwall-1.fw.orig | 4 +-- test/ipt/firewall-base-rulesets.fw.orig | 4 +-- test/ipt/firewall-ipv6-1.fw.orig | 4 +-- test/ipt/firewall-ipv6-2.fw.orig | 4 +-- test/ipt/firewall-ipv6-3.fw.orig | 4 +-- test/ipt/firewall-ipv6-4-1.fw.orig | 4 +-- test/ipt/firewall-ipv6-4.fw.orig | 4 +-- test/ipt/firewall-ipv6-5.fw.orig | 4 +-- test/ipt/firewall-ipv6-6.fw.orig | 4 +-- test/ipt/firewall-ipv6-7.fw.orig | 4 +-- test/ipt/firewall-ipv6-8.fw.orig | 4 +-- ...-ipv6-ipt-reset-prolog-after-flush.fw.orig | 4 +-- ...-ipt-reset-prolog-after-interfaces.fw.orig | 4 +-- ...firewall-ipv6-ipt-reset-prolog-top.fw.orig | 4 +-- test/ipt/firewall-ipv6-nd-ns-1.fw.orig | 4 +-- test/ipt/firewall-ipv6-nd-ns-2.fw.orig | 4 +-- .../firewall-ipv6-prolog-after-flush.fw.orig | 4 +-- ...ewall-ipv6-prolog-after-interfaces.fw.orig | 4 +-- test/ipt/firewall-ipv6-prolog-top.fw.orig | 4 +-- test/ipt/firewall-server-1-s.fw.orig | 4 +-- test/ipt/firewall.fw.orig | 4 +-- test/ipt/firewall1.fw.orig | 4 +-- test/ipt/firewall10.fw.orig | 4 +-- test/ipt/firewall11.fw.orig | 4 +-- test/ipt/firewall12.fw.orig | 4 +-- test/ipt/firewall13.fw.orig | 4 +-- test/ipt/firewall14.fw.orig | 4 +-- test/ipt/firewall15.fw.orig | 4 +-- test/ipt/firewall16.fw.orig | 4 +-- test/ipt/firewall17.fw.orig | 4 +-- test/ipt/firewall18.fw.orig | 4 +-- test/ipt/firewall19.fw.orig | 4 +-- test/ipt/firewall2-1.fw.orig | 4 +-- test/ipt/firewall2-2.fw.orig | 4 +-- test/ipt/firewall2-3.fw.orig | 4 +-- test/ipt/firewall2-4.fw.orig | 4 +-- test/ipt/firewall2-5.fw.orig | 4 +-- test/ipt/firewall2-6.fw.orig | 4 +-- test/ipt/firewall2-7.fw.orig | 4 +-- test/ipt/firewall2.fw.orig | 4 +-- test/ipt/firewall20-ipv6.fw.orig | 4 +-- test/ipt/firewall20.fw.orig | 4 +-- test/ipt/firewall21-1.fw.orig | 4 +-- test/ipt/firewall21.fw.orig | 4 +-- test/ipt/firewall22.fw.orig | 4 +-- test/ipt/firewall23-1.fw.orig | 4 +-- test/ipt/firewall23-2.fw.orig | 4 +-- test/ipt/firewall23-3.fw.orig | 4 +-- test/ipt/firewall23.fw.orig | 4 +-- test/ipt/firewall24.fw.orig | 4 +-- test/ipt/firewall25.fw.orig | 4 +-- test/ipt/firewall26.fw.orig | 4 +-- test/ipt/firewall27.fw.orig | 4 +-- test/ipt/firewall28.fw.orig | 4 +-- test/ipt/firewall29.fw.orig | 4 +-- test/ipt/firewall3.fw.orig | 4 +-- test/ipt/firewall30.fw.orig | 4 +-- test/ipt/firewall31.fw.orig | 4 +-- test/ipt/firewall32.fw.orig | 4 +-- test/ipt/firewall33-1.fw.orig | 4 +-- test/ipt/firewall33.fw.orig | 4 +-- test/ipt/firewall34.fw.orig | 4 +-- test/ipt/firewall35.fw.orig | 4 +-- test/ipt/firewall36-1.fw.orig | 25 +++++++++++++------ test/ipt/firewall36-2.fw.orig | 25 +++++++++++++------ test/ipt/firewall36.fw.orig | 25 +++++++++++++------ test/ipt/firewall37-1.fw.orig | 4 +-- test/ipt/firewall37-2.fw.orig | 4 +-- test/ipt/firewall37.fw.orig | 4 +-- test/ipt/firewall38.fw.orig | 4 +-- test/ipt/firewall39.fw.orig | 4 +-- test/ipt/firewall4.fw.orig | 4 +-- test/ipt/firewall40-1.fw.orig | 4 +-- test/ipt/firewall40-2.fw.orig | 4 +-- test/ipt/firewall40.fw.orig | 4 +-- test/ipt/firewall41-1.fw.orig | 4 +-- test/ipt/firewall41.fw.orig | 4 +-- test/ipt/firewall42.fw.orig | 4 +-- test/ipt/firewall5.fw.orig | 4 +-- test/ipt/firewall50.fw.orig | 4 +-- test/ipt/firewall51.fw.orig | 4 +-- test/ipt/firewall6.fw.orig | 4 +-- test/ipt/firewall60.fw.orig | 4 +-- test/ipt/firewall61-1.2.5.fw.orig | 4 +-- test/ipt/firewall61-1.2.6.fw.orig | 4 +-- test/ipt/firewall61-1.3.x.fw.orig | 4 +-- test/ipt/firewall61-1.4.fw.orig | 4 +-- test/ipt/firewall62.fw.orig | 4 +-- test/ipt/firewall63.fw.orig | 4 +-- test/ipt/firewall7.fw.orig | 4 +-- test/ipt/firewall70.fw.orig | 4 +-- test/ipt/firewall71.fw.orig | 4 +-- test/ipt/firewall72-1.3.x.fw.orig | 4 +-- test/ipt/firewall72-1.4.3.fw.orig | 4 +-- test/ipt/firewall73.fw.orig | 4 +-- test/ipt/firewall74.fw.orig | 4 +-- test/ipt/firewall8.fw.orig | 4 +-- test/ipt/firewall80.fw.orig | 4 +-- test/ipt/firewall81.fw.orig | 4 +-- test/ipt/firewall82.fw.orig | 4 +-- test/ipt/firewall82_A.fw.orig | 4 +-- test/ipt/firewall82_B.fw.orig | 4 +-- test/ipt/firewall9.fw.orig | 4 +-- test/ipt/firewall90.fw.orig | 4 +-- test/ipt/firewall91.fw.orig | 4 +-- test/ipt/firewall92.fw.orig | 4 +-- test/ipt/firewall93.fw.orig | 4 +-- test/ipt/firewall94.fw.orig | 4 +-- test/ipt/firewall95.fw.orig | 4 +-- test/ipt/fw-A.fw.orig | 25 +++++++++++++------ test/ipt/fw1.fw.orig | 4 +-- test/ipt/fwbuilder.fw.orig | 4 +-- .../heartbeat_cluster_1_d_linux-1-d.fw.orig | 4 +-- .../heartbeat_cluster_1_d_linux-2-d.fw.orig | 4 +-- test/ipt/heartbeat_cluster_1_linux-1.fw.orig | 25 +++++++++++++------ test/ipt/heartbeat_cluster_1_linux-2.fw.orig | 25 +++++++++++++------ test/ipt/heartbeat_cluster_2_linux-1.fw.orig | 25 +++++++++++++------ test/ipt/heartbeat_cluster_2_linux-2.fw.orig | 25 +++++++++++++------ test/ipt/host.fw.orig | 4 +-- test/ipt/openais_cluster_1_linux-1.fw.orig | 25 +++++++++++++------ test/ipt/openais_cluster_1_linux-2.fw.orig | 25 +++++++++++++------ test/ipt/rh90.fw.orig | 4 +-- .../ipt/secuwall_cluster_1_secuwall-1.fw.orig | 4 +-- test/ipt/server-cluster-1_server-1.fw.orig | 4 +-- test/ipt/server-cluster-1_server-2.fw.orig | 4 +-- test/ipt/test-shadowing-1.fw.orig | 4 +-- test/ipt/test-shadowing-2.fw.orig | 4 +-- test/ipt/test-shadowing-3.fw.orig | 4 +-- test/ipt/test_fw.fw.orig | 4 +-- test/ipt/vrrp_cluster_1_linux-1.fw.orig | 25 +++++++++++++------ test/ipt/vrrp_cluster_1_linux-2.fw.orig | 25 +++++++++++++------ test/ipt/vrrp_cluster_2_linux-1.fw.orig | 4 +-- test/ipt/vrrp_cluster_2_linux-2.fw.orig | 4 +-- test/ipt/vrrp_cluster_2_linux-3.fw.orig | 4 +-- 136 files changed, 488 insertions(+), 333 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 0db54a89c..219795244 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,17 @@ 2012-02-20 Vadim Kurland + * configlets/linux24/routing_functions (OLD_ROUTES): fixes SF bug + 3489096 "dd-wrt-jffs: all routes are deleted if there is an + error". The problem affects all supported Linux-like + systems. Shell code that restores old static routing table entries + in case of an error with commands adding new routing entries was + broken and left the machine with no routes at all. + + * configlets/linux24/routing_functions: using mktemp to create + temporary directory. If mktemp is not available, fall back onto + less secure but guaranteed to work method where I generate + randomized the name of the temporary directory using process ID. + * OSConfigurator_linux24_interfaces.cpp (printInterfaceConfigurationCommands): fixes #2684 "fix address deletion in configlet update_addresses". This only applies to Linux firewalls and configurations where an diff --git a/src/res/configlets/linux24/routing_functions b/src/res/configlets/linux24/routing_functions index 859ecd957..e3024e2f8 100644 --- a/src/res/configlets/linux24/routing_functions +++ b/src/res/configlets/linux24/routing_functions @@ -14,9 +14,20 @@ # ============== ROUTING RULES ============== -TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" +HAVE_MKTEMP=$(which mktemp) + +test -n "$HAVE_MKTEMP" && { + TMPDIRNAME=$(mktemp -d) + test -z "$TMPDIRNAME" && exit 1 +} + +test -z "$HAVE_MKTEMP" && { + TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + (umask 077 && mkdir $TMPDIRNAME) || exit 1 +} + TMPFILENAME="$TMPDIRNAME/.fwbuilder.out" -(umask 077 && mkdir $TMPDIRNAME) || exit 1 +OLD_ROUTES="$TMPDIRNAME/.old_routes" # # This function stops stdout redirection @@ -36,8 +47,7 @@ route_command_error() # delete current routing rules $IP route show | while read route ; do $IP route del $route ; done # restore old routing rules - (IFS=" -"; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done) + sh $OLD_ROUTES echo "...done" restore_script_output epilog_commands @@ -51,7 +61,8 @@ exec 2>&1 # store previous routing configuration (sort: 'via' GW has to be # inserted after device routes) -oldRoutes=$($IP route show | sort -k 2) + +$IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES echo "Deleting routing rules previously set by user space processes..." $IP route show | grep -v {{$proto_filter}} | \ diff --git a/test/ipt/cluster1_secuwall-1.fw.orig b/test/ipt/cluster1_secuwall-1.fw.orig index 33b89801b..96827bdb3 100755 --- a/test/ipt/cluster1_secuwall-1.fw.orig +++ b/test/ipt/cluster1_secuwall-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:35 2012 PST by vadim +# Generated Mon Feb 20 14:12:45 2012 PST by vadim # # files: * cluster1_secuwall-1.fw /etc/cluster1_secuwall-1.fw # @@ -610,7 +610,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:35 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:45 2012 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 882f12ce9..afcb28830 100755 --- a/test/ipt/firewall-base-rulesets.fw.orig +++ b/test/ipt/firewall-base-rulesets.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:54 2012 PST by vadim +# Generated Mon Feb 20 14:12:06 2012 PST by vadim # # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw # @@ -467,7 +467,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:54 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:06 2012 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 0acddacab..b8916de16 100755 --- a/test/ipt/firewall-ipv6-1.fw.orig +++ b/test/ipt/firewall-ipv6-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:58 2012 PST by vadim +# Generated Mon Feb 20 14:12:10 2012 PST by vadim # # files: * firewall-ipv6-1.fw /etc/firewall-ipv6-1.fw # @@ -731,7 +731,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:58 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:10 2012 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 fb9069160..c010cfc48 100755 --- a/test/ipt/firewall-ipv6-2.fw.orig +++ b/test/ipt/firewall-ipv6-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:02 2012 PST by vadim +# Generated Mon Feb 20 14:12:11 2012 PST by vadim # # files: * firewall-ipv6-2.fw /etc/firewall-ipv6-2.fw # @@ -995,7 +995,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:02 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:11 2012 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 625d94657..470364542 100755 --- a/test/ipt/firewall-ipv6-3.fw.orig +++ b/test/ipt/firewall-ipv6-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:02 2012 PST by vadim +# Generated Mon Feb 20 14:12:11 2012 PST by vadim # # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw # @@ -625,7 +625,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:02 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:11 2012 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 4bff0d5ba..ef88ce32c 100755 --- a/test/ipt/firewall-ipv6-4-1.fw.orig +++ b/test/ipt/firewall-ipv6-4-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:03 2012 PST by vadim +# Generated Mon Feb 20 14:12:18 2012 PST by vadim # # files: * firewall-ipv6-4-1.fw /etc/firewall-ipv6-4-1.fw # @@ -576,7 +576,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:03 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:18 2012 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 3b10c7a1c..de6db02eb 100755 --- a/test/ipt/firewall-ipv6-4.fw.orig +++ b/test/ipt/firewall-ipv6-4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:02 2012 PST by vadim +# Generated Mon Feb 20 14:12:12 2012 PST by vadim # # files: * firewall-ipv6-4.fw /etc/firewall-ipv6-4.fw # @@ -612,7 +612,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:02 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:12 2012 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 a93bc24d0..d785ddb43 100755 --- a/test/ipt/firewall-ipv6-5.fw.orig +++ b/test/ipt/firewall-ipv6-5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:08 2012 PST by vadim +# Generated Mon Feb 20 14:12:17 2012 PST by vadim # # files: * firewall-ipv6-5.fw /etc/firewall-ipv6-5.fw # @@ -434,7 +434,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:08 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:17 2012 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 98dae1698..0c9c1f397 100755 --- a/test/ipt/firewall-ipv6-6.fw.orig +++ b/test/ipt/firewall-ipv6-6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:09 2012 PST by vadim +# Generated Mon Feb 20 14:12:17 2012 PST by vadim # # files: * firewall-ipv6-6.fw /etc/firewall-ipv6-6.fw # @@ -430,7 +430,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:09 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:17 2012 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 5effb939c..14c26bd6b 100755 --- a/test/ipt/firewall-ipv6-7.fw.orig +++ b/test/ipt/firewall-ipv6-7.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:09 2012 PST by vadim +# Generated Mon Feb 20 14:12:17 2012 PST by vadim # # files: * firewall-ipv6-7.fw /etc/firewall-ipv6-7.fw # @@ -474,7 +474,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:09 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:17 2012 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 bda7cfd73..19fd87b5d 100755 --- a/test/ipt/firewall-ipv6-8.fw.orig +++ b/test/ipt/firewall-ipv6-8.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:09 2012 PST by vadim +# Generated Mon Feb 20 14:12:24 2012 PST by vadim # # files: * firewall-ipv6-8.fw /etc/firewall-ipv6-8.fw # @@ -547,7 +547,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:09 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:24 2012 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 08c050948..749e25bd7 100755 --- a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig +++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-flush.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:14 2012 PST by vadim +# Generated Mon Feb 20 14:12:24 2012 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-after-flush.fw /etc/firewall-ipv6-ipt-reset-prolog-after-flush.fw # @@ -471,7 +471,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:14 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:24 2012 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 3519ea585..1ce08a030 100755 --- a/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig +++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:15 2012 PST by vadim +# Generated Mon Feb 20 14:12:24 2012 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-after-interfaces.fw /etc/firewall-ipv6-ipt-reset-prolog-after-interfaces.fw # @@ -471,7 +471,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:15 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:24 2012 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 6576fa1c5..8c1896e57 100755 --- a/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig +++ b/test/ipt/firewall-ipv6-ipt-reset-prolog-top.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:15 2012 PST by vadim +# Generated Mon Feb 20 14:12:24 2012 PST by vadim # # files: * firewall-ipv6-ipt-reset-prolog-top.fw /etc/firewall-ipv6-ipt-reset-prolog-top.fw # @@ -471,7 +471,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:15 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:24 2012 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 8e7b5f73c..139876432 100755 --- a/test/ipt/firewall-ipv6-nd-ns-1.fw.orig +++ b/test/ipt/firewall-ipv6-nd-ns-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:15 2012 PST by vadim +# Generated Mon Feb 20 14:12:30 2012 PST by vadim # # files: * firewall-ipv6-nd-ns-1.fw /etc/firewall-ipv6-nd-ns-1.fw # @@ -471,7 +471,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:15 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:30 2012 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 2d47c1fdd..f8702bb0d 100755 --- a/test/ipt/firewall-ipv6-nd-ns-2.fw.orig +++ b/test/ipt/firewall-ipv6-nd-ns-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:21 2012 PST by vadim +# Generated Mon Feb 20 14:12:30 2012 PST by vadim # # files: * firewall-ipv6-nd-ns-2.fw /etc/firewall-ipv6-nd-ns-2.fw # @@ -475,7 +475,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:21 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:30 2012 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 79f44cb46..29ed5b7ea 100755 --- a/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig +++ b/test/ipt/firewall-ipv6-prolog-after-flush.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:21 2012 PST by vadim +# Generated Mon Feb 20 14:12:31 2012 PST by vadim # # files: * firewall-ipv6-prolog-after-flush.fw /etc/firewall-ipv6-prolog-after-flush.fw # @@ -449,7 +449,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:21 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:31 2012 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 bf7baddcc..152484fd3 100755 --- a/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig +++ b/test/ipt/firewall-ipv6-prolog-after-interfaces.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:22 2012 PST by vadim +# Generated Mon Feb 20 14:12:31 2012 PST by vadim # # files: * firewall-ipv6-prolog-after-interfaces.fw /etc/firewall-ipv6-prolog-after-interfaces.fw # @@ -449,7 +449,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:22 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:31 2012 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 54655a124..9c3e41a9b 100755 --- a/test/ipt/firewall-ipv6-prolog-top.fw.orig +++ b/test/ipt/firewall-ipv6-prolog-top.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:22 2012 PST by vadim +# Generated Mon Feb 20 14:12:36 2012 PST by vadim # # files: * firewall-ipv6-prolog-top.fw /etc/firewall-ipv6-prolog-top.fw # @@ -449,7 +449,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:22 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:36 2012 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 a6684a7cf..a6600ad08 100755 --- a/test/ipt/firewall-server-1-s.fw.orig +++ b/test/ipt/firewall-server-1-s.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:26 2012 PST by vadim +# Generated Mon Feb 20 14:12:36 2012 PST by vadim # # files: * firewall-server-1-s.fw /etc/fw/firewall-server-1-s.fw # @@ -415,7 +415,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:26 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:36 2012 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 8974affea..115302f89 100755 --- a/test/ipt/firewall.fw.orig +++ b/test/ipt/firewall.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:32 2012 PST by vadim +# Generated Mon Feb 20 14:09:42 2012 PST by vadim # # files: * firewall.fw /etc/fw/firewall.fw # @@ -1405,7 +1405,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:32 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:09:42 2012 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 55e1e0bf9..93d898a50 100755 --- a/test/ipt/firewall1.fw.orig +++ b/test/ipt/firewall1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:32 2012 PST by vadim +# Generated Mon Feb 20 14:09:42 2012 PST by vadim # # files: * firewall1.fw /etc/fw/firewall1.fw # @@ -1277,7 +1277,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:32 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:09:42 2012 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 33d239d06..b1e0620bd 100755 --- a/test/ipt/firewall10.fw.orig +++ b/test/ipt/firewall10.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:31 2012 PST by vadim +# Generated Mon Feb 20 14:09:41 2012 PST by vadim # # files: * firewall10.fw /etc/fw/firewall10.fw # @@ -495,7 +495,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:31 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:09:41 2012 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 ef1085eeb..dd3fa2516 100755 --- a/test/ipt/firewall11.fw.orig +++ b/test/ipt/firewall11.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:38 2012 PST by vadim +# Generated Mon Feb 20 14:09:47 2012 PST by vadim # # files: * firewall11.fw /etc/fw/firewall11.fw # @@ -615,7 +615,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:38 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:09:47 2012 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 f48f61f2e..d13269a49 100755 --- a/test/ipt/firewall12.fw.orig +++ b/test/ipt/firewall12.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:38 2012 PST by vadim +# Generated Mon Feb 20 14:09:47 2012 PST by vadim # # files: * firewall12.fw /etc/fw/firewall12.fw # @@ -540,7 +540,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:38 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:09:47 2012 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 df78c3bed..b7d4df06b 100755 --- a/test/ipt/firewall13.fw.orig +++ b/test/ipt/firewall13.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:38 2012 PST by vadim +# Generated Mon Feb 20 14:09:48 2012 PST by vadim # # files: * firewall13.fw /etc/fw/firewall13.fw # @@ -407,7 +407,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:38 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:09:48 2012 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 fd1b80835..ea9e88f8d 100755 --- a/test/ipt/firewall14.fw.orig +++ b/test/ipt/firewall14.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:38 2012 PST by vadim +# Generated Mon Feb 20 14:09:48 2012 PST by vadim # # files: * firewall14.fw /etc/fw/firewall14.fw # @@ -433,7 +433,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:38 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:09:48 2012 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 e9658ee45..681d350eb 100755 --- a/test/ipt/firewall15.fw.orig +++ b/test/ipt/firewall15.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:44 2012 PST by vadim +# Generated Mon Feb 20 14:09:53 2012 PST by vadim # # files: * firewall15.fw /etc/fw/firewall15.fw # @@ -410,7 +410,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:44 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:09:53 2012 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 3432f7b5e..12b1e7576 100755 --- a/test/ipt/firewall16.fw.orig +++ b/test/ipt/firewall16.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:45 2012 PST by vadim +# Generated Mon Feb 20 14:09:54 2012 PST by vadim # # files: * firewall16.fw /etc/fw/firewall16.fw # @@ -514,7 +514,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:45 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:09:54 2012 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 2cd03706c..b561bfda3 100755 --- a/test/ipt/firewall17.fw.orig +++ b/test/ipt/firewall17.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:45 2012 PST by vadim +# Generated Mon Feb 20 14:09:54 2012 PST by vadim # # files: * firewall17.fw /etc/fw/firewall17.fw # @@ -500,7 +500,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:45 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:09:54 2012 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 e8ebfb4e5..f7193e16f 100755 --- a/test/ipt/firewall18.fw.orig +++ b/test/ipt/firewall18.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:45 2012 PST by vadim +# Generated Mon Feb 20 14:09:54 2012 PST by vadim # # files: * firewall18.fw /etc/fw/firewall18.fw # @@ -528,7 +528,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:45 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:09:54 2012 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 bce265fa5..da3d75302 100755 --- a/test/ipt/firewall19.fw.orig +++ b/test/ipt/firewall19.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:50 2012 PST by vadim +# Generated Mon Feb 20 14:09:59 2012 PST by vadim # # files: * firewall19.fw /etc/fw/firewall19.fw # @@ -532,7 +532,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:50 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:09:59 2012 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 df4c905bb..8eb261552 100755 --- a/test/ipt/firewall2-1.fw.orig +++ b/test/ipt/firewall2-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:01 2012 PST by vadim +# Generated Mon Feb 20 14:10:09 2012 PST by vadim # # files: * firewall2-1.fw /etc/fw/firewall2-1.fw # @@ -1459,7 +1459,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:01 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:09 2012 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 513d7251d..978fa74f9 100755 --- a/test/ipt/firewall2-2.fw.orig +++ b/test/ipt/firewall2-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:01 2012 PST by vadim +# Generated Mon Feb 20 14:10:11 2012 PST by vadim # # files: * firewall2-2.fw /etc/fw/firewall2-2.fw # @@ -1289,7 +1289,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:01 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:11 2012 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 0ea8209bf..0f0356f09 100755 --- a/test/ipt/firewall2-3.fw.orig +++ b/test/ipt/firewall2-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:07 2012 PST by vadim +# Generated Mon Feb 20 14:10:16 2012 PST by vadim # # files: * firewall2-3.fw /etc/fw/firewall2-3.fw # @@ -1147,7 +1147,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:07 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:16 2012 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 e41a839d1..2a1aa89c7 100755 --- a/test/ipt/firewall2-4.fw.orig +++ b/test/ipt/firewall2-4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:14 2012 PST by vadim +# Generated Mon Feb 20 14:10:23 2012 PST by vadim # # files: * firewall2-4.fw /etc/fw/firewall2-4.fw # @@ -453,7 +453,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:14 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:23 2012 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 c2399c53d..6e8498ac2 100755 --- a/test/ipt/firewall2-5.fw.orig +++ b/test/ipt/firewall2-5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:17 2012 PST by vadim +# Generated Mon Feb 20 14:10:27 2012 PST by vadim # # files: * firewall2-5.fw /etc/fw/firewall2-5.fw # @@ -484,7 +484,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:17 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:27 2012 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 64fa5eaac..8b68edb72 100755 --- a/test/ipt/firewall2-6.fw.orig +++ b/test/ipt/firewall2-6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:20 2012 PST by vadim +# Generated Mon Feb 20 14:10:30 2012 PST by vadim # # files: * firewall2-6.fw /etc/fw/firewall2-6.fw # @@ -509,7 +509,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:20 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:30 2012 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 0e12d27a6..17a6e84b9 100755 --- a/test/ipt/firewall2-7.fw.orig +++ b/test/ipt/firewall2-7.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:22 2012 PST by vadim +# Generated Mon Feb 20 14:10:32 2012 PST by vadim # # files: * firewall2-7.fw /etc/fw/firewall2-7.fw # @@ -449,7 +449,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:22 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:32 2012 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 c71648f99..e2b12a2ef 100755 --- a/test/ipt/firewall2.fw.orig +++ b/test/ipt/firewall2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:52 2012 PST by vadim +# Generated Mon Feb 20 14:10:02 2012 PST by vadim # # files: * firewall2.fw /etc/fw/firewall2.fw # @@ -1511,7 +1511,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:52 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:02 2012 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 1950dd849..e23bce406 100755 --- a/test/ipt/firewall20-ipv6.fw.orig +++ b/test/ipt/firewall20-ipv6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:52 2012 PST by vadim +# Generated Mon Feb 20 14:10:01 2012 PST by vadim # # files: * firewall20-ipv6.fw /etc/fw/firewall20-ipv6.fw # @@ -485,7 +485,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:52 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:01 2012 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 c5fc0def2..b7d2915c4 100755 --- a/test/ipt/firewall20.fw.orig +++ b/test/ipt/firewall20.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:52 2012 PST by vadim +# Generated Mon Feb 20 14:10:01 2012 PST by vadim # # files: * firewall20.fw /etc/fw/firewall20.fw # @@ -696,7 +696,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:52 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:01 2012 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 f7032c6e6..5cbf28e8e 100755 --- a/test/ipt/firewall21-1.fw.orig +++ b/test/ipt/firewall21-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:59 2012 PST by vadim +# Generated Mon Feb 20 14:10:08 2012 PST by vadim # # files: * firewall21-1.fw /etc/fw/firewall21-1.fw # @@ -496,7 +496,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:59 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:08 2012 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 3161c7d80..becaa6dd3 100755 --- a/test/ipt/firewall21.fw.orig +++ b/test/ipt/firewall21.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:54 2012 PST by vadim +# Generated Mon Feb 20 14:10:05 2012 PST by vadim # # files: * firewall21.fw /etc/fw/firewall21.fw # @@ -495,7 +495,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:54 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:05 2012 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 5f6d321aa..cf9dc5c67 100755 --- a/test/ipt/firewall22.fw.orig +++ b/test/ipt/firewall22.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:49:59 2012 PST by vadim +# Generated Mon Feb 20 14:10:08 2012 PST by vadim # # files: * firewall22.fw /etc/fw/firewall22.fw # @@ -412,7 +412,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:49:59 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:08 2012 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 120218a5c..9aafd5c60 100755 --- a/test/ipt/firewall23-1.fw.orig +++ b/test/ipt/firewall23-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:07 2012 PST by vadim +# Generated Mon Feb 20 14:10:16 2012 PST by vadim # # files: * firewall23-1.fw /etc/fw/firewall23-1.fw # @@ -586,7 +586,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:07 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:16 2012 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall23-2.fw.orig b/test/ipt/firewall23-2.fw.orig index 59bc74a75..e3f458a75 100755 --- a/test/ipt/firewall23-2.fw.orig +++ b/test/ipt/firewall23-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:07 2012 PST by vadim +# Generated Mon Feb 20 14:10:16 2012 PST by vadim # # files: * firewall23-2.fw /etc/fw/firewall23-2.fw # @@ -402,7 +402,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:07 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:16 2012 by vadim" check_tools prolog_commands check_run_time_address_table_files diff --git a/test/ipt/firewall23-3.fw.orig b/test/ipt/firewall23-3.fw.orig index 3fdc212f0..34cb0d697 100755 --- a/test/ipt/firewall23-3.fw.orig +++ b/test/ipt/firewall23-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:11 2012 PST by vadim +# Generated Mon Feb 20 14:10:22 2012 PST by vadim # # files: * firewall23-3.fw /etc/fw/firewall23-3.fw # @@ -388,7 +388,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:11 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:22 2012 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 fafb39dac..983d9e817 100755 --- a/test/ipt/firewall23.fw.orig +++ b/test/ipt/firewall23.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:05 2012 PST by vadim +# Generated Mon Feb 20 14:10:15 2012 PST by vadim # # files: * firewall23.fw /etc/fw/firewall23.fw # @@ -498,7 +498,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:05 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:15 2012 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 81116e80f..87780b2f9 100755 --- a/test/ipt/firewall24.fw.orig +++ b/test/ipt/firewall24.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:13 2012 PST by vadim +# Generated Mon Feb 20 14:10:23 2012 PST by vadim # # files: * firewall24.fw /etc/fw/firewall24.fw # @@ -515,7 +515,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:13 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:23 2012 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 4d0b9d1e1..598cce636 100755 --- a/test/ipt/firewall25.fw.orig +++ b/test/ipt/firewall25.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:14 2012 PST by vadim +# Generated Mon Feb 20 14:10:23 2012 PST by vadim # # files: * firewall25.fw /etc/fw/firewall25.fw # @@ -706,7 +706,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:14 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:23 2012 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 0aabdd93a..93bdd223c 100755 --- a/test/ipt/firewall26.fw.orig +++ b/test/ipt/firewall26.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:20 2012 PST by vadim +# Generated Mon Feb 20 14:10:29 2012 PST by vadim # # files: * firewall26.fw /etc/fw/firewall26.fw # @@ -586,7 +586,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:20 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:29 2012 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 32dfb9c9e..0edd0f3f7 100755 --- a/test/ipt/firewall27.fw.orig +++ b/test/ipt/firewall27.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:21 2012 PST by vadim +# Generated Mon Feb 20 14:10:30 2012 PST by vadim # # files: * firewall27.fw /etc/fw/firewall27.fw # @@ -568,7 +568,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:21 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:30 2012 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 9f9eabfa4..2ad586d4e 100755 --- a/test/ipt/firewall28.fw.orig +++ b/test/ipt/firewall28.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:27 2012 PST by vadim +# Generated Mon Feb 20 14:10:36 2012 PST by vadim # # files: * firewall28.fw /etc/fw/firewall28.fw # @@ -431,7 +431,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:27 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:36 2012 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 3400b4e13..2f49a96b7 100755 --- a/test/ipt/firewall29.fw.orig +++ b/test/ipt/firewall29.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:27 2012 PST by vadim +# Generated Mon Feb 20 14:10:36 2012 PST by vadim # # files: * firewall29.fw /etc/fw/firewall29.fw # @@ -466,7 +466,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:27 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:36 2012 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 a1078e209..c13830b8c 100755 --- a/test/ipt/firewall3.fw.orig +++ b/test/ipt/firewall3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:27 2012 PST by vadim +# Generated Mon Feb 20 14:10:36 2012 PST by vadim # # files: * firewall3.fw /etc/fw/firewall3.fw # @@ -600,7 +600,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:27 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:36 2012 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 2086e529d..b46a951cc 100755 --- a/test/ipt/firewall30.fw.orig +++ b/test/ipt/firewall30.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:28 2012 PST by vadim +# Generated Mon Feb 20 14:10:37 2012 PST by vadim # # files: * firewall30.fw /etc/fw/firewall30.fw # @@ -397,7 +397,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:28 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:37 2012 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 e46fb7fea..55d95cbf0 100755 --- a/test/ipt/firewall31.fw.orig +++ b/test/ipt/firewall31.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:33 2012 PST by vadim +# Generated Mon Feb 20 14:10:43 2012 PST by vadim # # files: * firewall31.fw /etc/fw/firewall31.fw # @@ -469,7 +469,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:33 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:43 2012 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 7ef692586..11a2a3ff4 100755 --- a/test/ipt/firewall32.fw.orig +++ b/test/ipt/firewall32.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:33 2012 PST by vadim +# Generated Mon Feb 20 14:10:43 2012 PST by vadim # # files: * firewall32.fw /etc/fw/firewall32.fw # @@ -440,7 +440,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:33 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:43 2012 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 a5caf2d61..e7619f71e 100755 --- a/test/ipt/firewall33-1.fw.orig +++ b/test/ipt/firewall33-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:34 2012 PST by vadim +# Generated Mon Feb 20 14:10:44 2012 PST by vadim # # files: * firewall33-1.fw /etc/fw/firewall33-1.fw # @@ -539,7 +539,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:34 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:44 2012 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 7035553b4..5536e1665 100755 --- a/test/ipt/firewall33.fw.orig +++ b/test/ipt/firewall33.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:34 2012 PST by vadim +# Generated Mon Feb 20 14:10:44 2012 PST by vadim # # files: * firewall33.fw /etc/fw/firewall33.fw # @@ -584,7 +584,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:34 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:44 2012 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 f26c5a5f9..58ecb6ab6 100755 --- a/test/ipt/firewall34.fw.orig +++ b/test/ipt/firewall34.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:38 2012 PST by vadim +# Generated Mon Feb 20 14:10:48 2012 PST by vadim # # files: * firewall34.fw /etc/fw/firewall34.fw # @@ -672,7 +672,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:38 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:48 2012 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 88872bcc6..faa97cb31 100755 --- a/test/ipt/firewall35.fw.orig +++ b/test/ipt/firewall35.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:40 2012 PST by vadim +# Generated Mon Feb 20 14:10:49 2012 PST by vadim # # files: * firewall35.fw /etc/fw/firewall35.fw # @@ -564,7 +564,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:40 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:49 2012 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 74707ddda..29baecc01 100755 --- a/test/ipt/firewall36-1.fw.orig +++ b/test/ipt/firewall36-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:41 2012 PST by vadim +# Generated Mon Feb 20 14:10:50 2012 PST by vadim # # files: * firewall36-1.fw /etc/firewall36-1.fw # @@ -343,9 +343,20 @@ script_body() { # ============== ROUTING RULES ============== - TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + HAVE_MKTEMP=$(which mktemp) + + test -n "$HAVE_MKTEMP" && { + TMPDIRNAME=$(mktemp -d) + test -z "$TMPDIRNAME" && exit 1 + } + + test -z "$HAVE_MKTEMP" && { + TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + (umask 077 && mkdir $TMPDIRNAME) || exit 1 + } + TMPFILENAME="$TMPDIRNAME/.fwbuilder.out" - (umask 077 && mkdir $TMPDIRNAME) || exit 1 + OLD_ROUTES="$TMPDIRNAME/.old_routes" # # This function stops stdout redirection @@ -365,8 +376,7 @@ script_body() { # delete current routing rules $IP route show | while read route ; do $IP route del $route ; done # restore old routing rules - (IFS=" - "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done) + sh $OLD_ROUTES echo "...done" restore_script_output epilog_commands @@ -380,7 +390,8 @@ script_body() { # store previous routing configuration (sort: 'via' GW has to be # inserted after device routes) - oldRoutes=$($IP route show | sort -k 2) + + $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES echo "Deleting routing rules previously set by user space processes..." $IP route show | grep -v '\( proto kernel \)\|\(default via \)' | \ @@ -455,7 +466,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:41 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:50 2012 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 2fe5f7047..e6a03be2c 100755 --- a/test/ipt/firewall36-2.fw.orig +++ b/test/ipt/firewall36-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:45 2012 PST by vadim +# Generated Mon Feb 20 14:10:54 2012 PST by vadim # # files: * firewall36-2.fw /etc/firewall36-2.fw # @@ -343,9 +343,20 @@ script_body() { # ============== ROUTING RULES ============== - TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + HAVE_MKTEMP=$(which mktemp) + + test -n "$HAVE_MKTEMP" && { + TMPDIRNAME=$(mktemp -d) + test -z "$TMPDIRNAME" && exit 1 + } + + test -z "$HAVE_MKTEMP" && { + TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + (umask 077 && mkdir $TMPDIRNAME) || exit 1 + } + TMPFILENAME="$TMPDIRNAME/.fwbuilder.out" - (umask 077 && mkdir $TMPDIRNAME) || exit 1 + OLD_ROUTES="$TMPDIRNAME/.old_routes" # # This function stops stdout redirection @@ -365,8 +376,7 @@ script_body() { # delete current routing rules $IP route show | while read route ; do $IP route del $route ; done # restore old routing rules - (IFS=" - "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done) + sh $OLD_ROUTES echo "...done" restore_script_output epilog_commands @@ -380,7 +390,8 @@ script_body() { # store previous routing configuration (sort: 'via' GW has to be # inserted after device routes) - oldRoutes=$($IP route show | sort -k 2) + + $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES echo "Deleting routing rules previously set by user space processes..." $IP route show | grep -v 'proto kernel' | \ @@ -455,7 +466,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:45 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:54 2012 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 94a8b1a0a..5dd296190 100755 --- a/test/ipt/firewall36.fw.orig +++ b/test/ipt/firewall36.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:41 2012 PST by vadim +# Generated Mon Feb 20 14:10:50 2012 PST by vadim # # files: * firewall36.fw /etc/firewall36.fw # @@ -346,9 +346,20 @@ script_body() { # ============== ROUTING RULES ============== - TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + HAVE_MKTEMP=$(which mktemp) + + test -n "$HAVE_MKTEMP" && { + TMPDIRNAME=$(mktemp -d) + test -z "$TMPDIRNAME" && exit 1 + } + + test -z "$HAVE_MKTEMP" && { + TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + (umask 077 && mkdir $TMPDIRNAME) || exit 1 + } + TMPFILENAME="$TMPDIRNAME/.fwbuilder.out" - (umask 077 && mkdir $TMPDIRNAME) || exit 1 + OLD_ROUTES="$TMPDIRNAME/.old_routes" # # This function stops stdout redirection @@ -368,8 +379,7 @@ script_body() { # delete current routing rules $IP route show | while read route ; do $IP route del $route ; done # restore old routing rules - (IFS=" - "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done) + sh $OLD_ROUTES echo "...done" restore_script_output epilog_commands @@ -383,7 +393,8 @@ script_body() { # store previous routing configuration (sort: 'via' GW has to be # inserted after device routes) - oldRoutes=$($IP route show | sort -k 2) + + $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES echo "Deleting routing rules previously set by user space processes..." $IP route show | grep -v 'proto kernel' | \ @@ -519,7 +530,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:41 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:50 2012 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 ea8097009..f417d3733 100755 --- a/test/ipt/firewall37-1.fw.orig +++ b/test/ipt/firewall37-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:48 2012 PST by vadim +# Generated Mon Feb 20 14:10:57 2012 PST by vadim # # files: * firewall37-1.fw /etc/fw/firewall37-1.fw # @@ -988,7 +988,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:48 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:57 2012 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 7519e2a44..4746f426d 100755 --- a/test/ipt/firewall37-2.fw.orig +++ b/test/ipt/firewall37-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:48 2012 PST by vadim +# Generated Mon Feb 20 14:10:57 2012 PST by vadim # # files: * firewall37-2.fw /etc/fw/firewall37-2.fw # @@ -705,7 +705,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:48 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:57 2012 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 7c404df41..d5b1038d7 100755 --- a/test/ipt/firewall37.fw.orig +++ b/test/ipt/firewall37.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:48 2012 PST by vadim +# Generated Mon Feb 20 14:10:57 2012 PST by vadim # # files: * firewall37.fw /etc/fw/firewall37.fw # @@ -1314,7 +1314,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:48 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:57 2012 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 f58ac944f..279ce7fa8 100755 --- a/test/ipt/firewall38.fw.orig +++ b/test/ipt/firewall38.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:49 2012 PST by vadim +# Generated Mon Feb 20 14:10:58 2012 PST by vadim # # files: * firewall38.fw /etc/fw/firewall38.fw # @@ -541,7 +541,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:49 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:10:58 2012 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 4ecf2a411..03493eae8 100755 --- a/test/ipt/firewall39.fw.orig +++ b/test/ipt/firewall39.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:54 2012 PST by vadim +# Generated Mon Feb 20 14:11:04 2012 PST by vadim # # files: * firewall39.fw /etc/fw/firewall39.fw # @@ -821,7 +821,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:54 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:04 2012 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 fa2c86252..2fe924adb 100755 --- a/test/ipt/firewall4.fw.orig +++ b/test/ipt/firewall4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:54 2012 PST by vadim +# Generated Mon Feb 20 14:11:04 2012 PST by vadim # # files: * firewall4.fw /etc/fw/firewall4.fw # @@ -741,7 +741,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:54 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:04 2012 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 554189807..9f5448b40 100755 --- a/test/ipt/firewall40-1.fw.orig +++ b/test/ipt/firewall40-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:54 2012 PST by vadim +# Generated Mon Feb 20 14:11:04 2012 PST by vadim # # files: * firewall40-1.fw /etc/firewall40-1.fw # @@ -463,7 +463,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:54 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:04 2012 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 6cf4bbc4b..b971fc1b1 100755 --- a/test/ipt/firewall40-2.fw.orig +++ b/test/ipt/firewall40-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:00 2012 PST by vadim +# Generated Mon Feb 20 14:11:11 2012 PST by vadim # # files: * firewall40-2.fw /etc/firewall40-2.fw # @@ -450,7 +450,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:00 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:11 2012 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 a32ab6ab4..5930d62eb 100755 --- a/test/ipt/firewall40.fw.orig +++ b/test/ipt/firewall40.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:50:54 2012 PST by vadim +# Generated Mon Feb 20 14:11:04 2012 PST by vadim # # files: * firewall40.fw /etc/firewall40.fw # @@ -456,7 +456,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:50:54 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:04 2012 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 2e1c22719..48d6a8df8 100755 --- a/test/ipt/firewall41-1.fw.orig +++ b/test/ipt/firewall41-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:01 2012 PST by vadim +# Generated Mon Feb 20 14:11:11 2012 PST by vadim # # files: * firewall41-1.fw /etc/firewall41-1.fw # @@ -597,7 +597,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:01 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:11 2012 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 d6df40398..314cb518b 100755 --- a/test/ipt/firewall41.fw.orig +++ b/test/ipt/firewall41.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:01 2012 PST by vadim +# Generated Mon Feb 20 14:11:11 2012 PST by vadim # # files: * firewall41.fw /etc/firewall41.fw # @@ -481,7 +481,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:01 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:11 2012 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 b2f20933f..6918b90cb 100755 --- a/test/ipt/firewall42.fw.orig +++ b/test/ipt/firewall42.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:07 2012 PST by vadim +# Generated Mon Feb 20 14:11:17 2012 PST by vadim # # files: * firewall42.fw /etc/fw/firewall42.fw # @@ -406,7 +406,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:07 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:17 2012 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 1eb10df75..28ee4facc 100755 --- a/test/ipt/firewall5.fw.orig +++ b/test/ipt/firewall5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:08 2012 PST by vadim +# Generated Mon Feb 20 14:11:17 2012 PST by vadim # # files: * firewall5.fw /etc/fw/firewall5.fw # @@ -648,7 +648,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:08 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:17 2012 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 92726af9b..2e13868c1 100755 --- a/test/ipt/firewall50.fw.orig +++ b/test/ipt/firewall50.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:08 2012 PST by vadim +# Generated Mon Feb 20 14:11:17 2012 PST by vadim # # files: * firewall50.fw /etc/fw/firewall50.fw # @@ -440,7 +440,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:08 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:17 2012 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 0b1cdb119..2bbbb914d 100755 --- a/test/ipt/firewall51.fw.orig +++ b/test/ipt/firewall51.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:08 2012 PST by vadim +# Generated Mon Feb 20 14:11:17 2012 PST by vadim # # files: * firewall51.fw /etc/fw/firewall51.fw # @@ -513,7 +513,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:08 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:17 2012 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 c7dd50f70..784c21e20 100755 --- a/test/ipt/firewall6.fw.orig +++ b/test/ipt/firewall6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:13 2012 PST by vadim +# Generated Mon Feb 20 14:11:24 2012 PST by vadim # # files: * firewall6.fw /etc/fw/firewall6.fw # @@ -542,7 +542,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:13 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:24 2012 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 ef7bb700e..bb28946ec 100755 --- a/test/ipt/firewall60.fw.orig +++ b/test/ipt/firewall60.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:14 2012 PST by vadim +# Generated Mon Feb 20 14:11:24 2012 PST by vadim # # files: * firewall60.fw /etc/firewall60.fw # @@ -441,7 +441,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:14 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:24 2012 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 cd7561fe4..c2c95cb28 100755 --- a/test/ipt/firewall61-1.2.5.fw.orig +++ b/test/ipt/firewall61-1.2.5.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:14 2012 PST by vadim +# Generated Mon Feb 20 14:11:24 2012 PST by vadim # # files: * firewall61-1.2.5.fw /etc/firewall61-1.2.5.fw # @@ -521,7 +521,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:14 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:24 2012 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 337d6de5b..33be7c580 100755 --- a/test/ipt/firewall61-1.2.6.fw.orig +++ b/test/ipt/firewall61-1.2.6.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:15 2012 PST by vadim +# Generated Mon Feb 20 14:11:24 2012 PST by vadim # # files: * firewall61-1.2.6.fw /etc/firewall61-1.2.6.fw # @@ -527,7 +527,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:15 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:24 2012 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 a84e2e1f2..499c168bf 100755 --- a/test/ipt/firewall61-1.3.x.fw.orig +++ b/test/ipt/firewall61-1.3.x.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:18 2012 PST by vadim +# Generated Mon Feb 20 14:11:30 2012 PST by vadim # # files: * firewall61-1.3.x.fw /etc/firewall61-1.3.x.fw # @@ -514,7 +514,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:18 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:30 2012 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 fbd31bca4..40477fe5b 100755 --- a/test/ipt/firewall61-1.4.fw.orig +++ b/test/ipt/firewall61-1.4.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:21 2012 PST by vadim +# Generated Mon Feb 20 14:11:30 2012 PST by vadim # # files: * firewall61-1.4.fw /etc/firewall61-1.4.fw # @@ -515,7 +515,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:21 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:30 2012 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 f0215a647..80b546fb6 100755 --- a/test/ipt/firewall62.fw.orig +++ b/test/ipt/firewall62.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:21 2012 PST by vadim +# Generated Mon Feb 20 14:11:30 2012 PST by vadim # # files: * firewall62.fw /etc/firewall62.fw # @@ -591,7 +591,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:21 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:30 2012 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 979485b59..cf46fc22e 100755 --- a/test/ipt/firewall63.fw.orig +++ b/test/ipt/firewall63.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:21 2012 PST by vadim +# Generated Mon Feb 20 14:11:30 2012 PST by vadim # # files: * firewall63.fw /etc/firewall63.fw # @@ -411,7 +411,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:21 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:30 2012 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 a181ff3be..9fa9d92bc 100755 --- a/test/ipt/firewall7.fw.orig +++ b/test/ipt/firewall7.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:24 2012 PST by vadim +# Generated Mon Feb 20 14:11:36 2012 PST by vadim # # files: * firewall7.fw /etc/fw/firewall7.fw # @@ -495,7 +495,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:24 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:36 2012 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 9ee919917..d77f4aa33 100755 --- a/test/ipt/firewall70.fw.orig +++ b/test/ipt/firewall70.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:27 2012 PST by vadim +# Generated Mon Feb 20 14:11:37 2012 PST by vadim # # files: * firewall70.fw iptables.sh # @@ -434,7 +434,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:27 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:37 2012 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 53a3c4186..556b8057f 100755 --- a/test/ipt/firewall71.fw.orig +++ b/test/ipt/firewall71.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:28 2012 PST by vadim +# Generated Mon Feb 20 14:11:36 2012 PST by vadim # # files: * firewall71.fw /etc/fw/firewall71.fw # @@ -450,7 +450,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:28 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:36 2012 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 ac7b144f4..fc593ec1f 100755 --- a/test/ipt/firewall72-1.3.x.fw.orig +++ b/test/ipt/firewall72-1.3.x.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:28 2012 PST by vadim +# Generated Mon Feb 20 14:11:37 2012 PST by vadim # # files: * firewall72-1.3.x.fw /etc/fw/firewall72-1.3.x.fw # @@ -582,7 +582,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:28 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:37 2012 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 61feb3778..5609a47c5 100755 --- a/test/ipt/firewall72-1.4.3.fw.orig +++ b/test/ipt/firewall72-1.4.3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:29 2012 PST by vadim +# Generated Mon Feb 20 14:11:43 2012 PST by vadim # # files: * firewall72-1.4.3.fw /etc/fw/firewall72-1.4.3.fw # @@ -582,7 +582,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:29 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:43 2012 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 948d4eb88..b745a92d1 100755 --- a/test/ipt/firewall73.fw.orig +++ b/test/ipt/firewall73.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:34 2012 PST by vadim +# Generated Mon Feb 20 14:11:43 2012 PST by vadim # # files: * firewall73.fw /etc/fw/firewall73.fw # @@ -545,7 +545,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:34 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:43 2012 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 01027e4c4..8819920a9 100755 --- a/test/ipt/firewall74.fw.orig +++ b/test/ipt/firewall74.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:34 2012 PST by vadim +# Generated Mon Feb 20 14:11:43 2012 PST by vadim # # files: * firewall74.fw /etc/fw/firewall74.fw # @@ -397,7 +397,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:34 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:43 2012 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 ec24c2fcc..45d03637c 100755 --- a/test/ipt/firewall8.fw.orig +++ b/test/ipt/firewall8.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:34 2012 PST by vadim +# Generated Mon Feb 20 14:11:43 2012 PST by vadim # # files: * firewall8.fw /etc/fw/firewall8.fw # @@ -382,7 +382,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:34 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:43 2012 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 f4f1dfb2d..7ec60c03c 100755 --- a/test/ipt/firewall80.fw.orig +++ b/test/ipt/firewall80.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:35 2012 PST by vadim +# Generated Mon Feb 20 14:11:49 2012 PST by vadim # # files: * firewall80.fw /etc/fw/firewall80.fw # @@ -421,7 +421,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:35 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:49 2012 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 001190adf..c56f3b499 100755 --- a/test/ipt/firewall81.fw.orig +++ b/test/ipt/firewall81.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:40 2012 PST by vadim +# Generated Mon Feb 20 14:11:50 2012 PST by vadim # # files: * firewall81.fw /etc/fw/firewall81.fw # @@ -442,7 +442,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:40 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:50 2012 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 064ee1292..3fe67e208 100755 --- a/test/ipt/firewall82.fw.orig +++ b/test/ipt/firewall82.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:41 2012 PST by vadim +# Generated Mon Feb 20 14:11:50 2012 PST by vadim # # files: * firewall82.fw /etc/firewall82.fw # @@ -435,7 +435,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:41 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:50 2012 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 0f4427ec1..0d1a5e453 100755 --- a/test/ipt/firewall82_A.fw.orig +++ b/test/ipt/firewall82_A.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:41 2012 PST by vadim +# Generated Mon Feb 20 14:11:50 2012 PST by vadim # # files: * firewall82_A.fw /etc/fw/firewall82_A.fw # @@ -422,7 +422,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:41 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:50 2012 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 6c84cc414..92e34816a 100755 --- a/test/ipt/firewall82_B.fw.orig +++ b/test/ipt/firewall82_B.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:41 2012 PST by vadim +# Generated Mon Feb 20 14:11:55 2012 PST by vadim # # files: * firewall82_B.fw /etc/fw/firewall82_B.fw # @@ -385,7 +385,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:41 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:55 2012 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 c6c8090e4..8f3b2d717 100755 --- a/test/ipt/firewall9.fw.orig +++ b/test/ipt/firewall9.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:46 2012 PST by vadim +# Generated Mon Feb 20 14:11:56 2012 PST by vadim # # files: * firewall9.fw /etc/fw/firewall9.fw # @@ -643,7 +643,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:46 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:56 2012 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 61c1a1b12..065f1cb46 100755 --- a/test/ipt/firewall90.fw.orig +++ b/test/ipt/firewall90.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:47 2012 PST by vadim +# Generated Mon Feb 20 14:11:56 2012 PST by vadim # # files: * firewall90.fw /etc/fw/firewall90.fw # @@ -405,7 +405,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:47 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:56 2012 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 91ce68a63..c4572d610 100755 --- a/test/ipt/firewall91.fw.orig +++ b/test/ipt/firewall91.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:48 2012 PST by vadim +# Generated Mon Feb 20 14:11:56 2012 PST by vadim # # files: * firewall91.fw /etc/fw/firewall91.fw # @@ -405,7 +405,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:48 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:56 2012 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 97ef4eac4..45cf94c5a 100755 --- a/test/ipt/firewall92.fw.orig +++ b/test/ipt/firewall92.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:47 2012 PST by vadim +# Generated Mon Feb 20 14:12:01 2012 PST by vadim # # files: * firewall92.fw /etc/fw/firewall92.fw # @@ -441,7 +441,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:47 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:01 2012 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 fa9ecd22d..3f8fbbeee 100755 --- a/test/ipt/firewall93.fw.orig +++ b/test/ipt/firewall93.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:51 2012 PST by vadim +# Generated Mon Feb 20 14:12:03 2012 PST by vadim # # files: * firewall93.fw /etc/fw/firewall93.fw # @@ -491,7 +491,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:51 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:03 2012 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 ca98d0c0f..10a8cbdba 100755 --- a/test/ipt/firewall94.fw.orig +++ b/test/ipt/firewall94.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:53 2012 PST by vadim +# Generated Mon Feb 20 14:12:03 2012 PST by vadim # # files: * firewall94.fw /etc/fw/firewall94.fw # @@ -543,7 +543,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:53 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:03 2012 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 c338973a1..8532b620b 100755 --- a/test/ipt/firewall95.fw.orig +++ b/test/ipt/firewall95.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:54 2012 PST by vadim +# Generated Mon Feb 20 14:12:03 2012 PST by vadim # # files: * firewall95.fw /etc/fw/firewall95.fw # @@ -393,7 +393,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:51:54 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:03 2012 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 23717cf83..6e68820e9 100755 --- a/test/ipt/fw-A.fw.orig +++ b/test/ipt/fw-A.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:28 2012 PST by vadim +# Generated Mon Feb 20 14:12:37 2012 PST by vadim # # files: * fw-A.fw /sw/FWbuilder/fw-A.fw # @@ -581,9 +581,20 @@ script_body() { # ============== ROUTING RULES ============== - TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + HAVE_MKTEMP=$(which mktemp) + + test -n "$HAVE_MKTEMP" && { + TMPDIRNAME=$(mktemp -d) + test -z "$TMPDIRNAME" && exit 1 + } + + test -z "$HAVE_MKTEMP" && { + TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + (umask 077 && mkdir $TMPDIRNAME) || exit 1 + } + TMPFILENAME="$TMPDIRNAME/.fwbuilder.out" - (umask 077 && mkdir $TMPDIRNAME) || exit 1 + OLD_ROUTES="$TMPDIRNAME/.old_routes" # # This function stops stdout redirection @@ -603,8 +614,7 @@ script_body() { # delete current routing rules $IP route show | while read route ; do $IP route del $route ; done # restore old routing rules - (IFS=" - "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done) + sh $OLD_ROUTES echo "...done" restore_script_output epilog_commands @@ -618,7 +628,8 @@ script_body() { # store previous routing configuration (sort: 'via' GW has to be # inserted after device routes) - oldRoutes=$($IP route show | sort -k 2) + + $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES echo "Deleting routing rules previously set by user space processes..." $IP route show | grep -v 'proto kernel' | \ @@ -746,7 +757,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:28 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:37 2012 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 25ec5222d..2aabdc61e 100755 --- a/test/ipt/fw1.fw.orig +++ b/test/ipt/fw1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:28 2012 PST by vadim +# Generated Mon Feb 20 14:12:37 2012 PST by vadim # # files: * fw1.fw /etc/fw1.fw # @@ -554,7 +554,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:28 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:37 2012 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 7f4557f81..1746609f9 100755 --- a/test/ipt/fwbuilder.fw.orig +++ b/test/ipt/fwbuilder.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:51:01 2012 PST by vadim +# Generated Mon Feb 20 14:11:11 2012 PST by vadim # # files: * fwbuilder.fw /etc/init.d/fwbuilder.fw # @@ -505,7 +505,7 @@ status_action() { } start() { - log "Activating firewall script generated Mon Feb 20 11:51:01 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:11:11 2012 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 3c1bdc903..f1fe65b73 100755 --- a/test/ipt/heartbeat_cluster_1_d_linux-1-d.fw.orig +++ b/test/ipt/heartbeat_cluster_1_d_linux-1-d.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:36 2012 PST by vadim +# Generated Mon Feb 20 14:12:47 2012 PST by vadim # # files: * heartbeat_cluster_1_d_linux-1-d.fw firewall.sh # @@ -748,7 +748,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:36 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:47 2012 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 3f8c1ca05..b37f55d25 100755 --- a/test/ipt/heartbeat_cluster_1_d_linux-2-d.fw.orig +++ b/test/ipt/heartbeat_cluster_1_d_linux-2-d.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:37 2012 PST by vadim +# Generated Mon Feb 20 14:12:47 2012 PST by vadim # # files: * heartbeat_cluster_1_d_linux-2-d.fw firewall.sh # @@ -750,7 +750,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:37 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:47 2012 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 e2135e14e..33eb63955 100755 --- a/test/ipt/heartbeat_cluster_1_linux-1.fw.orig +++ b/test/ipt/heartbeat_cluster_1_linux-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:35 2012 PST by vadim +# Generated Mon Feb 20 14:12:46 2012 PST by vadim # # files: * heartbeat_cluster_1_linux-1.fw /etc/heartbeat_cluster_1_linux-1.fw # @@ -753,9 +753,20 @@ script_body() { # ============== ROUTING RULES ============== - TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + HAVE_MKTEMP=$(which mktemp) + + test -n "$HAVE_MKTEMP" && { + TMPDIRNAME=$(mktemp -d) + test -z "$TMPDIRNAME" && exit 1 + } + + test -z "$HAVE_MKTEMP" && { + TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + (umask 077 && mkdir $TMPDIRNAME) || exit 1 + } + TMPFILENAME="$TMPDIRNAME/.fwbuilder.out" - (umask 077 && mkdir $TMPDIRNAME) || exit 1 + OLD_ROUTES="$TMPDIRNAME/.old_routes" # # This function stops stdout redirection @@ -775,8 +786,7 @@ script_body() { # delete current routing rules $IP route show | while read route ; do $IP route del $route ; done # restore old routing rules - (IFS=" - "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done) + sh $OLD_ROUTES echo "...done" restore_script_output epilog_commands @@ -790,7 +800,8 @@ script_body() { # store previous routing configuration (sort: 'via' GW has to be # inserted after device routes) - oldRoutes=$($IP route show | sort -k 2) + + $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES echo "Deleting routing rules previously set by user space processes..." $IP route show | grep -v '\( proto kernel \)\|\(default via \)' | \ @@ -865,7 +876,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:35 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:46 2012 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 15936c6d3..600699425 100755 --- a/test/ipt/heartbeat_cluster_1_linux-2.fw.orig +++ b/test/ipt/heartbeat_cluster_1_linux-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:36 2012 PST by vadim +# Generated Mon Feb 20 14:12:46 2012 PST by vadim # # files: * heartbeat_cluster_1_linux-2.fw /etc/heartbeat_cluster_1_linux-2.fw # @@ -651,9 +651,20 @@ script_body() { # ============== ROUTING RULES ============== - TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + HAVE_MKTEMP=$(which mktemp) + + test -n "$HAVE_MKTEMP" && { + TMPDIRNAME=$(mktemp -d) + test -z "$TMPDIRNAME" && exit 1 + } + + test -z "$HAVE_MKTEMP" && { + TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + (umask 077 && mkdir $TMPDIRNAME) || exit 1 + } + TMPFILENAME="$TMPDIRNAME/.fwbuilder.out" - (umask 077 && mkdir $TMPDIRNAME) || exit 1 + OLD_ROUTES="$TMPDIRNAME/.old_routes" # # This function stops stdout redirection @@ -673,8 +684,7 @@ script_body() { # delete current routing rules $IP route show | while read route ; do $IP route del $route ; done # restore old routing rules - (IFS=" - "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done) + sh $OLD_ROUTES echo "...done" restore_script_output epilog_commands @@ -688,7 +698,8 @@ script_body() { # store previous routing configuration (sort: 'via' GW has to be # inserted after device routes) - oldRoutes=$($IP route show | sort -k 2) + + $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES echo "Deleting routing rules previously set by user space processes..." $IP route show | grep -v '\( proto kernel \)\|\(default via \)' | \ @@ -763,7 +774,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:36 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:46 2012 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 437138954..267832438 100755 --- a/test/ipt/heartbeat_cluster_2_linux-1.fw.orig +++ b/test/ipt/heartbeat_cluster_2_linux-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:36 2012 PST by vadim +# Generated Mon Feb 20 14:12:48 2012 PST by vadim # # files: * heartbeat_cluster_2_linux-1.fw /etc/heartbeat_cluster_2_linux-1.fw # @@ -617,9 +617,20 @@ script_body() { # ============== ROUTING RULES ============== - TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + HAVE_MKTEMP=$(which mktemp) + + test -n "$HAVE_MKTEMP" && { + TMPDIRNAME=$(mktemp -d) + test -z "$TMPDIRNAME" && exit 1 + } + + test -z "$HAVE_MKTEMP" && { + TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + (umask 077 && mkdir $TMPDIRNAME) || exit 1 + } + TMPFILENAME="$TMPDIRNAME/.fwbuilder.out" - (umask 077 && mkdir $TMPDIRNAME) || exit 1 + OLD_ROUTES="$TMPDIRNAME/.old_routes" # # This function stops stdout redirection @@ -639,8 +650,7 @@ script_body() { # delete current routing rules $IP route show | while read route ; do $IP route del $route ; done # restore old routing rules - (IFS=" - "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done) + sh $OLD_ROUTES echo "...done" restore_script_output epilog_commands @@ -654,7 +664,8 @@ script_body() { # store previous routing configuration (sort: 'via' GW has to be # inserted after device routes) - oldRoutes=$($IP route show | sort -k 2) + + $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES echo "Deleting routing rules previously set by user space processes..." $IP route show | grep -v '\( proto kernel \)\|\(default via \)' | \ @@ -729,7 +740,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:36 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:48 2012 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 74c367ea6..0da7fcfaa 100755 --- a/test/ipt/heartbeat_cluster_2_linux-2.fw.orig +++ b/test/ipt/heartbeat_cluster_2_linux-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:37 2012 PST by vadim +# Generated Mon Feb 20 14:12:48 2012 PST by vadim # # files: * heartbeat_cluster_2_linux-2.fw /etc/heartbeat_cluster_2_linux-2.fw # @@ -530,9 +530,20 @@ script_body() { # ============== ROUTING RULES ============== - TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + HAVE_MKTEMP=$(which mktemp) + + test -n "$HAVE_MKTEMP" && { + TMPDIRNAME=$(mktemp -d) + test -z "$TMPDIRNAME" && exit 1 + } + + test -z "$HAVE_MKTEMP" && { + TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + (umask 077 && mkdir $TMPDIRNAME) || exit 1 + } + TMPFILENAME="$TMPDIRNAME/.fwbuilder.out" - (umask 077 && mkdir $TMPDIRNAME) || exit 1 + OLD_ROUTES="$TMPDIRNAME/.old_routes" # # This function stops stdout redirection @@ -552,8 +563,7 @@ script_body() { # delete current routing rules $IP route show | while read route ; do $IP route del $route ; done # restore old routing rules - (IFS=" - "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done) + sh $OLD_ROUTES echo "...done" restore_script_output epilog_commands @@ -567,7 +577,8 @@ script_body() { # store previous routing configuration (sort: 'via' GW has to be # inserted after device routes) - oldRoutes=$($IP route show | sort -k 2) + + $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES echo "Deleting routing rules previously set by user space processes..." $IP route show | grep -v '\( proto kernel \)\|\(default via \)' | \ @@ -642,7 +653,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:37 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:48 2012 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 f64b170b9..1814e66c6 100755 --- a/test/ipt/host.fw.orig +++ b/test/ipt/host.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:28 2012 PST by vadim +# Generated Mon Feb 20 14:12:42 2012 PST by vadim # # files: * host.fw /etc/fw/host.fw # @@ -444,7 +444,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:28 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:42 2012 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 ac33e1fb2..01a76407f 100755 --- a/test/ipt/openais_cluster_1_linux-1.fw.orig +++ b/test/ipt/openais_cluster_1_linux-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:37 2012 PST by vadim +# Generated Mon Feb 20 14:12:48 2012 PST by vadim # # files: * openais_cluster_1_linux-1.fw /etc/openais_cluster_1_linux-1.fw # @@ -598,9 +598,20 @@ script_body() { # ============== ROUTING RULES ============== - TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + HAVE_MKTEMP=$(which mktemp) + + test -n "$HAVE_MKTEMP" && { + TMPDIRNAME=$(mktemp -d) + test -z "$TMPDIRNAME" && exit 1 + } + + test -z "$HAVE_MKTEMP" && { + TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + (umask 077 && mkdir $TMPDIRNAME) || exit 1 + } + TMPFILENAME="$TMPDIRNAME/.fwbuilder.out" - (umask 077 && mkdir $TMPDIRNAME) || exit 1 + OLD_ROUTES="$TMPDIRNAME/.old_routes" # # This function stops stdout redirection @@ -620,8 +631,7 @@ script_body() { # delete current routing rules $IP route show | while read route ; do $IP route del $route ; done # restore old routing rules - (IFS=" - "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done) + sh $OLD_ROUTES echo "...done" restore_script_output epilog_commands @@ -635,7 +645,8 @@ script_body() { # store previous routing configuration (sort: 'via' GW has to be # inserted after device routes) - oldRoutes=$($IP route show | sort -k 2) + + $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES echo "Deleting routing rules previously set by user space processes..." $IP route show | grep -v '\( proto kernel \)\|\(default via \)' | \ @@ -729,7 +740,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:37 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:48 2012 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 de85a23c3..bf16a7f0b 100755 --- a/test/ipt/openais_cluster_1_linux-2.fw.orig +++ b/test/ipt/openais_cluster_1_linux-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:38 2012 PST by vadim +# Generated Mon Feb 20 14:12:48 2012 PST by vadim # # files: * openais_cluster_1_linux-2.fw /etc/openais_cluster_1_linux-2.fw # @@ -502,9 +502,20 @@ script_body() { # ============== ROUTING RULES ============== - TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + HAVE_MKTEMP=$(which mktemp) + + test -n "$HAVE_MKTEMP" && { + TMPDIRNAME=$(mktemp -d) + test -z "$TMPDIRNAME" && exit 1 + } + + test -z "$HAVE_MKTEMP" && { + TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + (umask 077 && mkdir $TMPDIRNAME) || exit 1 + } + TMPFILENAME="$TMPDIRNAME/.fwbuilder.out" - (umask 077 && mkdir $TMPDIRNAME) || exit 1 + OLD_ROUTES="$TMPDIRNAME/.old_routes" # # This function stops stdout redirection @@ -524,8 +535,7 @@ script_body() { # delete current routing rules $IP route show | while read route ; do $IP route del $route ; done # restore old routing rules - (IFS=" - "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done) + sh $OLD_ROUTES echo "...done" restore_script_output epilog_commands @@ -539,7 +549,8 @@ script_body() { # store previous routing configuration (sort: 'via' GW has to be # inserted after device routes) - oldRoutes=$($IP route show | sort -k 2) + + $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES echo "Deleting routing rules previously set by user space processes..." $IP route show | grep -v '\( proto kernel \)\|\(default via \)' | \ @@ -633,7 +644,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:38 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:48 2012 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 310cbd711..be80bf64c 100755 --- a/test/ipt/rh90.fw.orig +++ b/test/ipt/rh90.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:34 2012 PST by vadim +# Generated Mon Feb 20 14:12:44 2012 PST by vadim # # files: * rh90.fw /etc/rh90.fw # @@ -443,7 +443,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:34 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:44 2012 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 8c62e7c25..6e0e13640 100755 --- a/test/ipt/secuwall_cluster_1_secuwall-1.fw.orig +++ b/test/ipt/secuwall_cluster_1_secuwall-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:37 2012 PST by vadim +# Generated Mon Feb 20 14:12:49 2012 PST by vadim # # files: * secuwall_cluster_1_secuwall-1.fw /etc/secuwall_cluster_1_secuwall-1.fw # @@ -427,7 +427,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:37 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:49 2012 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 b2201a504..72e15f7fc 100755 --- a/test/ipt/server-cluster-1_server-1.fw.orig +++ b/test/ipt/server-cluster-1_server-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:38 2012 PST by vadim +# Generated Mon Feb 20 14:12:49 2012 PST by vadim # # files: * server-cluster-1_server-1.fw /etc/fw/server-cluster-1_server-1.fw # @@ -422,7 +422,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:38 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:49 2012 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 dd46358b8..189755e8e 100755 --- a/test/ipt/server-cluster-1_server-2.fw.orig +++ b/test/ipt/server-cluster-1_server-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:38 2012 PST by vadim +# Generated Mon Feb 20 14:12:49 2012 PST by vadim # # files: * server-cluster-1_server-2.fw /etc/fw/server-cluster-1_server-2.fw # @@ -419,7 +419,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:38 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:49 2012 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 fa18c6250..7c40304ae 100755 --- a/test/ipt/test-shadowing-1.fw.orig +++ b/test/ipt/test-shadowing-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:34 2012 PST by vadim +# Generated Mon Feb 20 14:12:47 2012 PST by vadim # # files: * test-shadowing-1.fw /etc/test-shadowing-1.fw # @@ -493,7 +493,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:34 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:47 2012 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 f3e3596a4..4d6099c0c 100755 --- a/test/ipt/test-shadowing-2.fw.orig +++ b/test/ipt/test-shadowing-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:37 2012 PST by vadim +# Generated Mon Feb 20 14:12:50 2012 PST by vadim # # files: * test-shadowing-2.fw /etc/test-shadowing-2.fw # @@ -451,7 +451,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:37 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:50 2012 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 2a2933bf3..0cf1095e4 100755 --- a/test/ipt/test-shadowing-3.fw.orig +++ b/test/ipt/test-shadowing-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:39 2012 PST by vadim +# Generated Mon Feb 20 14:12:50 2012 PST by vadim # # files: * test-shadowing-3.fw /etc/test-shadowing-3.fw # @@ -552,7 +552,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:39 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:50 2012 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 38394f092..b71aadf12 100755 --- a/test/ipt/test_fw.fw.orig +++ b/test/ipt/test_fw.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:34 2012 PST by vadim +# Generated Mon Feb 20 14:12:44 2012 PST by vadim # # files: * test_fw.fw /etc/test_fw.fw # @@ -599,7 +599,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:34 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:44 2012 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 9a0f99672..2a258e2bf 100755 --- a/test/ipt/vrrp_cluster_1_linux-1.fw.orig +++ b/test/ipt/vrrp_cluster_1_linux-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:38 2012 PST by vadim +# Generated Mon Feb 20 14:12:50 2012 PST by vadim # # files: * vrrp_cluster_1_linux-1.fw /etc/vrrp_cluster_1_linux-1.fw # @@ -601,9 +601,20 @@ script_body() { # ============== ROUTING RULES ============== - TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + HAVE_MKTEMP=$(which mktemp) + + test -n "$HAVE_MKTEMP" && { + TMPDIRNAME=$(mktemp -d) + test -z "$TMPDIRNAME" && exit 1 + } + + test -z "$HAVE_MKTEMP" && { + TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + (umask 077 && mkdir $TMPDIRNAME) || exit 1 + } + TMPFILENAME="$TMPDIRNAME/.fwbuilder.out" - (umask 077 && mkdir $TMPDIRNAME) || exit 1 + OLD_ROUTES="$TMPDIRNAME/.old_routes" # # This function stops stdout redirection @@ -623,8 +634,7 @@ script_body() { # delete current routing rules $IP route show | while read route ; do $IP route del $route ; done # restore old routing rules - (IFS=" - "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done) + sh $OLD_ROUTES echo "...done" restore_script_output epilog_commands @@ -638,7 +648,8 @@ script_body() { # store previous routing configuration (sort: 'via' GW has to be # inserted after device routes) - oldRoutes=$($IP route show | sort -k 2) + + $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES echo "Deleting routing rules previously set by user space processes..." $IP route show | grep -v '\( proto kernel \)\|\(default via \)' | \ @@ -732,7 +743,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:38 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:50 2012 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 18aa7d295..7026eb605 100755 --- a/test/ipt/vrrp_cluster_1_linux-2.fw.orig +++ b/test/ipt/vrrp_cluster_1_linux-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:38 2012 PST by vadim +# Generated Mon Feb 20 14:12:50 2012 PST by vadim # # files: * vrrp_cluster_1_linux-2.fw /etc/vrrp_cluster_1_linux-2.fw # @@ -506,9 +506,20 @@ script_body() { # ============== ROUTING RULES ============== - TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + HAVE_MKTEMP=$(which mktemp) + + test -n "$HAVE_MKTEMP" && { + TMPDIRNAME=$(mktemp -d) + test -z "$TMPDIRNAME" && exit 1 + } + + test -z "$HAVE_MKTEMP" && { + TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$" + (umask 077 && mkdir $TMPDIRNAME) || exit 1 + } + TMPFILENAME="$TMPDIRNAME/.fwbuilder.out" - (umask 077 && mkdir $TMPDIRNAME) || exit 1 + OLD_ROUTES="$TMPDIRNAME/.old_routes" # # This function stops stdout redirection @@ -528,8 +539,7 @@ script_body() { # delete current routing rules $IP route show | while read route ; do $IP route del $route ; done # restore old routing rules - (IFS=" - "; for route in $oldRoutes; do (IFS=' '; $IP route add $route); done) + sh $OLD_ROUTES echo "...done" restore_script_output epilog_commands @@ -543,7 +553,8 @@ script_body() { # store previous routing configuration (sort: 'via' GW has to be # inserted after device routes) - oldRoutes=$($IP route show | sort -k 2) + + $IP route show | sort -k 2 | awk '{printf "ip route add %s\n",$0;}' > $OLD_ROUTES echo "Deleting routing rules previously set by user space processes..." $IP route show | grep -v '\( proto kernel \)\|\(default via \)' | \ @@ -637,7 +648,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:38 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:50 2012 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 aaccf7f27..246faea34 100755 --- a/test/ipt/vrrp_cluster_2_linux-1.fw.orig +++ b/test/ipt/vrrp_cluster_2_linux-1.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:38 2012 PST by vadim +# Generated Mon Feb 20 14:12:50 2012 PST by vadim # # files: * vrrp_cluster_2_linux-1.fw /etc/vrrp_cluster_2_linux-1.fw # @@ -664,7 +664,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:38 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:50 2012 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 00fb3700a..654d8da2d 100755 --- a/test/ipt/vrrp_cluster_2_linux-2.fw.orig +++ b/test/ipt/vrrp_cluster_2_linux-2.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:38 2012 PST by vadim +# Generated Mon Feb 20 14:12:50 2012 PST by vadim # # files: * vrrp_cluster_2_linux-2.fw /etc/vrrp_cluster_2_linux-2.fw # @@ -569,7 +569,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:38 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:50 2012 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 9f03df1b9..0e0a7b1a7 100755 --- a/test/ipt/vrrp_cluster_2_linux-3.fw.orig +++ b/test/ipt/vrrp_cluster_2_linux-3.fw.orig @@ -4,7 +4,7 @@ # # Firewall Builder fwb_ipt v5.0.2.3595 # -# Generated Mon Feb 20 11:52:39 2012 PST by vadim +# Generated Mon Feb 20 14:12:50 2012 PST by vadim # # files: * vrrp_cluster_2_linux-3.fw /etc/vrrp_cluster_2_linux-3.fw # @@ -545,7 +545,7 @@ test -z "$cmd" && { case "$cmd" in start) - log "Activating firewall script generated Mon Feb 20 11:52:39 2012 by vadim" + log "Activating firewall script generated Mon Feb 20 14:12:50 2012 by vadim" check_tools prolog_commands check_run_time_address_table_files