extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-22 07:33:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change 'Provides' for Shorewall6-lite

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9605 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-03-05 16:18:58 +00:00
parent 14673e4ab5
commit 062c7ec822
6 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@
package Shorewall::IPAddrs; package Shorewall::IPAddrs;
require Exporter; require Exporter;
use Shorewall::Config qw( :DEFAULT split_list require_capability in_hex8 F_IPV4 F_IPV6 ); use Shorewall::Config qw( :DEFAULT split_list require_capability in_hex8 F_IPV4 F_IPV6 );
use Socket;
use strict; use strict;
@ -142,13 +143,10 @@ sub validate_4address( $$ ) {
unless ( valid_4address $addr ) { unless ( valid_4address $addr ) {
fatal_error "Invalid IP Address ($addr)" unless $allow_name; fatal_error "Invalid IP Address ($addr)" unless $allow_name;
fatal_error "Unknown Host ($addr)" unless (@addrs = gethostbyname $addr); fatal_error "Unknown Host ($addr)" unless (defined ( $addr = gethostbyname $addr) );
if ( defined wantarray ) { if ( defined wantarray ) {
shift @addrs for (1..4); @addrs = ( inet_ntoa( $addr ) );
for ( @addrs ) {
$_ = inet_htoa $_;
}
} }
} }

10
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -1165,8 +1165,14 @@ sub process_rule1 ( $$$$$$$$$$$$$ ) {
if ( $actiontype & NATONLY ) { if ( $actiontype & NATONLY ) {
unless ( $destzone eq '-' || $destzone eq '' ) { unless ( $destzone eq '-' || $destzone eq '' ) {
fatal_error "Unknown destination zone ($destzone)" unless $destref = defined_zone( $destzone ); $destref = defined_zone( $destzone );
warning_message "Destination zone ($destzone) ignored";
if ( $destref ) {
warning_message "Destination zone ($destzone) ignored";
} else {
$dest = join ':', $destzone, $dest;
$destzone = '';
}
} }
} else { } else {
fatal_error "Missing destination zone" if $destzone eq '-' || $destzone eq ''; fatal_error "Missing destination zone" if $destzone eq '-' || $destzone eq '';

2
Shorewall/changelog.txt
View File

@ -4,6 +4,8 @@ Changes in Shorewall 4.3.7
2) Replace $VARDIR/.restore with $VARDIR/firewall 2) Replace $VARDIR/.restore with $VARDIR/firewall
3) Fix DNAT- parsing of DEST column.
Changes in Shorewall 4.3.6 Changes in Shorewall 4.3.6
1) Add SAME tcrules target. 1) Add SAME tcrules target.

2
Shorewall/install.sh
View File

@ -202,7 +202,6 @@ else
echo "shorewall control program installed in ${PREFIX}/bin/shorewall" echo "shorewall control program installed in ${PREFIX}/bin/shorewall"
fi fi
# #
# Install the Firewall Script # Install the Firewall Script
# #
@ -242,7 +241,6 @@ if [ ! -f ${PREFIX}/etc/shorewall/shorewall.conf ]; then
echo "Config file installed as ${PREFIX}/etc/shorewall/shorewall.conf" echo "Config file installed as ${PREFIX}/etc/shorewall/shorewall.conf"
fi fi
if [ -n "$ARCHLINUX" ] ; then if [ -n "$ARCHLINUX" ] ; then
sed -e 's!LOGFILE=/var/log/messages!LOGFILE=/var/log/messages.log!' -i ${PREFIX}/etc/shorewall/shorewall.conf sed -e 's!LOGFILE=/var/log/messages!LOGFILE=/var/log/messages.log!' -i ${PREFIX}/etc/shorewall/shorewall.conf
fi fi

16
Shorewall/releasenotes.txt
View File

@ -46,7 +46,21 @@ released late in 2009.
norfc1918 norfc1918
nosmurfs nosmurfs
tcpflags tcpflags
2) Matt LaPlante reported a problem whereby a valid DNAT- rule was
badly mis-handled.
The rule:
DNAT- loc net:1.2.3.4:2525 tcp 25
The result:
WARNING: Destination zone (1.2.3.4) ignored : /etc/shorewall/rules (line 459)
Can't call method "inet_htoa" without a package or object reference at
/usr/share/shorewall-perl/Shorewall/IPAddrs.pm line 150,
<$currentfile> line 459.
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
K N O W N P R O B L E M S R E M A I N I N G K N O W N P R O B L E M S R E M A I N I N G
---------------------------------------------------------------------------- ----------------------------------------------------------------------------

2
Shorewall6-lite/init.sh
View File

@ -41,7 +41,7 @@ RCDLINKS="2,S41 3,S41 6,K41"
# description: Packet filtering firewall # description: Packet filtering firewall
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: shorewall6 # Provides: shorewall6-lite
# Required-Start: $network # Required-Start: $network
# Required-Stop: # Required-Stop:
# Default-Start: 2 3 5 # Default-Start: 2 3 5