Merge branch '5.2.8'

This commit is contained in:
Tom Eastep 2020-09-25 10:05:35 -07:00
commit 2ceeb2c934
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
4 changed files with 14 additions and 3 deletions

View File

@ -0,0 +1,12 @@
#
# Shorewall -- /usr/share/shorewall/macro.NFS
#
# This macro handles NFS v4.1+ traffic with default ports.
# You should only allow NFS traffic between hosts you fully trust.
#
###############################################################################
#ACTION SOURCE DEST PROTO DPORT SPORT ORIGDEST RATE USER
PARAM - - tcp 111 # portmapper, rpcbind
PARAM - - tcp 2049 # nfs
PARAM - - tcp 20048 # mountd

View File

@ -279,7 +279,7 @@ sub generate_script_2() {
# #
# Conditionally emit the 'generate_all_acasts() function # Conditionally emit the 'generate_all_acasts() function
# #
my $call_generate_all_acasts = $family == F_IPV6 && ! have_capability( 'ADDRTYPE' ) && generate_all_acasts; my $call_generate_all_acasts = $family == F_IPV6 && ! have_capability( 'ADDRTYPE' ) ? generate_all_acasts : '';
emit( '' , emit( '' ,
'#' , '#' ,

View File

@ -75,7 +75,6 @@ our @EXPORT = ( qw( NOTHING
all_interfaces all_interfaces
all_real_interfaces all_real_interfaces
all_plain_interfaces all_plain_interfaces
interface_is_plain
all_bridges all_bridges
managed_interfaces managed_interfaces
unmanaged_interfaces unmanaged_interfaces

View File

@ -1 +1 @@
5.2.8-RC1 5.2.8-base