mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-20 01:37:59 +02:00
Improve wording of capabilities warning message
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6582 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
57fd93a5be
commit
02e575aa46
@ -1832,7 +1832,7 @@ do_initialize() {
|
|||||||
if [ -n "$CAPVERSION" ]; then
|
if [ -n "$CAPVERSION" ]; then
|
||||||
[ $CAPVERSION -ge $SHOREWALL_CAPVERSION ] || error_message "WARNING: $f is out of date -- it does not contain all of the capabilities defined by Shorewall version $VERSION"
|
[ $CAPVERSION -ge $SHOREWALL_CAPVERSION ] || error_message "WARNING: $f is out of date -- it does not contain all of the capabilities defined by Shorewall version $VERSION"
|
||||||
else
|
else
|
||||||
error_message "WARNING: $f may be out of date"
|
error_message "WARNING: $f may be not contain all of the capabilities defined by Shorewall version $VERSION"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ORIGINAL_POLICY_MATCH=$POLICY_MATCH
|
ORIGINAL_POLICY_MATCH=$POLICY_MATCH
|
||||||
|
@ -1000,7 +1000,7 @@ sub get_configuration( $ ) {
|
|||||||
if ( $capabilities{CAPVERSION} ) {
|
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};
|
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 {
|
} else {
|
||||||
warning_message "Your capabilities file may be out of date";
|
warning_message "Your capabilities file may not contain all of the capabilities defined by Shorewall version $globals{VERSION}";
|
||||||
}
|
}
|
||||||
|
|
||||||
$globals{ORIGINAL_POLICY_MATCH} = $capabilities{POLICY_MATCH};
|
$globals{ORIGINAL_POLICY_MATCH} = $capabilities{POLICY_MATCH};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user