diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index edde51f13..09ae529ac 100755 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -2,6 +2,8 @@ Changes in 3.0.3 1) Implement "shorewall show macros" +2) Comments regarding bridge configuration were improved. + Changes in 3.0.2 1) Typos in the Samples corrected. diff --git a/Shorewall/hosts b/Shorewall/hosts index 520679ca7..a7f3caabe 100644 --- a/Shorewall/hosts +++ b/Shorewall/hosts @@ -41,7 +41,9 @@ # optionally followed by a colon (":") and a # host or network IP or a range. # See http://www.shorewall.net/Bridge.html -# for details. +# for details. Specifying a physical port +# name requires that you have BRIDGING=Yes in +# /etc/shorewall/shorewall.conf. # e) The name of an ipset (preceded by "+"). # # Examples: diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 5947515e6..327eb022a 100755 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -2,7 +2,9 @@ Shorewall 3.0.3 Problems Corrected in 3.0.3 -None. +1) The comments in the /etc/shorewall/shorewall.conf and + /etc/shorewall/hosts files have been changed to clarify when + BRIDGING=Yes is required when dealing with bridges. New Features in 3.0.3 @@ -83,7 +85,7 @@ New Features in 3.0.1 ACCEPT net loc:192.168.1.5 tcp http -Migration Considerations: +Migration Considerations for Users upgrade from Shorewall 2.2 or 2.4. 1) The "monitor" command has been eliminated. @@ -593,7 +595,9 @@ New Features in Shorewall 3.0.* 21) The output of "shorewall dump" now includes a capabilities report such as the one produced by "shorewall show capabilities". -22) The "plain" zone type has been replaced by "ipv4". The types +22) Note: This change is only important for users who ran Shorewall 2.5.x. + + The "plain" zone type has been replaced by "ipv4". The types "IPv4" and "IPV4" are synonyms for "ipv4". In addition, "IPSEC", "ipsec4" and "IPSEC4" are recognized synonyms for "ipsec". diff --git a/Shorewall/shorewall.conf b/Shorewall/shorewall.conf index f040e282f..80024510d 100755 --- a/Shorewall/shorewall.conf +++ b/Shorewall/shorewall.conf @@ -652,7 +652,7 @@ DISABLE_IPV6=Yes # # BRIDGING # -# If you wish to control traffic through a bridge (see http://bridge.sf.net), +# If you wish to restrict connections through a bridge (see http://bridge.sf.net), # then set BRIDGING=Yes. Your kernel must have the physdev match option # enabled; that option is available at the above URL for 2.4 kernels and # is included as a standard part of the 2.6 series kernels. If not