extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-18 20:30:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.5.12'

Browse Source 
Conflicts:
	Shorewall/manpages/shorewall.conf.xml
	Shorewall6/manpages/shorewall6.conf.xml

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-01-15 10:42:10 -08:00
commit f0e580347d
6 changed files with 19 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall/Perl/Shorewall/IPAddrs.pm
View File

@ -26,7 +26,7 @@
#
package Shorewall::IPAddrs;
require Exporter;
use Shorewall::Config qw( :DEFAULT split_list require_capability in_hex8 numeric_value F_IPV4 F_IPV6 :protocols );
use Shorewall::Config qw( :DEFAULT split_list require_capability in_hex8 numeric_value F_IPV4 F_IPV6 :protocols %config );
use Socket;
use strict;
@ -220,7 +220,8 @@ sub validate_4net( $$ ) {
fatal_error "Invalid IP address ($net)" unless valid_4address $net;
} else {
fatal_error "Invalid Network address ($_[0])" if $_[0] =~ '/' || ! defined $net;
validate_4address $net, $_[1];
my $net1 = validate_4address $net, $allow_name;
$net = $net1 unless $config{DEFER_DNS_RESOLUTION};
$vlsm = 32;
}
@ -668,7 +669,8 @@ sub validate_6net( $$ ) {
fatal_error "Invalid IPv6 address ($net)" unless valid_6address $net;
} else {
fatal_error "Invalid Network address ($_[0])" if $_[0] =~ '/';
validate_6address $net, $allow_name;
my $net1 = validate_6address $net, $allow_name;
$net = $net1 unless $config{DEFER_DNS_RESOLUTION};
$vlsm = 128;
}

2
Shorewall/Perl/Shorewall/Providers.pm
View File

@ -1089,7 +1089,7 @@ sub add_a_route( ) {
}
fatal_error 'DEST must be specified' if $dest eq '-';
$dest = validate_net ( $dest, 1 );
$dest = validate_net ( $dest, 0 );
validate_address ( $gateway, 1 ) if $gateway ne '-';

2
Shorewall/Perl/Shorewall/Zones.pm
View File

@ -1200,7 +1200,7 @@ sub process_interface( $$ ) {
$hostoptions{broadcast} = 1;
} elsif ( $option eq 'sfilter' ) {
$filterref = [ split_list $value, 'address' ];
$_ = validate_net( $_, 1) for @{$filterref}
validate_net( $_, 0) for @{$filterref}
} else {
assert(0);
}

4
Shorewall/manpages/shorewall-arprules.xml
View File

@ -161,7 +161,7 @@
<term><replaceable>ipaddress</replaceable></term>
<listitem>
<para>is an IPv4 address.</para>
<para>is an IPv4 address. DNS names are not allowed.</para>
</listitem>
</varlistentry>
@ -224,7 +224,7 @@
<term><replaceable>ipaddress</replaceable></term>
<listitem>
<para>is an IPv4 address or a MAC address.</para>
<para>is an IPv4 address. DNS Names are not allowed.</para>
</listitem>
</varlistentry>

22
Shorewall/manpages/shorewall.conf.xml
View File

@ -559,23 +559,11 @@
is an advantage if you use AUTOMAKE=Yes and the IP address
associated with the DNS name is subject to change. When
DEFER_DNS_RESOLUTION=No, DNS names are converted into IP addresses
by the compiler. This has two advantages:</para>
<orderedlist>
<listitem>
<para>When AUTOMAKE=Yes the <command>start</command> and
<command>restart</command> commands will succeed even if no DNS
server is reachable (assuming that the configuration hasn't
changed since the compiled script was last generated).</para>
</listitem>
<listitem>
<para>The <command>restore</command> command (including the
automatic <command>restore</command> performed when
<command>start</command> or <command>restart</command> fails)
will succeed even if no DNS server is reachable.</para>
</listitem>
</orderedlist>
by the compiler. This has the advantage that when AUTOMAKE=Yes, the
<command>start</command> and <command>restart</command> commands
will succeed even if no DNS server is reachable (assuming that the
configuration hasn't changed since the compiled script was last
generated).</para>
</listitem>
</varlistentry>

22
Shorewall6/manpages/shorewall6.conf.xml
View File

@ -498,23 +498,11 @@
is an advantage if you use AUTOMAKE=Yes and the IP address
associated with the DNS name is subject to change. When
DEFER_DNS_RESOLUTION=No, DNS names are converted into IP addresses
by the compiler. This has two advantages:</para>
<orderedlist>
<listitem>
<para>When AUTOMAKE=Yes the <command>start</command> and
<command>restart</command> commands will succeed even if no DNS
server is reachable (assuming that the configuration hasn't
changed since the compiled script was last generated).</para>
</listitem>
<listitem>
<para>The <command>restore</command> command (including the
automatic <command>restore</command> performed when
<command>start</command> or <command>restart</command> fails)
will succeed even if no DNS server is reachable.</para>
</listitem>
</orderedlist>
by the compiler. This has the advantage that when AUTOMAKE=Yes the
<command>start</command> and <command>restart</command> commands
will succeed even if no DNS server is reachable (assuming that the
configuration hasn't changed since the compiled script was last
generated).</para>
</listitem>
</varlistentry>