mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-02 16:05:39 +02:00
Changes for Shorewall4
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5657 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
5f5ece2a31
commit
1900bfb5cd
@ -107,7 +107,7 @@ our %config =
|
|||||||
USE_ACTIONS=> undef,
|
USE_ACTIONS=> undef,
|
||||||
OPTIMIZE => undef,
|
OPTIMIZE => undef,
|
||||||
EXPORTPARAMS => undef,
|
EXPORTPARAMS => undef,
|
||||||
EXPERIMENTAL => undef,
|
SHOREWALL4 => undef,
|
||||||
#
|
#
|
||||||
# Packet Disposition
|
# Packet Disposition
|
||||||
#
|
#
|
||||||
@ -365,6 +365,7 @@ sub get_configuration() {
|
|||||||
default_yes_no 'BLACKLISTNEWONLY' , '';
|
default_yes_no 'BLACKLISTNEWONLY' , '';
|
||||||
default_yes_no 'DISABLE_IPV6' , '';
|
default_yes_no 'DISABLE_IPV6' , '';
|
||||||
default_yes_no 'DYNAMIC_ZONES' , '';
|
default_yes_no 'DYNAMIC_ZONES' , '';
|
||||||
|
default_yes_no 'BRIDGING' , '';
|
||||||
|
|
||||||
fatal_error "DYNAMIC_ZONES=Yes is incompatible with the -e option" if $config{DYNAMIC_ZONES} and $ENV{EXPORT};
|
fatal_error "DYNAMIC_ZONES=Yes is incompatible with the -e option" if $config{DYNAMIC_ZONES} and $ENV{EXPORT};
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
# This program performs rudimentary shell variable expansion on action and macro files.
|
# This program performs rudimentary shell variable expansion on action and macro files.
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use lib '/usr/share/shorewall';
|
use lib '/usr/share/shorewall4';
|
||||||
use Shorewall::Common;
|
use Shorewall::Common;
|
||||||
use Shorewall::Config;
|
use Shorewall::Config;
|
||||||
use Shorewall::Chains;
|
use Shorewall::Chains;
|
||||||
@ -601,7 +601,7 @@ sub compile_firewall( $ ) {
|
|||||||
unless $capabilities{XMULTIPORT};
|
unless $capabilities{XMULTIPORT};
|
||||||
fatal_error( 'Shorewall ' . VERSION . ' requires Address Type Match Support' )
|
fatal_error( 'Shorewall ' . VERSION . ' requires Address Type Match Support' )
|
||||||
unless $capabilities{ADDRTYPE};
|
unless $capabilities{ADDRTYPE};
|
||||||
fatal_error 'BRIDGING=Yes is not supported by the ' . VERSION . 'Perl-based compiler';
|
fatal_error 'BRIDGING=Yes is not supported by the ' . VERSION . ' Perl-based compiler'
|
||||||
if $config{BRIDGING};
|
if $config{BRIDGING};
|
||||||
fatal_error 'MACLIST_TTL requires the Recent Match capability which is not present in your Kernel and/or iptables'
|
fatal_error 'MACLIST_TTL requires the Recent Match capability which is not present in your Kernel and/or iptables'
|
||||||
if $config{MACLIST_TTL} && ! $capabilities{RECENT_MATCH};
|
if $config{MACLIST_TTL} && ! $capabilities{RECENT_MATCH};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user