diff --git a/Shorewall2/blacklist b/Shorewall2/blacklist index 6ec2986c4..a3c7e457f 100755 --- a/Shorewall2/blacklist +++ b/Shorewall2/blacklist @@ -23,10 +23,10 @@ # is TCP (6) or UDP (17). A comma-separated list # of port numbers or service names from /etc/services. # -# When a packet arrives on in interface that has the 'blacklist' option -# specified, its source IP address is checked against this file and disposed of -# according to the BLACKLIST_DISPOSITION and BLACKLIST_LOGLEVEL variables in -# /etc/shorewall/shorewall.conf +# When a packet arrives on an interface that has the 'blacklist' option +# specified in /etc/shorewall/interfaces, its source IP address is checked +# against this file and disposed of according to the BLACKLIST_DISPOSITION and +# BLACKLIST_LOGLEVEL variables in /etc/shorewall/shorewall.conf # # If PROTOCOL or PROTOCOL and PORTS are supplied, only packets matching # the protocol (and one of the ports if PORTS supplied) are blocked. diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index 7ff51fb31..9bb9a54d7 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -102,3 +102,5 @@ Changes since 2.0.3 handled before traffic from non-IPSEC zones. 49) Correct logmartians handling. + +50) Add a clarification and fix a typo in the blacklist file. diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index bbea81580..03afad919 100755 --- a/Shorewall2/releasenotes.txt +++ b/Shorewall2/releasenotes.txt @@ -80,6 +80,9 @@ Problems corrected since 2.1.10 3) A typo has been corrected that prevented the 'logmartians' interface option from working correctly. +4) A typo has been corrected in and a clarification added to the + /etc/shorewall/blacklist file. + ----------------------------------------------------------------------- Issues when migrating from Shorewall 2.0 to Shorewall 2.1: