diff --git a/Shorewall-perl/Shorewall/IPAddrs.pm b/Shorewall-perl/Shorewall/IPAddrs.pm index 58e51e8e2..ec5adbfbe 100644 --- a/Shorewall-perl/Shorewall/IPAddrs.pm +++ b/Shorewall-perl/Shorewall/IPAddrs.pm @@ -26,7 +26,6 @@ # package Shorewall::IPAddrs; require Exporter; -use Socket6; use Shorewall::Config qw( :DEFAULT split_list require_capability in_hex8 F_IPV4 F_IPV6 ); use strict; @@ -507,13 +506,14 @@ sub validate_6address( $$ ) { my @addrs = ( $addr ); unless ( valid_6address $addr ) { + require Socket6; fatal_error "Invalid IPv6 Address ($addr)" unless $allow_name; - fatal_error "Unknown Host ($addr)" unless (@addrs = gethostbyname2 $addr, AF_INET6()); + fatal_error "Unknown Host ($addr)" unless (@addrs = Socket6::gethostbyname2( $addr, Socket6::AF_INET6())); if ( defined wantarray ) { shift @addrs for (1..4); for ( @addrs ) { - $_ = inet_ntop AF_INET6(), $_; + $_ = Socket6::inet_ntop( Socket6::AF_INET6(), $_ ); } } } diff --git a/Shorewall-perl/Shorewall/Zones.pm b/Shorewall-perl/Shorewall/Zones.pm index 3d8d62b29..6a8b26215 100644 --- a/Shorewall-perl/Shorewall/Zones.pm +++ b/Shorewall-perl/Shorewall/Zones.pm @@ -1,5 +1,5 @@ # -# Shorewall-perl 4.2 -- /usr/share/shorewall-perl/Shorewall/Zones.pm +# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Zones.pm # # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # @@ -66,7 +66,7 @@ our @EXPORT = qw( NOTHING ); our @EXPORT_OK = qw( initialize ); -our $VERSION = 4.1.5; +our $VERSION = 4.3.1; # # IPSEC Option types