diff --git a/doc/ChangeLog b/doc/ChangeLog index 136bce564..29a4546f2 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,24 @@ +2011-05-05 Vadim Kurland + + * FWObjectDatabase_19.xslt: see #2385 "PF action Classify uses + wrong parameter". This change fixes a bug introduced in 4.2.0 + that affects rules with action Classify in PF firewalls. + + The bug causes the following problems: + + For users who built their rules before v4.2.0: + - rules compile normally, both in the single rule compile and + when the whole firewall is compiled + - if they opened the action of one of such rules in the action + editor, the classification string would look empty + - if they entered new classification string in the editor, + compiler kept using the old one (which they can not see or + change in the editor) + + For users who tried to build rules with action Classify with v4.2.0: + - no matter what classification string they enter in the action + dialog, generated code does not use it + 2011-05-04 Vadim Kurland * FWObjectDatabase_18.xslt: XSLT transformation to upgrade data diff --git a/src/libfwbuilder/migration/FWObjectDatabase_19.xslt b/src/libfwbuilder/migration/FWObjectDatabase_19.xslt new file mode 100644 index 000000000..56051b47c --- /dev/null +++ b/src/libfwbuilder/migration/FWObjectDatabase_19.xslt @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + pf_classify_str + + + + + + + + + + + + + + + + 20 + + root + + + + + + + diff --git a/src/libgui/ProjectPanel_file_ops.cpp b/src/libgui/ProjectPanel_file_ops.cpp index 594c890ab..c2587b843 100644 --- a/src/libgui/ProjectPanel_file_ops.cpp +++ b/src/libgui/ProjectPanel_file_ops.cpp @@ -211,7 +211,8 @@ bool ProjectPanel::fileNew() if (fwbdebug) qDebug("ProjectPanel::fileNew() rcs=%p rcs->getFileName()='%s'", - rcs, rcs->getFileName().toAscii().constData()); + rcs, rcs == 0 ? "" : + rcs->getFileName().toAscii().constData()); return (rcs!=NULL); } diff --git a/src/res/help/en_US/release_notes_4.2.1.html b/src/res/help/en_US/release_notes_4.2.1.html index 54a32583e..84520c9d4 100644 --- a/src/res/help/en_US/release_notes_4.2.1.html +++ b/src/res/help/en_US/release_notes_4.2.1.html @@ -50,6 +50,41 @@

+
  • +

    + fixes #2385 "PF action Classify uses wrong parameter". This + change fixes a bug introduced in 4.2.0 that affects rules with + action Classify in PF firewalls. The bug causes the following + problems: +

    + +

    + For users who built their rules before v4.2.0: +

    + +

    +

      +
    • rules compile normally, both in the single rule compile and + when the whole firewall is compiled
      • +
    • if they opened the action of one of such rules in the action + editor, the classification string would look empty
      • +
    • if they entered new classification string in the editor, + compiler kept using the old one (which they can not see or + change in the editor)
      • +
    +

    + +

    + For users who tried to build rules with action Classify with v4.2.0: +

    + +

    +

      +
    • no matter what classification string they enter in the action + dialog, generated code does not use it
      • +
    +

    +
    • diff --git a/test/iosacl/cluster-tests.fwb b/test/iosacl/cluster-tests.fwb index 4f4f58503..f7c939522 100644 --- a/test/iosacl/cluster-tests.fwb +++ b/test/iosacl/cluster-tests.fwb @@ -1,6 +1,6 @@ - + @@ -652,105 +652,120 @@ - + - + - + - + - + - + + + - + + - + - + - + - + - + - + + + - + + - + - + - + - + - + - + + + - + + - + - + - + - + - + - + + + - + + - + - + - + - + - + - + + + - + + @@ -1348,25 +1363,28 @@ - + - + - + - + - + - + + + - + + @@ -1592,133 +1610,151 @@ - + - + - + - + - + - + + + - + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - + + + - + + - + - + - + - + - + - + @@ -1807,64 +1846,76 @@ + + - + + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1959,133 +2010,151 @@ - + - + - + - + - + - + + + - + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - + @@ -2109,25 +2178,28 @@ + + - + + - + - + - + - + - + - + @@ -2151,64 +2223,76 @@ + + - + + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2312,133 +2396,151 @@ - + - + - + - + - + - + + + - + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - + @@ -2462,64 +2564,76 @@ + + - + + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2612,133 +2726,151 @@ - + - + - + - + - + - + + + - + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - - + + + + - + - + - + - + - + - + @@ -2762,64 +2894,76 @@ + + - + + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3062,7 +3206,10 @@ - + + + @@ -3080,7 +3227,10 @@ - + + + @@ -3098,7 +3248,10 @@ - + + + @@ -3116,7 +3269,10 @@ - + + + @@ -3134,7 +3290,10 @@ - + + + @@ -3152,7 +3311,10 @@ - + + + @@ -3170,7 +3332,10 @@ - + + + @@ -3292,7 +3457,10 @@ - + +