* Importer.cpp (pushRule): fixes #2280 Rules created from PIX

config import showed an icon that indicated non-default
combination of rule options, yet all rule options looked normal
when opened in the editor.

VERSION

@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
 # build number is like "nano" version number. I am incrementing build
 # number during development cycle
 #
-BUILD_NUM="3510"
+BUILD_NUM="3511"
 
 VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
 

VERSION.h

@@ -1,2 +1,2 @@
-#define VERSION      "4.2.0.3510"
+#define VERSION      "4.2.0.3511"
 #define GENERATION   "4.2"

doc/ChangeLog

@@ -1,5 +1,10 @@
 2011-03-25  vadim  <vadim@netcitadel.com>
 
+	* Importer.cpp (pushRule): fixes #2280 Rules created from PIX
+	config import showed an icon that indicated non-default
+	combination of rule options, yet all rule options looked normal
+	when opened in the editor.
+
 	* parsers/pix.g (icmp_top_level_command): see #2164 Implemented
 	import of "ssh", "telnet" and "icmp" PIX/ASA commands. These
 	commands are imported as regular rules in the main Policy ruleset.

packaging/fwbuilder-static-qt.spec

@@ -3,7 +3,7 @@
 
 
 %define name    fwbuilder
-%define version 4.2.0.3510
+%define version 4.2.0.3511
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"

packaging/fwbuilder.control

@@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
 Priority: extra
 Section: checkinstall
 Maintainer: vadim@fwbuilder.org
-Version: 4.2.0.3510-1
+Version: 4.2.0.3511-1
 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
 Description: Firewall Builder GUI and policy compilers

packaging/fwbuilder.spec

@@ -1,6 +1,6 @@
 
 %define name    fwbuilder
-%define version 4.2.0.3510
+%define version 4.2.0.3511
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"

src/import/Importer.cpp

@@ -493,7 +493,7 @@ void Importer::newPolicyRule()
     // check if all child objects were populated properly
     FWOptions  *ropt = current_rule->getOptionsObject();
     assert(ropt!=NULL);
-    ropt->setBool("stateless",true);
+    ropt->setBool("stateless", true);
 }
 
 void Importer::newNATRule()
@@ -514,8 +514,20 @@ void Importer::pushRule()
 
     PolicyRule *rule = PolicyRule::cast(current_rule);
 
-    if (action=="permit") rule->setAction(PolicyRule::Accept);
+    FWOptions  *ropt = current_rule->getOptionsObject();
-    if (action=="deny")   rule->setAction(PolicyRule::Deny);
+    assert(ropt!=NULL);
+
+    if (action=="permit")
+    {
+        rule->setAction(PolicyRule::Accept);
+        ropt->setBool("stateless", false);
+    }
+
+    if (action=="deny")
+    {
+        rule->setAction(PolicyRule::Deny);
+        ropt->setBool("stateless", true);
+    }
 
     addSrc();
     addDst();