mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-20 09:47:51 +02:00
Implement capabilities versioning
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6579 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
aee6fae91c
commit
b536abdaa1
@ -1,4 +1,4 @@
|
|||||||
s#
|
#
|
||||||
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Config.pm
|
# Shorewall-perl 4.0 -- /usr/share/shorewall-perl/Shorewall/Config.pm
|
||||||
#
|
#
|
||||||
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
|
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
|
||||||
@ -132,6 +132,7 @@ sub initialize() {
|
|||||||
LOGPARMS => '',
|
LOGPARMS => '',
|
||||||
TC_SCRIPT => '',
|
TC_SCRIPT => '',
|
||||||
VERSION => '4.0.0-Beta5',
|
VERSION => '4.0.0-Beta5',
|
||||||
|
CAPVERSION => 30405 ,
|
||||||
);
|
);
|
||||||
#
|
#
|
||||||
# From shorewall.conf file
|
# From shorewall.conf file
|
||||||
@ -263,6 +264,7 @@ sub initialize() {
|
|||||||
MANGLE_FORWARD => undef,
|
MANGLE_FORWARD => undef,
|
||||||
COMMENTS => undef,
|
COMMENTS => undef,
|
||||||
ADDRTYPE => undef,
|
ADDRTYPE => undef,
|
||||||
|
CAPVERSION => undef,
|
||||||
);
|
);
|
||||||
#
|
#
|
||||||
# /etc/protocols and /etc/services
|
# /etc/protocols and /etc/services
|
||||||
@ -300,6 +302,7 @@ sub initialize() {
|
|||||||
COMMENTS => 'Comments',
|
COMMENTS => 'Comments',
|
||||||
ADDRTYPE => 'Address Type Match',
|
ADDRTYPE => 'Address Type Match',
|
||||||
TCPMSS_MATCH => 'TCP MSS',
|
TCPMSS_MATCH => 'TCP MSS',
|
||||||
|
CAPVERSION => 'Capability Version',
|
||||||
);
|
);
|
||||||
#
|
#
|
||||||
# Directories to search for configuration files
|
# Directories to search for configuration files
|
||||||
@ -862,6 +865,8 @@ sub determine_capabilities() {
|
|||||||
|
|
||||||
qt( "$iptables -F $sillyname" );
|
qt( "$iptables -F $sillyname" );
|
||||||
qt( "$iptables -X $sillyname" );
|
qt( "$iptables -X $sillyname" );
|
||||||
|
|
||||||
|
$capabilities{CAPVERSION} = $globals{CAPVERSION};
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -992,6 +997,12 @@ sub get_configuration( $ ) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( $capabilities{CAPVERSION} ) {
|
||||||
|
warning_message "Your capabilities file is out of date -- it does not contain all of the capabilities defined by Shorewall version $globals{VERSION}" unless $capabilities{CAPVERSION} >= $globals{CAPVERSION};
|
||||||
|
} else {
|
||||||
|
warning_message "Your capabilities file may be out of date";
|
||||||
|
}
|
||||||
|
|
||||||
$globals{ORIGINAL_POLICY_MATCH} = $capabilities{POLICY_MATCH};
|
$globals{ORIGINAL_POLICY_MATCH} = $capabilities{POLICY_MATCH};
|
||||||
|
|
||||||
if ( $config{LOGRATE} || $config{LOGBURST} ) {
|
if ( $config{LOGRATE} || $config{LOGBURST} ) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user