diff --git a/Shorewall/action.template b/Shorewall/action.template index b58ed1af3..f56bbbe27 100644 --- a/Shorewall/action.template +++ b/Shorewall/action.template @@ -14,8 +14,7 @@ # Columns are: # # -# TARGET ACCEPT, DROP, REJECT, DNAT, DNAT-, REDIRECT, CONTINUE -# or LOG. +# TARGET ACCEPT, DROP, REJECT, LOG or QUEUE. # # ACCEPT -- allow the connection request # DROP -- ignore the request diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 738f398eb..9a7177c60 100755 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -10,6 +10,12 @@ Problems Corrected since version 1.4.8: 2) The description of NEWNOTSYN in shorewall.conf has been reworded for clarity. +3) Wild-card rules (those involving "all" as SOURCE or DEST) will no + longer produce an error if they attempt to add a rule that would + override a NONE policy. The logic for expanding these wild-card + rules now simply skips those (SOURCE,DEST) pairs that have a NONE + policy. + Migration Issues: None. diff --git a/Shorewall/rules b/Shorewall/rules index 2aef33877..77ced5bb1 100755 --- a/Shorewall/rules +++ b/Shorewall/rules @@ -15,8 +15,8 @@ # Columns are: # # -# ACTION ACCEPT, DROP, REJECT, DNAT, DNAT-, REDIRECT, CONTINUE -# or LOG. +# ACTION ACCEPT, DROP, REJECT, DNAT, DNAT-, REDIRECT, CONTINUE, +# LOG or an . # # ACCEPT -- allow the connection request # DROP -- ignore the request