diff --git a/doc/ChangeLog b/doc/ChangeLog
index 456581fe5..106acdcac 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-04  vadim  <vadim@netcitadel.com>
+
+	* freebsdInterfaces.cpp (manageIpAddresses): fixes #2032 "support
+	for DHCP interfaces in rc.conf mode". Include dynamic interfaces
+	inin the list of interfaces generated script manages when the
+	script is in rc.conf format. This addds lines similar to
+	'ifconfig_em0="DHCP"'. 
+
 2011-02-03  vadim  <vadim@netcitadel.com>
 
 	* RoutingCompiler_freebsd_writers.cpp (RoutingRuleToString): fixes
diff --git a/src/compiler_lib/CompilerDriver_generators.cpp b/src/compiler_lib/CompilerDriver_generators.cpp
index 3911cdf67..93148accf 100644
--- a/src/compiler_lib/CompilerDriver_generators.cpp
+++ b/src/compiler_lib/CompilerDriver_generators.cpp
@@ -117,17 +117,16 @@ void CompilerDriver::assembleFwScriptInternal(Cluster *cluster,
                                                           cluster_member));
     top_comment->setVariable("platform", platform.c_str());
     top_comment->setVariable("fw_version", fw_version.c_str());
-    top_comment->setVariable("comment",
-                             prepend((indent) ? comment_char + " " : "",
-                                     fw->getComment().c_str()));
+    top_comment->setVariable(
+        "comment", prepend(comment_char +  " ", fw->getComment().c_str()));
 
     script_skeleton->setVariable("have_nat", have_nat);
     script_skeleton->setVariable("have_filter", have_filter);
 
     script_skeleton->setVariable("top_comment", top_comment->expand());
-    script_skeleton->setVariable("errors_and_warnings",
-                                prepend((indent) ? comment_char + " " : "",
-                                    all_errors.join("\n")));
+    script_skeleton->setVariable(
+        "errors_and_warnings", prepend(comment_char + " ", all_errors.join("\n")));
+
     script_skeleton->setVariable("tools", printPathForAllTools(fw, family));
 
     script_skeleton->setVariable("timestamp", timestr);
diff --git a/src/compiler_lib/compiler_lib.pro b/src/compiler_lib/compiler_lib.pro
index e7659bb49..9d8ccd36b 100644
--- a/src/compiler_lib/compiler_lib.pro
+++ b/src/compiler_lib/compiler_lib.pro
@@ -14,7 +14,8 @@ SOURCES	 =  CompilerDriver.cpp \
 			Configlet.cpp \
 			interfaceProperties.cpp \
 			linux24Interfaces.cpp \
-			bsdInterfaces.cpp \
+			openbsdInterfaces.cpp \
+			freebsdInterfaces.cpp \
 			iosInterfaces.cpp \
 			procurveInterfaces.cpp \
 			pixInterfaces.cpp \
@@ -25,7 +26,8 @@ HEADERS	 = ../../config.h \
 			Configlet.h \
 			interfaceProperties.h \
 			linux24Interfaces.h \
-			bsdInterfaces.h \
+			openbsdInterfaces.h \
+			freebsdInterfaces.h \
 			iosInterfaces.h \
 			procurveInterfaces.h \
 			pixInterfaces.h \
diff --git a/src/compiler_lib/freebsdInterfaces.cpp b/src/compiler_lib/freebsdInterfaces.cpp
new file mode 100644
index 000000000..8b793e3f3
--- /dev/null
+++ b/src/compiler_lib/freebsdInterfaces.cpp
@@ -0,0 +1,55 @@
+/* 
+
+                          Firewall Builder
+
+                 Copyright (C) 2009 NetCitadel, LLC
+
+  Author:  Vadim Kurland     vadim@fwbuilder.org
+
+  This program is free software which we release under the GNU General Public
+  License. You may redistribute and/or modify this program under the terms
+  of that license as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  To get a copy of the GNU General Public License, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+#include "freebsdInterfaces.h"
+
+#include "fwbuilder/Interface.h"
+#include "fwbuilder/Firewall.h"
+
+#include <QStringList>
+
+using namespace libfwbuilder;
+
+/*
+ see #2032.  About dynamic interfaces:
+
+ - when we generate rc.conf file, we should add line 
+   "ifconfig_em0="DHCP"" for dynamic interfaces, so we should 
+   include them in the management list as well.
+*/
+bool freebsdInterfaces::manageIpAddresses(Interface *intf,
+                                          QStringList &update_addresses,
+                                          QStringList &ignore_addresses)
+{
+    if (intf->isDyn())
+    {
+        FWObject *p = intf;
+        while (Firewall::cast(p) == NULL) p = p->getParent();
+        Firewall *fw = Firewall::cast(p);
+        FWOptions* options = fw->getOptionsObject();
+        return options->getBool("generate_rc_conf_file");
+    } else
+        return openbsdInterfaces::manageIpAddresses(
+            intf, update_addresses, ignore_addresses);
+}
+
diff --git a/src/compiler_lib/bsdInterfaces.cpp b/src/compiler_lib/freebsdInterfaces.h
similarity index 66%
rename from src/compiler_lib/bsdInterfaces.cpp
rename to src/compiler_lib/freebsdInterfaces.h
index 250ce93dc..8983b6374 100644
--- a/src/compiler_lib/bsdInterfaces.cpp
+++ b/src/compiler_lib/freebsdInterfaces.h
@@ -6,8 +6,6 @@
 
   Author:  Vadim Kurland     vadim@fwbuilder.org
 
-  $Id$
-
   This program is free software which we release under the GNU General Public
   License. You may redistribute and/or modify this program under the terms
   of that license as published by the Free Software Foundation; either
@@ -23,19 +21,20 @@
 
 */
 
-#include "bsdInterfaces.h"
+#ifndef FREEBSD_INTERFACE_PROPERTIES_HH
+#define FREEBSD_INTERFACE_PROPERTIES_HH
 
-#include <QRegExp>
+#include "openbsdInterfaces.h"
 
-bool bsdInterfaces::parseVlan(const QString &name, QString *base_name, int *vlan_id)
+
+class freebsdInterfaces : public openbsdInterfaces
 {
-    QRegExp vlan_name_pattern(QRegExp("(vlan)(\\d{1,})"));
-    if (vlan_name_pattern.indexIn(name) != -1)
-    {
-        if (base_name!=NULL) *base_name = vlan_name_pattern.cap(1);
-        if (vlan_id!=NULL) *vlan_id = vlan_name_pattern.cap(2).toInt();
-        return true;
-    }
-    return false;
-}
 
+public:
+    freebsdInterfaces() : openbsdInterfaces() {}
+    virtual bool manageIpAddresses(libfwbuilder::Interface *intf,
+                                   QStringList &update_addresses,
+                                   QStringList &ignore_addresses);
+};
+
+#endif
diff --git a/src/compiler_lib/interfacePropertiesObjectFactory.cpp b/src/compiler_lib/interfacePropertiesObjectFactory.cpp
index caf058a0c..cd6244840 100644
--- a/src/compiler_lib/interfacePropertiesObjectFactory.cpp
+++ b/src/compiler_lib/interfacePropertiesObjectFactory.cpp
@@ -28,7 +28,8 @@
 #include "linux24Interfaces.h"
 #include "iosInterfaces.h"
 #include "procurveInterfaces.h"
-#include "bsdInterfaces.h"
+#include "openbsdInterfaces.h"
+#include "freebsdInterfaces.h"
 #include "pixInterfaces.h"
 #include "procurveInterfaces.h"
 
@@ -62,7 +63,8 @@ interfaceProperties* interfacePropertiesObjectFactory::getInterfacePropertiesObj
 
     if (os_family == "pix_os" || os_family == "ios") return new pixInterfaces();
 
-    if (os_family == "openbsd" || os_family == "freebsd") return new bsdInterfaces();
+    if (os_family == "openbsd") return new openbsdInterfaces();
+    if (os_family == "freebsd") return new freebsdInterfaces();
 
     if (os_family == "procurve") return new procurveInterfaces();
 
diff --git a/src/compiler_lib/openbsdInterfaces.cpp b/src/compiler_lib/openbsdInterfaces.cpp
new file mode 100644
index 000000000..a9a331f32
--- /dev/null
+++ b/src/compiler_lib/openbsdInterfaces.cpp
@@ -0,0 +1,59 @@
+/* 
+
+                          Firewall Builder
+
+                 Copyright (C) 2009 NetCitadel, LLC
+
+  Author:  Vadim Kurland     vadim@fwbuilder.org
+
+  This program is free software which we release under the GNU General Public
+  License. You may redistribute and/or modify this program under the terms
+  of that license as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  To get a copy of the GNU General Public License, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+#include "openbsdInterfaces.h"
+
+#include "fwbuilder/Interface.h"
+
+#include <QRegExp>
+
+using namespace libfwbuilder;
+
+
+bool openbsdInterfaces::parseVlan(const QString &name, QString *base_name, int *vlan_id)
+{
+    QRegExp vlan_name_pattern(QRegExp("(vlan)(\\d{1,})"));
+    if (vlan_name_pattern.indexIn(name) != -1)
+    {
+        if (base_name!=NULL) *base_name = vlan_name_pattern.cap(1);
+        if (vlan_id!=NULL) *vlan_id = vlan_name_pattern.cap(2).toInt();
+        return true;
+    }
+    return false;
+}
+
+bool openbsdInterfaces::manageIpAddresses(Interface *intf,
+                                          QStringList &update_addresses,
+                                          QStringList &ignore_addresses)
+{
+    if (intf->isDyn())
+    {
+        // We never manage dynamic interfaces on OpenBSD
+        // But we should add them to the list when rc.conf output format is
+        // implemented, just like it is now done for FreeBSD
+        return false;
+    } else
+        return interfaceProperties::manageIpAddresses(
+            intf, update_addresses, ignore_addresses);
+}
+
diff --git a/src/compiler_lib/bsdInterfaces.h b/src/compiler_lib/openbsdInterfaces.h
similarity index 71%
rename from src/compiler_lib/bsdInterfaces.h
rename to src/compiler_lib/openbsdInterfaces.h
index 1ab662beb..a4b0cbd51 100644
--- a/src/compiler_lib/bsdInterfaces.h
+++ b/src/compiler_lib/openbsdInterfaces.h
@@ -6,8 +6,6 @@
 
   Author:  Vadim Kurland     vadim@fwbuilder.org
 
-  $Id$
-
   This program is free software which we release under the GNU General Public
   License. You may redistribute and/or modify this program under the terms
   of that license as published by the Free Software Foundation; either
@@ -23,18 +21,21 @@
 
 */
 
-#ifndef BSD_INTERFACE_PROPERTIES_HH
-#define BSD_INTERFACE_PROPERTIES_HH
+#ifndef OPENBSD_INTERFACE_PROPERTIES_HH
+#define OPENBSD_INTERFACE_PROPERTIES_HH
 
 #include "interfaceProperties.h"
 
 
-class bsdInterfaces : public interfaceProperties
+class openbsdInterfaces : public interfaceProperties
 {
 
 public:
-    bsdInterfaces() : interfaceProperties() {}
+    openbsdInterfaces() : interfaceProperties() {}
     virtual bool parseVlan(const QString&, QString*, int*);
+    virtual bool manageIpAddresses(libfwbuilder::Interface *intf,
+                                   QStringList &update_addresses,
+                                   QStringList &ignore_addresses);
 };
 
 #endif
diff --git a/src/pflib/OSConfigurator_bsd_interfaces.cpp b/src/pflib/OSConfigurator_bsd_interfaces.cpp
index 9f9dadfd6..175ea9c24 100644
--- a/src/pflib/OSConfigurator_bsd_interfaces.cpp
+++ b/src/pflib/OSConfigurator_bsd_interfaces.cpp
@@ -179,8 +179,7 @@ string OSConfigurator_bsd::configureInterfaces()
             Interface *iface = Interface::cast(*i);
             assert(iface);
 
-            if (!iface->isRegular()) continue;
-            //if (iface->isFailoverInterface()) continue;
+            //if (!iface->isRegular()) continue;
 
             QStringList update_addresses;
             QStringList ignore_addresses;
@@ -195,12 +194,20 @@ string OSConfigurator_bsd::configureInterfaces()
                 list<FWObject*> all_addr = iface->getByType(IPv4::TYPENAME);
                 list<FWObject*> all_ipv6 = iface->getByType(IPv6::TYPENAME);
                 all_addr.insert(all_addr.begin(), all_ipv6.begin(), all_ipv6.end());
-                
-                if (all_addr.size() > 0)
-                    intf_names << iface->getName().c_str();
 
-                if (all_ipv6.size() > 0)
-                    ipv6_names << iface->getName().c_str();
+                // see #2032.  About interfaces with no addresses:
+                //
+                // - when we generate rc.conf file, we should add line 
+                //   "ifconfig_em0="DHCP"" for dynamic interfaces, so we should 
+                //   include them in the management list as well.
+                //
+                // Note that int_prop returns false for dynamic interfaces on
+                // OpenBSD because we do not support rc.conf format for it atm
+                // and should not try to manage dynamic interfaces in the shell
+                // script format.
+                //
+                intf_names << iface->getName().c_str();
+                ipv6_names << iface->getName().c_str();
 
                 const InetAddr *netmask = iface->getNetmaskPtr();
 
diff --git a/src/pflib/OSConfigurator_freebsd.cpp b/src/pflib/OSConfigurator_freebsd.cpp
index 97f426a6c..5c5717b11 100644
--- a/src/pflib/OSConfigurator_freebsd.cpp
+++ b/src/pflib/OSConfigurator_freebsd.cpp
@@ -133,6 +133,12 @@ QString OSConfigurator_freebsd::updateAddressesOfInterface(
          */
 
         QString interface_name = iface->getName().c_str();
+
+        if (iface->isDyn())
+        {
+            return QString("ifconfig_%1=\"DHCP\"") .arg(iface->getName().c_str());
+        }
+
         QStringList addr_conf;
     
         int ipv4_alias_counter = -2;
diff --git a/src/pflib/RoutingCompiler_freebsd_writers.cpp b/src/pflib/RoutingCompiler_freebsd_writers.cpp
index 4029c8584..ffc77e701 100644
--- a/src/pflib/RoutingCompiler_freebsd_writers.cpp
+++ b/src/pflib/RoutingCompiler_freebsd_writers.cpp
@@ -78,8 +78,7 @@ bool RoutingCompiler_freebsd::PrintRule::processNext()
         for (deque<Rule*>::iterator k=tmp_queue.begin(); k!=tmp_queue.end(); ++k) 
         {
             RoutingRule *rule = RoutingRule::cast( *k );
-            rule_ids << QString("route_%1")
-                .arg(FWObjectDatabase::getStringId(rule->getId()).c_str());
+            rule_ids << FWObjectDatabase::getStringId(rule->getId()).c_str();
         }
 
         if (rule_ids.size() > 0)
diff --git a/test/pf/firewall-base-rulesets.fw.orig b/test/pf/firewall-base-rulesets.fw.orig
index e1c917905..50e9cfaca 100755
--- a/test/pf/firewall-base-rulesets.fw.orig
+++ b/test/pf/firewall-base-rulesets.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:10 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:44 2011 PST by vadim
 #
 # files: * firewall-base-rulesets.fw /etc/fw/firewall-base-rulesets.fw
 # files:   firewall-base-rulesets.conf /etc/fw/firewall-base-rulesets.conf
@@ -163,7 +163,7 @@ configure_interfaces() {
     update_addresses_of_interface "en2 192.168.100.1/0xffffff00" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:10 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:44 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall-ipv6-1.fw.orig b/test/pf/firewall-ipv6-1.fw.orig
index e350f11b3..c69b2f6b6 100755
--- a/test/pf/firewall-ipv6-1.fw.orig
+++ b/test/pf/firewall-ipv6-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:10 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:44 2011 PST by vadim
 #
 # files: * firewall-ipv6-1.fw pf-ipv6.fw
 # files:   firewall-ipv6-1-Policy_ipv4.conf /etc/fw/pf-ipv6.conf
@@ -175,7 +175,7 @@ configure_interfaces() {
     update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:10 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:44 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall-ipv6-2.fw.orig b/test/pf/firewall-ipv6-2.fw.orig
index 4d99def7c..c5f3f036f 100755
--- a/test/pf/firewall-ipv6-2.fw.orig
+++ b/test/pf/firewall-ipv6-2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:11 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:46 2011 PST by vadim
 #
 # files: * firewall-ipv6-2.fw pf.fw
 # files:   firewall-ipv6-2.conf pf.conf
@@ -179,7 +179,7 @@ configure_interfaces() {
     update_addresses_of_interface "lo ::1/128 127.0.0.1/0xff000000" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:11 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:46 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall-ipv6-3.fw.orig b/test/pf/firewall-ipv6-3.fw.orig
index b9c4bfb0d..8cae0f94e 100755
--- a/test/pf/firewall-ipv6-3.fw.orig
+++ b/test/pf/firewall-ipv6-3.fw.orig
@@ -1,9 +1,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:11 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:46 2011 PST by vadim
 #
 # files: * firewall-ipv6-3.fw /etc/firewall-ipv6-3.fw
 # files:   firewall-ipv6-3-Policy_ipv4.conf /etc/firewall-ipv6-3-Policy_ipv4.conf
@@ -25,7 +25,7 @@ create_args_vlan101="vlan 101"
 cloned_interfaces=""
 
 network_interfaces="ed0 lo0 vlan100 vlan101"
-ipv6_network_interfaces="ed0 lo0"
+ipv6_network_interfaces="ed0 lo0 vlan100 vlan101"
 ipv6_ifconfig_ed0="fe80::21d:9ff:fe8b:8e94/64"
 ipv6_ifconfig_ed0_alias0="2001:db8::1/64"
 ipv6_ifconfig_ed0_alias1="2001:db8::2/64"
diff --git a/test/pf/firewall.fw.orig b/test/pf/firewall.fw.orig
index 40dec2d1a..05274ff80 100755
--- a/test/pf/firewall.fw.orig
+++ b/test/pf/firewall.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:48 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:21 2011 PST by vadim
 #
 # files: * firewall.fw /etc/pf.fw
 # files:   firewall.conf /etc/pf.conf
@@ -167,7 +167,7 @@ configure_interfaces() {
     update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:48 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:21 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall1.fw.orig b/test/pf/firewall1.fw.orig
index 2d8c1f75d..026f754d0 100755
--- a/test/pf/firewall1.fw.orig
+++ b/test/pf/firewall1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:49 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:21 2011 PST by vadim
 #
 # files: * firewall1.fw /etc/fw/firewall1.fw
 # files:   firewall1.conf /etc/fw/firewall1.conf
@@ -79,7 +79,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:49 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:21 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall10-1.fw.orig b/test/pf/firewall10-1.fw.orig
index b60a10a81..3087a7a0e 100755
--- a/test/pf/firewall10-1.fw.orig
+++ b/test/pf/firewall10-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:50 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:23 2011 PST by vadim
 #
 # files: * firewall10-1.fw /etc/fw/firewall10-1.fw
 # files:   firewall10-1.conf /etc/fw/firewall10-1.conf
@@ -74,7 +74,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:50 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:23 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall10-2.fw.orig b/test/pf/firewall10-2.fw.orig
index 58f2a3b55..cb1e88c55 100755
--- a/test/pf/firewall10-2.fw.orig
+++ b/test/pf/firewall10-2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:50 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:24 2011 PST by vadim
 #
 # files: * firewall10-2.fw /etc/fw/firewall10-2.fw
 # files:   firewall10-2.conf /etc/fw/firewall10-2.conf
@@ -74,7 +74,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:50 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:24 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall10-3.fw.orig b/test/pf/firewall10-3.fw.orig
index 5ef968cb1..a5bf68254 100755
--- a/test/pf/firewall10-3.fw.orig
+++ b/test/pf/firewall10-3.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:51 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:24 2011 PST by vadim
 #
 # files: * firewall10-3.fw /etc/fw/firewall10-3.fw
 # files:   firewall10-3.conf /etc/fw/firewall10-3.conf
@@ -76,7 +76,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:51 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:24 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall10-4.fw.orig b/test/pf/firewall10-4.fw.orig
index a0c16e843..e29592ab2 100755
--- a/test/pf/firewall10-4.fw.orig
+++ b/test/pf/firewall10-4.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:51 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:25 2011 PST by vadim
 #
 # files: * firewall10-4.fw /etc/fw/firewall10-4.fw
 # files:   firewall10-4.conf /etc/fw/firewall10-4.conf
@@ -76,7 +76,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:51 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:25 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall10-5.fw.orig b/test/pf/firewall10-5.fw.orig
index f08e5587b..f5682e0cd 100755
--- a/test/pf/firewall10-5.fw.orig
+++ b/test/pf/firewall10-5.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:52 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:26 2011 PST by vadim
 #
 # files: * firewall10-5.fw /etc/fw/firewall10-5.fw
 # files:   firewall10-5.conf /etc/fw/firewall10-5.conf
@@ -77,7 +77,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:52 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:26 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall10-6.fw.orig b/test/pf/firewall10-6.fw.orig
index ee35b728b..69fb5ab0b 100755
--- a/test/pf/firewall10-6.fw.orig
+++ b/test/pf/firewall10-6.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:52 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:26 2011 PST by vadim
 #
 # files: * firewall10-6.fw /etc/fw/firewall10-6.fw
 # files:   firewall10-6.conf /etc/fw/firewall10-6.conf
@@ -77,7 +77,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:52 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:26 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall100.fw.orig b/test/pf/firewall100.fw.orig
index 8b4079eba..1186103da 100755
--- a/test/pf/firewall100.fw.orig
+++ b/test/pf/firewall100.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:49 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:22 2011 PST by vadim
 #
 # files: * firewall100.fw /etc/fw/pf.fw
 # files:   firewall100.conf /etc/fw/path\ with\ space/pf.conf
@@ -159,7 +159,7 @@ configure_interfaces() {
     update_addresses_of_interface "em1 10.1.1.81/0xffffff00" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:49 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:22 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
@@ -175,9 +175,8 @@ $PFCTL   \
 
 # ============== ROUTING RULES ============== 
 
-TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$"
+TMPDIRNAME=`mktemp -d /tmp/.fwbuilder.XXXXXXXXXX` || exit 1
 TMPFILENAME="$TMPDIRNAME/.fwbuilder.out"
-(umask 077 && mkdir $TMPDIRNAME) || exit 1
 
 #
 # This function stops stdout redirection
@@ -195,7 +194,7 @@ route_command_error()
   echo "Error: Routing rule $1 couldn't be activated"
   echo "Recovering previous routing configuration..."
   # delete current routing rules
-  route -n show -inet | grep S | grep -Ev 'lo0' | \
+  route -n show -inet | awk '$3 ~ /S/ && $NF !~ /lo0/ { print $0;}' | \
       while read route gw rest; do route delete $route $gw; done
   # restore old routing rules
   (IFS="
@@ -214,7 +213,7 @@ exec 2>&1
 oldRoutes=$(route -n show -inet |  awk '{printf "route add %s %s\n",$1,$2;}')
 
 echo "Deleting routing rules previously set by user space processes..."
-route -n show -inet | grep S | grep -Ev {{route_filter}} | \
+route -n show -inet | grep S | grep -Ev 'lo0' | \
     while read route gw rest; do route delete $route $gw; done
     
 echo "Activating routing rules..."
diff --git a/test/pf/firewall101.conf.orig b/test/pf/firewall101.conf.orig
new file mode 100644
index 000000000..47fd3302d
--- /dev/null
+++ b/test/pf/firewall101.conf.orig
@@ -0,0 +1,25 @@
+
+set timeout udp.single 5
+
+#
+# Scrub rules
+#
+match in all scrub (reassemble tcp no-df )
+match out all scrub (random-id min-ttl  1 max-mss  1460)
+
+
+# Tables: (1)
+table <tbl.r9998.d> { 10.1.1.81 , 10.3.14.81 } 
+
+# 
+# Rule  backup ssh access rule
+#    backup ssh access rule 
+pass in   quick inet proto tcp  from 10.3.14.30  to <tbl.r9998.d> port 22  label "RULE 9998 -- ACCEPT "  
+# 
+# Rule  0 (global)
+block  log  quick inet  from any  to any no state  label "RULE 0 -- DROP "  
+# 
+# Rule  fallback rule
+#    fallback rule 
+block  quick inet  from any  to any no state  label "RULE 10000 -- DROP "  
+
diff --git a/test/pf/firewall101.fw.orig b/test/pf/firewall101.fw.orig
new file mode 100755
index 000000000..540170f7d
--- /dev/null
+++ b/test/pf/firewall101.fw.orig
@@ -0,0 +1,270 @@
+#!/bin/sh
+#
+#  This is automatically generated file. DO NOT MODIFY !
+#
+#  Firewall Builder  fwb_pf v4.2.0.3458
+#
+#  Generated Fri Feb  4 17:52:22 2011 PST by vadim
+#
+# files: * firewall101.fw /etc/fw/pf.fw
+# files:   firewall101.conf /etc/fw/path\ with\ space/pf.conf
+#
+# Compiled for pf 4.7
+#
+# routing rules, shell script format
+
+# firewall101:Routing:1: error: Gateway and interface are both empty in the rule
+# firewall101:Routing:1: error: Rules 0 (main) and 1 (main) define routes to the same destination 0.0.0.0/0.0.0.0 via different gateways. This configuration is not supported for freebsd
+
+
+
+FWDIR=`dirname $0`
+
+IFCONFIG="/sbin/ifconfig"
+PFCTL="/sbin/pfctl"
+IPFW="/sbin/ipfw"
+IPF="/sbin/ipf"
+IPNAT="/sbin/ipnat"
+SYSCTL="/sbin/sysctl"
+LOGGER="/usr/bin/logger"
+
+log() {
+    echo "$1"
+    test -x "$LOGGER" && $LOGGER -p info "$1"
+}
+
+diff_intf() {
+    func=$1
+    list1=$2
+    list2=$3
+    cmd=$4
+    for intf in $list1
+    do
+        echo $list2 | grep -q $intf || {
+        # $vlan is absent in list 2
+            $func $intf $cmd
+        }
+    done
+}
+
+
+missing_address() {
+    address=$1
+    cmd=$2
+
+    oldIFS=$IFS
+    IFS="@"
+    set $address
+    addr=$1
+    interface=$2
+    IFS=$oldIFS
+
+    if echo "$addr" | grep -q ':'
+    then
+        inet="inet6"
+        addr=$(echo "$addr" | sed 's!/! prefixlen !')
+    else
+        inet="inet"
+        addr=$(echo "$addr" | sed 's!/! netmask !')
+    fi
+
+    parameter=""
+    test "$cmd" = "add" && {
+      echo "# Adding ip address: $interface $addr"
+      parameter="alias"
+    }
+    test "$cmd" = "del" && {
+      echo "# Removing ip address: $interface $addr"
+      parameter="delete"
+    }
+
+    $FWBDEBUG $IFCONFIG $interface $inet $addr $parameter
+    $FWBDEBUG $IFCONFIG $interface up
+}
+
+list_addresses_by_scope() {
+    interface=$1
+    scope=$2
+    ignore_list=$3
+
+    scope_regex="1"
+    if test -n "$scope"; then scope_regex=" \$0 !~ \"$scope\" "; fi
+
+    $IFCONFIG $interface | sed "s/%$interface//" | \
+      awk -v IGNORED="$ignore_list" \
+        "BEGIN {  
+           split(IGNORED,ignored_arr);
+           for (a in ignored_arr) {ignored_dict[ignored_arr[a]]=1;}
+         }
+         (/inet |inet6 / && $scope_regex && !(\$2 in ignored_dict)) {printf \"%s/%s\n\",\$2,\$4;}" | \
+        while read addr; do
+          echo "${addr}@$interface"
+        done | sort
+   
+}
+
+update_addresses_of_interface() {
+    ignore_list=$2
+    set $1 
+    interface=$1 
+    shift
+
+    FWB_ADDRS=$(
+      for addr in $*; do
+        echo "${addr}@$interface"
+      done | sort
+    )
+
+    CURRENT_ADDRS_ALL_SCOPES=""
+    CURRENT_ADDRS_GLOBAL_SCOPE=""
+
+    $IFCONFIG $interface >/dev/null 2>&1 && {
+      CURRENT_ADDRS_ALL_SCOPES=$(list_addresses_by_scope $interface '' "$ignore_list")
+      CURRENT_ADDRS_GLOBAL_SCOPE=$(list_addresses_by_scope $interface 'scopeid .*' "$ignore_list")
+    } || {
+      echo "# Interface $interface does not exist"
+      # Stop the script if we are not in test mode
+      test -z "$FWBDEBUG" && exit 1
+    }
+
+    diff_intf missing_address "$FWB_ADDRS" "$CURRENT_ADDRS_ALL_SCOPES" add
+    diff_intf missing_address "$CURRENT_ADDRS_GLOBAL_SCOPE" "$FWB_ADDRS" del
+}
+
+verify_interfaces() {
+    :
+    
+}
+
+set_kernel_vars() {
+    :
+    $SYSCTL -w net.inet.ip.forwarding=1
+}
+
+prolog_commands() {
+    :
+    
+}
+
+epilog_commands() {
+    :
+    
+}
+
+run_epilog_and_exit() {
+    epilog_commands
+    exit $1
+}
+
+configure_interfaces() {
+    :
+    update_addresses_of_interface "em0 10.3.14.81/0xffffff00" ""
+    update_addresses_of_interface "em1 10.1.1.81/0xffffff00" ""
+}
+
+log "Activating firewall script generated Fri Feb  4 17:52:22 2011 by vadim"
+
+set_kernel_vars
+configure_interfaces
+prolog_commands
+
+$PFCTL   \
+     -f \
+    /etc/fw/path\ with\ space/pf.conf || exit 1
+
+
+
+
+
+# ============== ROUTING RULES ============== 
+
+TMPDIRNAME=`mktemp -d /tmp/.fwbuilder.XXXXXXXXXX` || exit 1
+TMPFILENAME="$TMPDIRNAME/.fwbuilder.out"
+
+#
+# This function stops stdout redirection
+# and sends previously saved output to terminal
+restore_script_output()
+{
+  exec 1>&3 2>&1
+  cat $TMPFILENAME
+  rm -rf $TMPDIRNAME
+}
+
+# if any routing rule fails we do our best to prevent freezing the firewall
+route_command_error()
+{
+  echo "Error: Routing rule $1 couldn't be activated"
+  echo "Recovering previous routing configuration..."
+  # delete current routing rules
+  netstat -rn -f inet | awk '$3 ~ /S/ && $NF !~ /lo0/ { print $0;}' | \
+      while read route gw rest; do route delete $route $gw; done
+  # restore old routing rules
+  (IFS="
+"; for route_cmd in $oldRoutes; do (IFS=' '; $route_cmd); done)
+  echo "...done"
+  restore_script_output
+  epilog_commands
+  exit 1
+}
+
+# redirect output to prevent ssh session from stalling
+exec 3>&1
+exec 1> $TMPFILENAME
+exec 2>&1
+
+oldRoutes=$(netstat -rn -f inet |  awk '/^$|Destination|Routing tables|Internet:/ {next;} {printf "route add %s %s\n",$1,$2;}')
+
+echo "Deleting routing rules previously set by user space processes..."
+netstat -rn -f inet | awk '$3 ~ /S/ { print $0;}' | grep -Ev 'lo0' | \
+    while read route gw rest; do route delete $route $gw; done
+    
+echo "Activating routing rules..."
+# 
+# Rule 0 (main)
+# 
+echo "Routing rule 0 (main)"
+# 
+# setting default via gateway
+# line 2 comment
+#
+route add default 10.1.1.1 || route_command_error "0 (main)"
+
+# 
+# Rule 1 (main)
+# 
+echo "Routing rule 1 (main)"
+# 
+# empty rule
+#
+# firewall101:Routing:1: error: Rules 0 (main) and 1 (main) define routes to the same destination 0.0.0.0/0.0.0.0 via different gateways. This configuration is not supported for freebsd
+route add default || route_command_error "1 (main)"
+
+# 
+# Rule 2 (main)
+# 
+echo "Routing rule 2 (main)"
+# 
+route add 192.168.171.2 10.1.1.1 || route_command_error "2 (main)"
+
+# 
+# Rule 3 (main)
+# 
+echo "Routing rule 3 (main)"
+# 
+route add 22.22.22.0/24 10.1.1.1 || route_command_error "3 (main)"
+
+# 
+# Rule 4 (main)
+# 
+echo "Routing rule 4 (main)"
+# 
+route add 22.22.22.0/24 10.1.1.1 || route_command_error "4 (main)"
+
+route add 33.33.33.0/24 10.1.1.1 || route_command_error "4 (main)"
+
+
+restore_script_output
+echo "...done."
+
+epilog_commands
\ No newline at end of file
diff --git a/test/pf/firewall102.conf.orig b/test/pf/firewall102.conf.orig
new file mode 100644
index 000000000..47fd3302d
--- /dev/null
+++ b/test/pf/firewall102.conf.orig
@@ -0,0 +1,25 @@
+
+set timeout udp.single 5
+
+#
+# Scrub rules
+#
+match in all scrub (reassemble tcp no-df )
+match out all scrub (random-id min-ttl  1 max-mss  1460)
+
+
+# Tables: (1)
+table <tbl.r9998.d> { 10.1.1.81 , 10.3.14.81 } 
+
+# 
+# Rule  backup ssh access rule
+#    backup ssh access rule 
+pass in   quick inet proto tcp  from 10.3.14.30  to <tbl.r9998.d> port 22  label "RULE 9998 -- ACCEPT "  
+# 
+# Rule  0 (global)
+block  log  quick inet  from any  to any no state  label "RULE 0 -- DROP "  
+# 
+# Rule  fallback rule
+#    fallback rule 
+block  quick inet  from any  to any no state  label "RULE 10000 -- DROP "  
+
diff --git a/test/pf/firewall102.fw.orig b/test/pf/firewall102.fw.orig
new file mode 100755
index 000000000..1cad5fb90
--- /dev/null
+++ b/test/pf/firewall102.fw.orig
@@ -0,0 +1,37 @@
+#
+#  This is automatically generated file. DO NOT MODIFY !
+#
+#  Firewall Builder  fwb_pf v4.2.0.3458
+#
+#  Generated Fri Feb  4 17:52:23 2011 PST by vadim
+#
+# files: * firewall102.fw /etc/fw/pf.fw
+# files:   firewall102.conf /etc/fw/path\ with\ space/pf.conf
+#
+# Compiled for pf 4.7
+#
+# routing rules, rc.conf format
+
+# firewall102:Routing:1: error: Gateway and interface are both empty in the rule
+# firewall102:Routing:1: error: Rules 0 (main) and 1 (main) define routes to the same destination 0.0.0.0/0.0.0.0 via different gateways. This configuration is not supported for freebsd
+
+gateway_enable="YES"
+
+
+
+network_interfaces="em0 em1"
+ipv6_network_interfaces="em0 em1"
+ifconfig_em0="inet 10.3.14.81 netmask 0xffffff00"
+ifconfig_em1="inet 10.1.1.81 netmask 0xffffff00"
+
+pf_enable="YES"
+pf_rules="/etc/fw/path\ with\ space/pf.conf"
+
+static_routes="id157578X14381 id157600X14381 id157622X14381 id157644X14381 id157669X14381 id157688X14381"
+route_id157578X14381="default  10.1.1.1 "
+route_id157600X14381="default  "
+route_id157622X14381="192.168.171.2  10.1.1.1 "
+route_id157644X14381="22.22.22.0/24  10.1.1.1 "
+route_id157669X14381="22.22.22.0/24  10.1.1.1 "
+route_id157688X14381="33.33.33.0/24  10.1.1.1 "
+
diff --git a/test/pf/firewall11.fw.orig b/test/pf/firewall11.fw.orig
index a7f429d6f..4f27b3366 100755
--- a/test/pf/firewall11.fw.orig
+++ b/test/pf/firewall11.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:53 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:27 2011 PST by vadim
 #
 # files: * firewall11.fw /etc/firewall11.fw
 # files:   firewall11.conf /etc/firewall11.conf
@@ -77,7 +77,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:53 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:27 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall12.fw.orig b/test/pf/firewall12.fw.orig
index b73e8baa0..d2acce71d 100755
--- a/test/pf/firewall12.fw.orig
+++ b/test/pf/firewall12.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:53 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:27 2011 PST by vadim
 #
 # files: * firewall12.fw /etc/fw/firewall12.fw
 # files:   firewall12.conf /etc/fw/firewall12.conf
@@ -159,7 +159,7 @@ configure_interfaces() {
     update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:53 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:27 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall13.fw.orig b/test/pf/firewall13.fw.orig
index 473be90e2..b6fc938c2 100755
--- a/test/pf/firewall13.fw.orig
+++ b/test/pf/firewall13.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:54 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:28 2011 PST by vadim
 #
 # files: * firewall13.fw /etc/fw/firewall13.fw
 # files:   firewall13.conf /etc/fw/firewall13.conf
@@ -88,7 +88,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:54 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:28 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall14-1.fw.orig b/test/pf/firewall14-1.fw.orig
index 132b62cee..e608ba187 100755
--- a/test/pf/firewall14-1.fw.orig
+++ b/test/pf/firewall14-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:55 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:29 2011 PST by vadim
 #
 # files: * firewall14-1.fw /etc/firewall14-1.fw
 # files:   firewall14-1.conf /etc/firewall14-1.conf
@@ -242,7 +242,7 @@ configure_interfaces() {
     update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:55 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:29 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall14.fw.orig b/test/pf/firewall14.fw.orig
index 6944fce04..02a6c94f4 100755
--- a/test/pf/firewall14.fw.orig
+++ b/test/pf/firewall14.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:54 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:28 2011 PST by vadim
 #
 # files: * firewall14.fw /etc/firewall14.fw
 # files:   firewall14.conf /etc/firewall14.conf
@@ -242,7 +242,7 @@ configure_interfaces() {
     update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:54 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:28 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall2-1.fw.orig b/test/pf/firewall2-1.fw.orig
index ff623a84f..615c71412 100755
--- a/test/pf/firewall2-1.fw.orig
+++ b/test/pf/firewall2-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:56 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:31 2011 PST by vadim
 #
 # files: * firewall2-1.fw /etc/fw/firewall2-1.fw
 # files:   firewall2-1.conf /etc/fw/firewall2-1.conf
@@ -89,7 +89,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:56 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:31 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall2.fw.orig b/test/pf/firewall2.fw.orig
index a474e0eee..3a1749c20 100755
--- a/test/pf/firewall2.fw.orig
+++ b/test/pf/firewall2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:55 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:29 2011 PST by vadim
 #
 # files: * firewall2.fw /etc/fw/firewall2.fw
 # files:   firewall2.conf /etc/fw/firewall2.conf
@@ -73,7 +73,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:55 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:29 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall20.fw.orig b/test/pf/firewall20.fw.orig
index 2f07ddc4e..8a2c5169d 100755
--- a/test/pf/firewall20.fw.orig
+++ b/test/pf/firewall20.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:56 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:30 2011 PST by vadim
 #
 # files: * firewall20.fw /etc/fw/firewall20.fw
 # files:   firewall20.conf /etc/fw/firewall20.conf
@@ -73,7 +73,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:56 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:30 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall21.fw.orig b/test/pf/firewall21.fw.orig
index 36b8dbf73..965fe0233 100755
--- a/test/pf/firewall21.fw.orig
+++ b/test/pf/firewall21.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:56 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:30 2011 PST by vadim
 #
 # files: * firewall21.fw /etc/fw/firewall21.fw
 # files:   firewall21-NAT_1.conf /etc/fw/firewall21-NAT_1.conf
@@ -82,7 +82,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:56 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:30 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall22.fw.orig b/test/pf/firewall22.fw.orig
index 944697bca..48e902a1d 100755
--- a/test/pf/firewall22.fw.orig
+++ b/test/pf/firewall22.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:57 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:31 2011 PST by vadim
 #
 # files: * firewall22.fw /etc/fw/firewall22.fw
 # files:   firewall22-NAT_1.conf /etc/fw/firewall22-NAT_1.conf
@@ -80,7 +80,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:57 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:31 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall3.fw.orig b/test/pf/firewall3.fw.orig
index d71a1a7b4..0e8ff78b9 100755
--- a/test/pf/firewall3.fw.orig
+++ b/test/pf/firewall3.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:57 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:32 2011 PST by vadim
 #
 # files: * firewall3.fw /etc/firewall3.fw
 # files:   firewall3.conf /etc/firewall3.conf
@@ -159,7 +159,7 @@ configure_interfaces() {
     update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:57 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:32 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall33.fw.orig b/test/pf/firewall33.fw.orig
index db686300f..58d3cbf4e 100755
--- a/test/pf/firewall33.fw.orig
+++ b/test/pf/firewall33.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:58 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:33 2011 PST by vadim
 #
 # files: * firewall33.fw /etc/fw/firewall33.fw
 # files:   firewall33.conf /etc/fw/firewall33.conf
@@ -162,7 +162,7 @@ configure_interfaces() {
     update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:58 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:33 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall34.fw.orig b/test/pf/firewall34.fw.orig
index dd46babf5..bd9c576bc 100755
--- a/test/pf/firewall34.fw.orig
+++ b/test/pf/firewall34.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:58 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:33 2011 PST by vadim
 #
 # files: * firewall34.fw /etc/fw/firewall34.fw
 # files:   firewall34.conf /etc/fw/firewall34.conf
@@ -158,7 +158,7 @@ configure_interfaces() {
     update_addresses_of_interface "lo 127.0.0.1/0xff000000" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:58 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:33 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall38.fw.orig b/test/pf/firewall38.fw.orig
index 343214b4a..9326354d7 100755
--- a/test/pf/firewall38.fw.orig
+++ b/test/pf/firewall38.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:58:59 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:34 2011 PST by vadim
 #
 # files: * firewall38.fw /etc/fw/firewall38.fw
 # files:   firewall38.conf /etc/fw/firewall38.conf
@@ -76,7 +76,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:58:59 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:34 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall39.fw.orig b/test/pf/firewall39.fw.orig
index 74dc9ebd1..3806d8aaa 100755
--- a/test/pf/firewall39.fw.orig
+++ b/test/pf/firewall39.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 15:06:56 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:34 2011 PST by vadim
 #
 # files: * firewall39.fw pf.fw
 # files:   firewall39.conf pf.conf
@@ -79,7 +79,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 15:06:56 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:34 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall4.fw.orig b/test/pf/firewall4.fw.orig
index 96a49d723..fa5e92b40 100755
--- a/test/pf/firewall4.fw.orig
+++ b/test/pf/firewall4.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:00 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:35 2011 PST by vadim
 #
 # files: * firewall4.fw pf.fw
 # files:   firewall4.conf /etc/fw/pf.conf
@@ -78,7 +78,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:00 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:35 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall40-1.fw.orig b/test/pf/firewall40-1.fw.orig
index 24b0e0c98..6f6c2cd98 100755
--- a/test/pf/firewall40-1.fw.orig
+++ b/test/pf/firewall40-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:01 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:36 2011 PST by vadim
 #
 # files: * firewall40-1.fw /etc/firewall40-1.fw
 # files:   firewall40-1.conf /etc/firewall40-1.conf
@@ -176,7 +176,7 @@ configure_interfaces() {
     update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:01 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:36 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall40.fw.orig b/test/pf/firewall40.fw.orig
index 4e7d38fd7..bc552e2f5 100755
--- a/test/pf/firewall40.fw.orig
+++ b/test/pf/firewall40.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:01 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:35 2011 PST by vadim
 #
 # files: * firewall40.fw /etc/firewall40.fw
 # files:   firewall40.conf /etc/firewall40.conf
@@ -160,7 +160,7 @@ configure_interfaces() {
     update_addresses_of_interface "lo0 127.0.0.1/0xff000000" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:01 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:35 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall41.fw.orig b/test/pf/firewall41.fw.orig
index 2c785c671..c3889f5c9 100755
--- a/test/pf/firewall41.fw.orig
+++ b/test/pf/firewall41.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:02 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:36 2011 PST by vadim
 #
 # files: * firewall41.fw /etc/firewall41.fw
 # files:   firewall41.conf /etc/firewall41.conf
@@ -163,7 +163,7 @@ configure_interfaces() {
     update_addresses_of_interface "eth1 2.2.2.2/0xffffff00" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:02 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:36 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall5.fw.orig b/test/pf/firewall5.fw.orig
index 0b1bd9815..e6b124fc1 100755
--- a/test/pf/firewall5.fw.orig
+++ b/test/pf/firewall5.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:02 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:37 2011 PST by vadim
 #
 # files: * firewall5.fw /etc/fw/firewall5.fw
 # files:   firewall5.conf /etc/fw/firewall5.conf
@@ -77,7 +77,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:02 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:37 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall51.fw.orig b/test/pf/firewall51.fw.orig
index 5dfa2e789..83f8291fa 100755
--- a/test/pf/firewall51.fw.orig
+++ b/test/pf/firewall51.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:03 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:38 2011 PST by vadim
 #
 # files: * firewall51.fw /etc/fw/firewall51.fw
 # files:   firewall51.conf /etc/fw/firewall51.conf
@@ -80,7 +80,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:03 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:38 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall6.fw.orig b/test/pf/firewall6.fw.orig
index 1319e187e..ba640ac28 100755
--- a/test/pf/firewall6.fw.orig
+++ b/test/pf/firewall6.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:03 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:38 2011 PST by vadim
 #
 # files: * firewall6.fw /etc/fw/firewall6.fw
 # files:   firewall6.conf /etc/fw/firewall6.conf
@@ -73,7 +73,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:03 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:38 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall62.fw.orig b/test/pf/firewall62.fw.orig
index 0dd28f5e1..7dcbe860e 100755
--- a/test/pf/firewall62.fw.orig
+++ b/test/pf/firewall62.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:04 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:39 2011 PST by vadim
 #
 # files: * firewall62.fw /etc/firewall62.fw
 # files:   firewall62.conf /etc/firewall62.conf
@@ -185,7 +185,7 @@ configure_interfaces() {
     update_addresses_of_interface "en1 222.222.222.222/0xffffff00" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:04 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:39 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall63.fw.orig b/test/pf/firewall63.fw.orig
index 91f09dd64..d418a992d 100755
--- a/test/pf/firewall63.fw.orig
+++ b/test/pf/firewall63.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:04 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:39 2011 PST by vadim
 #
 # files: * firewall63.fw /etc/fw/firewall63.fw
 # files:   firewall63.conf /etc/fw/firewall63.conf
@@ -77,7 +77,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:04 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:39 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall7.fw.orig b/test/pf/firewall7.fw.orig
index 704672445..da38cf80d 100755
--- a/test/pf/firewall7.fw.orig
+++ b/test/pf/firewall7.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:05 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:40 2011 PST by vadim
 #
 # files: * firewall7.fw /etc/fw/firewall7.fw
 # files:   firewall7.conf /etc/fw/firewall7.conf
@@ -73,7 +73,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:05 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:40 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall70.fw.orig b/test/pf/firewall70.fw.orig
index 1435ba3de..3b0199d38 100755
--- a/test/pf/firewall70.fw.orig
+++ b/test/pf/firewall70.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:05 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:40 2011 PST by vadim
 #
 # files: * firewall70.fw /etc/fw/firewall70.fw
 # files:   firewall70.conf /etc/fw/firewall70.conf
@@ -82,7 +82,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:05 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:40 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall8.fw.orig b/test/pf/firewall8.fw.orig
index 592fe7367..726da877c 100755
--- a/test/pf/firewall8.fw.orig
+++ b/test/pf/firewall8.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:06 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:41 2011 PST by vadim
 #
 # files: * firewall8.fw /etc/firewall8.fw
 # files:   firewall8.conf /etc/firewall8.conf
@@ -72,7 +72,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:06 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:41 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall80-4.5.fw.orig b/test/pf/firewall80-4.5.fw.orig
index 7039dcb6a..ff53a2b86 100755
--- a/test/pf/firewall80-4.5.fw.orig
+++ b/test/pf/firewall80-4.5.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:07 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:42 2011 PST by vadim
 #
 # files: * firewall80-4.5.fw /etc/firewall80-4.5.fw
 # files:   firewall80-4.5.conf /etc/firewall80-4.5.conf
@@ -73,7 +73,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:07 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:42 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall80.fw.orig b/test/pf/firewall80.fw.orig
index e67c79ebe..43a7a1bbb 100755
--- a/test/pf/firewall80.fw.orig
+++ b/test/pf/firewall80.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:06 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:41 2011 PST by vadim
 #
 # files: * firewall80.fw /etc/firewall80.fw
 # files:   firewall80.conf /etc/firewall80.conf
@@ -73,7 +73,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:06 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:41 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall9.fw.orig b/test/pf/firewall9.fw.orig
index a94c06ffb..c3b65b927 100755
--- a/test/pf/firewall9.fw.orig
+++ b/test/pf/firewall9.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:07 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:42 2011 PST by vadim
 #
 # files: * firewall9.fw /etc/fw/firewall9.fw
 # files:   firewall9.conf /etc/fw/firewall9.conf
@@ -76,7 +76,7 @@ configure_interfaces() {
     
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:07 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:42 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall91.fw.orig b/test/pf/firewall91.fw.orig
index 31ee108a7..556c4c614 100755
--- a/test/pf/firewall91.fw.orig
+++ b/test/pf/firewall91.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:08 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:43 2011 PST by vadim
 #
 # files: * firewall91.fw /etc/fw/pf.fw
 # files:   firewall91.conf /etc/fw/pf.conf
@@ -241,7 +241,7 @@ configure_interfaces() {
     update_addresses_of_interface "vlan103 10.100.103.1/0xffffff00" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:08 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:43 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/firewall92.fw.orig b/test/pf/firewall92.fw.orig
index 760a6d1a5..912cec010 100755
--- a/test/pf/firewall92.fw.orig
+++ b/test/pf/firewall92.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:08 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:43 2011 PST by vadim
 #
 # files: * firewall92.fw /etc/fw/pf.fw
 # files:   firewall92.conf /etc/fw/path\ with\ space/pf.conf
@@ -160,7 +160,7 @@ configure_interfaces() {
     update_addresses_of_interface "em1 10.1.1.81/0xffffff00" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:08 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:43 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/pf_cluster_1_openbsd-1.fw.orig b/test/pf/pf_cluster_1_openbsd-1.fw.orig
index 62124ad7a..dd5bcfbff 100755
--- a/test/pf/pf_cluster_1_openbsd-1.fw.orig
+++ b/test/pf/pf_cluster_1_openbsd-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:11 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:46 2011 PST by vadim
 #
 # files: * pf_cluster_1_openbsd-1.fw /etc/pf_cluster_1_openbsd-1.fw
 # files:   pf_cluster_1_openbsd-1.conf /etc/pf_cluster_1_openbsd-1.conf
@@ -289,7 +289,7 @@ configure_interfaces() {
     $IFCONFIG pfsync0 up
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:11 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:46 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/pf_cluster_1_openbsd-2.fw.orig b/test/pf/pf_cluster_1_openbsd-2.fw.orig
index 7b87f90e4..0d1b7d264 100755
--- a/test/pf/pf_cluster_1_openbsd-2.fw.orig
+++ b/test/pf/pf_cluster_1_openbsd-2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:11 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:46 2011 PST by vadim
 #
 # files: * pf_cluster_1_openbsd-2.fw /etc/pf_cluster_1_openbsd-2.fw
 # files:   pf_cluster_1_openbsd-2.conf /etc/pf_cluster_1_openbsd-2.conf
@@ -186,7 +186,7 @@ configure_interfaces() {
     update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:11 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:46 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/pf_cluster_2_freebsd-1.fw.orig b/test/pf/pf_cluster_2_freebsd-1.fw.orig
index a52baaae4..74b50a0af 100755
--- a/test/pf/pf_cluster_2_freebsd-1.fw.orig
+++ b/test/pf/pf_cluster_2_freebsd-1.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:11 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:46 2011 PST by vadim
 #
 # files: * pf_cluster_2_freebsd-1.fw /etc/pf_cluster_2_freebsd-1.fw
 # files:   pf_cluster_2_freebsd-1.conf /etc/pf_cluster_2_freebsd-1.conf
@@ -292,7 +292,7 @@ configure_interfaces() {
     $IFCONFIG pfsync0 up
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:11 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:46 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/pf_cluster_2_freebsd-2.fw.orig b/test/pf/pf_cluster_2_freebsd-2.fw.orig
index 5dedc8f46..cab760acb 100755
--- a/test/pf/pf_cluster_2_freebsd-2.fw.orig
+++ b/test/pf/pf_cluster_2_freebsd-2.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:11 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:46 2011 PST by vadim
 #
 # files: * pf_cluster_2_freebsd-2.fw /etc/pf_cluster_2_freebsd-2.fw
 # files:   pf_cluster_2_freebsd-2.conf /etc/pf_cluster_2_freebsd-2.conf
@@ -189,7 +189,7 @@ configure_interfaces() {
     update_addresses_of_interface "carp1 192.168.1.1/0xffffff00" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:11 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:46 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/pf_cluster_3_openbsd-3.fw.orig b/test/pf/pf_cluster_3_openbsd-3.fw.orig
index 755ea46b5..9b9725a0a 100755
--- a/test/pf/pf_cluster_3_openbsd-3.fw.orig
+++ b/test/pf/pf_cluster_3_openbsd-3.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:11 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:46 2011 PST by vadim
 #
 # files: * pf_cluster_3_openbsd-3.fw /etc/pf_cluster_3_openbsd-3.fw
 # files:   pf_cluster_3_openbsd-3.conf /etc/pf_cluster_3_openbsd-3.conf
@@ -293,7 +293,7 @@ configure_interfaces() {
     sync_pfsync_interfaces
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:11 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:46 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/pf_cluster_3_openbsd-4.fw.orig b/test/pf/pf_cluster_3_openbsd-4.fw.orig
index 418350596..f5fb92599 100755
--- a/test/pf/pf_cluster_3_openbsd-4.fw.orig
+++ b/test/pf/pf_cluster_3_openbsd-4.fw.orig
@@ -2,9 +2,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:12 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:47 2011 PST by vadim
 #
 # files: * pf_cluster_3_openbsd-4.fw /etc/pf_cluster_3_openbsd-4.fw
 # files:   pf_cluster_3_openbsd-4.conf /etc/pf_cluster_3_openbsd-4.conf
@@ -191,7 +191,7 @@ configure_interfaces() {
     update_addresses_of_interface "carp2 172.20.0.1/0xffffff00" ""
 }
 
-log "Activating firewall script generated Thu Feb  3 14:59:12 2011 by vadim"
+log "Activating firewall script generated Fri Feb  4 17:52:47 2011 by vadim"
 
 set_kernel_vars
 configure_interfaces
diff --git a/test/pf/pf_cluster_4_rc.conf.local b/test/pf/pf_cluster_4_rc.conf.local
index 4156c0d3a..d2eee9da9 100755
--- a/test/pf/pf_cluster_4_rc.conf.local
+++ b/test/pf/pf_cluster_4_rc.conf.local
@@ -1,9 +1,9 @@
 #
 #  This is automatically generated file. DO NOT MODIFY !
 #
-#  Firewall Builder  fwb_pf v4.2.0.3457
+#  Firewall Builder  fwb_pf v4.2.0.3458
 #
-#  Generated Thu Feb  3 14:59:12 2011 PST by vadim
+#  Generated Fri Feb  4 17:52:47 2011 PST by vadim
 #
 # files: * pf_cluster_4_rc.conf.local /etc/pf_cluster_4_rc.conf.local
 # files:   pf_cluster_4_pf.conf /etc/pf_cluster_4_pf.conf
@@ -22,7 +22,7 @@ ifconfig_carp0="vhid 101 pass secret   advskew 10  carpdev en0"
 ifconfig_carp1="vhid 100 pass secret   advskew 10  carpdev en1"
 
 network_interfaces="en0 en1 carp0 carp1"
-ipv6_network_interfaces=""
+ipv6_network_interfaces="en0 en1 carp0 carp1"
 ifconfig_en0="inet 172.24.0.3 netmask 0xffffff00"
 ifconfig_en1="inet 192.168.1.3 netmask 0xffffff00"
 ifconfig_carp0="inet 172.24.0.1 netmask 0xffffff00"