Merge branch '5.1.5'

This commit is contained in:
Tom Eastep 2017-07-27 09:14:50 -07:00
commit 5a24953e6c
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
2 changed files with 4 additions and 4 deletions

View File

@ -195,7 +195,7 @@ sub process_accounting_rule1( $$$$$$$$$$$ ) {
$ports = '' if $ports eq 'any' || $ports eq 'all';
$sports = '' if $sports eq 'any' || $sports eq 'all';
fatal_error "USER/GROUP may only be specified in the OUTPUT section" unless $user eq '-' || $asection == OUTPUT;
fatal_error "USER/GROUP may only be specified in the OUTPUT section" unless $user eq '-' || $asection == OUTPUT_SECTION;
my $rule = do_proto( $proto, $ports, $sports ) . do_user ( $user ) . do_test ( $mark, $globals{TC_MASK} ) . do_headers( $headers );
my $prerule = '';

View File

@ -175,8 +175,8 @@
</section>
<section id="faq76">
<title>(FAQ 76) I just upgraded my Debian (Ubuntu, Kubuntu, ...) system
and now masquerading doesn't work? What happened?</title>
<title>(FAQ 76) I just upgraded my system and now masquerading doesn't
work? What happened?</title>
<para><emphasis role="bold">Answer:</emphasis> This happens to people
who ignore <ulink url="Install.htm#Upgrade_Deb">our advice</ulink> and
@ -185,7 +185,7 @@
default settings. Failure to forward traffic (such as during masqueraded
net access from a local network) usually means that <filename><ulink
url="manpages/shorewall.conf.html">/etc/shorewall/shorewall.conf</ulink></filename>
contains the Debian default setting IP_FORWARDING=Keep; it should be
contains the default setting IP_FORWARDING=Keep; it should be
IP_FORWARDING=On.</para>
<para><emphasis role="bold">Update</emphasis>: Beginning with Shorewall