diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt index 9fd6bbf27..b060b5ba9 100644 --- a/Shorewall-common/releasenotes.txt +++ b/Shorewall-common/releasenotes.txt @@ -116,6 +116,19 @@ Other changes in Shorewall 4.1.2. Those parameters that are supplied must have defined values. + Defaults are: + + object '' ('check' command) + directory '' + verbosity 1 + timestamp 0 + debug 0 + export 0 + chains '' + log '' + log_verbosity -1 + + Example: use lib '/usr/share/shorewall-perl/'; @@ -132,7 +145,7 @@ Other changes in Shorewall 4.1.2. originating on the firewall must be coded in the POSTROUTING table. 3) Previously, Shorewall did not range-check the value of the - VERBOSITY option in shorewall.conf. Beginnins with Shorewall 4.1.2: + VERBOSITY option in shorewall.conf. Beginning with Shorewall 4.1.2: a) A VERBOSITY setting outside the range -1 through 2 is rejected. b) After the -v and -q options are applied, the resulting value is diff --git a/docs/Shorewall-perl.xml b/docs/Shorewall-perl.xml index 465f0d364..d129a8061 100644 --- a/docs/Shorewall-perl.xml +++ b/docs/Shorewall-perl.xml @@ -615,12 +615,12 @@ loc net ACCEPT /usr/share/shorewall-perl/compiler.pl While the compiler is normally run indirectly using - /sbin/shorewall, it can be run directly as well.compiler.pl [ <option> ... ] [ <filename> ] + /sbin/shorewall, it can be run directly as well.compiler.pl [ option ... ] [ filename ] - If a <filename> is given, then the - configuration will be compiled output placed in the named file. If - <filename> is not given, then the - configuration will simply be syntax checked. + If a filename is given, then the + configuration will be compiled and the output placed in the named file. + If filename is not given, then the configuration + will simply be syntax checked. Options are: @@ -631,7 +631,11 @@ loc net ACCEPT The <verbosity> is a number between 0 and 2 and corresponds to the VERBOSITY setting in shorewall.conf. This setting controls the verbosity - of the compiler itself. + of the compiler itself. + The VERBOSITY setting in the + shorewall.conf file read by the compiler will + determine the default verbosity for the compiled program. + -e --export @@ -662,7 +666,16 @@ loc net ACCEPT Example (compiles the configuration in the current directory generating a script named 'firewall' and using VERBOSITY - 2)./usr/share/shorewall-perl/compiler.pl -v 2 -d . firewall + 2)./usr/share/shorewall-perl/compiler.pl -v 2 -d . firewall + The Perl-based compiler does not process + /etc/shorewall/params. To include definitions + in that file, you would need to do something like the + following:. /usr/share/shorewall/lib.base # In case /etc/shorewall/params does INCLUDE +set -a # Export all variables set in /etc/shorewall/params +. /etc/shorewall/params +set +a +/usr/share/shorewall-perl/compiler.pl ... +
@@ -698,7 +711,13 @@ loc net ACCEPT $verbose - The verbosity level (0-2). + The verbosity level that the compiler will run with + (0-2). + The VERBOSITY setting in the + shorewall.conf file read by the compiler + will determine the default verbosity for the compiled + program. + diff --git a/web/shorewall_index.htm b/web/shorewall_index.htm index 80810adc3..3366d60b7 100644 --- a/web/shorewall_index.htm +++ b/web/shorewall_index.htm @@ -21,7 +21,7 @@ Sections, with no Front-Cover, and with no Back-Cover Texts. A copy of the license is included in the section entitled “GNU Free Documentation License”.

-

2007-11-26

+

2007-12-05


Table of Contents

@@ -228,7 +228,7 @@ root@wookie:/usr/share/shorewall# 4.0.0-4.0.5 can cause improper handing of PREROUTING and OUTPUT marks when HIGH_ROUTE_MARKS=Yes. Patches are also available to correct this problem:

-

Shorewall version 3.2.3-3.2.10, 3.4.0-3.4.7: Shorewall version 3.2.3-3.2.11: http://www1.shorewall.net/pub/shorewall/3.2/shorewall-3.2.11/errata/patches/Shorewall/patch-3.2.11-1.diff

Shorewall version 3.4.0-3.4.7: