Avoid CAPVERSION bump to implement FLOW_FILTER detection

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-02-11 07:29:41 -08:00
parent b8c195f570
commit b35f20b403
3 changed files with 9 additions and 3 deletions

View File

@ -338,7 +338,7 @@ sub initialize( $ ) {
EXPORT => 0,
UNTRACKED => 0,
VERSION => "4.4.7",
CAPVERSION => 40408 ,
CAPVERSION => 40407 ,
);
#
@ -655,6 +655,7 @@ sub initialize( $ ) {
LOG_TARGET => 1, # Assume that we have it.
PERSISTENT_SNAT => undef,
OLD_HL_MATCH => undef,
FLOW_FILTER => 'default',
CAPVERSION => undef,
KERNELVERSION => undef,
);
@ -2600,6 +2601,11 @@ sub read_capabilities() {
for ( keys %capabilities ) {
$capabilities{$_} = '' unless defined $capabilities{$_};
}
if ( $capabilities{FLOW_FILTER} eq 'default' ) {
$capabilities{FLOW_FILTER} = $capabilities{OLD_HL_MATCH} ? '' : 'Yes';
}
}
#

View File

@ -30,7 +30,7 @@
#
SHOREWALL_LIBVERSION=40407
SHOREWALL_CAPVERSION=40408
SHOREWALL_CAPVERSION=40407
[ -n "${VARDIR:=/var/lib/shorewall}" ]
[ -n "${SHAREDIR:=/usr/share/shorewall}" ]

View File

@ -33,7 +33,7 @@
#
SHOREWALL_LIBVERSION=40407
SHOREWALL_CAPVERSION=40408
SHOREWALL_CAPVERSION=40407
[ -n "${VARDIR:=/var/lib/shorewall6}" ]
[ -n "${SHAREDIR:=/usr/share/shorewall6}" ]