holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Start 4.4.2.5

Browse Source
This commit is contained in:
Tom Eastep 2009-10-24 12:22:22 -07:00
parent 55b208ec96
commit cc7514e1a4
5 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,7 +284,7 @@ sub generate_script_2() {
emit ( 'esac' ) ,
} else {
emit( 'true' );
emit( 'true' ) unless handle_optional_interfaces;
}
pop_indent;

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

@ -143,10 +143,12 @@ sub setup_route_marking() {
sub copy_table( $$$ ) {
my ( $duplicate, $number, $realm ) = @_;
my $filter = $family == F_IPV6 ? q(sed 's/ via :: / /' | ) : '';
if ( $realm ) {
emit ( "\$IP -$family route show table $duplicate | sed -r 's/ realm [[:alnum:]_]+//' | while read net route; do" )
} else {
emit ( "\$IP -$family route show table $duplicate | while read net route; do" )
emit ( "\$IP -$family route show table $duplicate | ${filter}while read net route; do" )
}
emit ( ' case $net in',
@ -162,11 +164,13 @@ sub copy_table( $$$ ) {
sub copy_and_edit_table( $$$$ ) {
my ( $duplicate, $number, $copy, $realm) = @_;
my $filter = $family == F_IPV6 ? q(sed 's/ via :: / /' | ) : '';
if ( $realm ) {
emit ( "\$IP -$family route show table $duplicate | sed -r 's/ realm [[:alnum:]_]+//' | while read net route; do" )
} else {
emit ( "\$IP -$family route show table $duplicate | while read net route; do" )
emit ( "\$IP -$family route show table $duplicate | ${filter}while read net route; do" )
}
emit ( ' case $net in',
@ -819,6 +823,8 @@ sub handle_optional_interfaces() {
" ${base}_IS_USABLE=" ,
'fi' );
}
1;
}
}

4
Shorewall/changelog.txt
View File

@ -1,3 +1,7 @@
Changes in Shorewall 4.4.2.4
1) Correct optional interfaces.
Changes in Shorewall 4.4.2.3
1) Fix internal error with RETAIN_ALIASES=No.

4
Shorewall/known_problems.txt
View File

@ -33,3 +33,7 @@
Corrected in Shorewall 4.4.2.4.
6) Under certain circumstances, optional providers are not detected
as being usable.
Corrected in Shorewall 4.4.2.5.

19
Shorewall/releasenotes.txt
View File

@ -1,4 +1,4 @@
Shorewall 4.4.2 Patch Release 4.
Shorewall 4.4.2 Patch Release 5.
----------------------------------------------------------------------------
R E L E A S E 4 . 4 H I G H L I G H T S
@ -169,6 +169,23 @@ Shorewall 4.4.2 Patch Release 4.
now, if the zone has <interface>:0.0.0.0/0 (even with exclusions),
then it may have no additional members in /etc/shorewall/hosts.
----------------------------------------------------------------------------
P R O B L E M S C O R R E C T E D I N 4 . 4 . 2 . 5
----------------------------------------------------------------------------
1) Under certain circumstances, optional providers were not detected
as being usable.
Additionally, messages issued when an optional provider was not
usable were confusing; the message intended to be issued when the
provider shared an interface ("WARNING: Gateway <gateway> is not
reachable -- Provider <name> (<number>) not Added") was being
issued when the provider did not share an interface. Similarly, the
message intended to be issued when the provider did not share an
interface ("WARNING: Interface <interface> is not usable --
Provider <name> (<number>) not Added") was being issued when the
provider did share an interface.
----------------------------------------------------------------------------
P R O B L E M S C O R R E C T E D I N 4 . 4 . 2 . 4
----------------------------------------------------------------------------