Fix 'rpm -U' from earlier versions

This commit is contained in:
Tom Eastep 2009-07-21 12:32:25 -07:00
parent 902d6e0d45
commit 4fd338f3ca
6 changed files with 17 additions and 0 deletions

View File

@ -625,6 +625,7 @@ case "$COMMAND" in
;;
status)
[ $# -eq 1 ] || usage 1
[ "$(id -u)" != 0 ] && fatal_error "ERROR: The status command may only be run by root"
echo "Shorewall Lite $version Status at $HOSTNAME - $(date)"
echo
if shorewall_is_started ; then

View File

@ -8,6 +8,10 @@ Changes in Shorewall 4.4.0-RC1
4) Fix NONAT on child zone.
5) Fix rpm -U from earlier versions
6) Generate error on 'status' by non-root.
Changes in Shorewall 4.4.0-Beta4
1) Add more macros.

View File

@ -121,6 +121,15 @@ Shorewall 4.4.0 RC1
3) Previously, NONAT rules on a sub-zone were not exempted from
DNAT/REDIRECT rules of a parent zone.
4) Previously if the 'status' command was run by someone other than
root, the response always show that the firewall was stopped and
the state was 'Unknown'. Now an error message is generated to
indicate that the command may only be run by root.
5) Previously, if 'rpm -U' was used to upgrade from a version of
Shorewall earlier than 4.3.5, then Shorewall would not start
automatically at boot time.
----------------------------------------------------------------------------
K N O W N P R O B L E M S R E M A I N I N G
----------------------------------------------------------------------------

View File

@ -1785,6 +1785,7 @@ case "$COMMAND" in
;;
status)
[ $# -eq 1 ] || usage 1
[ "$(id -u)" != 0 ] && fatal_error "ERROR: The status command may only be run by root"
get_config
echo "Shorewall-$version Status at $HOSTNAME - $(date)"
echo

View File

@ -608,6 +608,7 @@ case "$COMMAND" in
;;
status)
[ $# -eq 1 ] || usage 1
[ "$(id -u)" != 0 ] && fatal_error "ERROR: The status command may only be run by root"
echo "Shorewall6 Lite $version Status at $HOSTNAME - $(date)"
echo
if shorewall6_is_started ; then

View File

@ -1688,6 +1688,7 @@ case "$COMMAND" in
;;
status)
[ $# -eq 1 ] || usage 1
[ "$(id -u)" != 0 ] && fatal_error "ERROR: The status command may only be run by root"
get_config
echo "Shorewall6-$version Status at $HOSTNAME - $(date)"
echo