extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-30 22:50:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve error message for startup errors. Document in release documents.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9730 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep
2009-03-23 22:51:05 +00:00
parent 1545d62ba9
commit 6013e8b53d
4 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Shorewall/Perl/prog.functions
View File

@ -68,16 +68,16 @@ fatal_error()
# #
startup_error() # $* = Error Message startup_error() # $* = Error Message
{ {
echo " ERROR: $@" >&2 echo " ERROR: $@: Firewall state not changed" >&2
case $COMMAND in case $COMMAND in
start) start)
logger -p kern.err "ERROR:$PRODUCT start failed" logger -p kern.err "ERROR:$PRODUCT start failed:Firewall state not changed"
;; ;;
restart) restart)
logger -p kern.err "ERROR:$PRODUCT restart failed" logger -p kern.err "ERROR:$PRODUCT restart failed:Firewall state not changed"
;; ;;
restore) restore)
logger -p kern.err "ERROR:$PRODUCT restore failed" logger -p kern.err "ERROR:$PRODUCT restore failed:Firewall state not changed"
;; ;;
esac esac
@ -86,13 +86,13 @@ startup_error() # $* = Error Message
case $COMMAND in case $COMMAND in
start) start)
echo "${timestamp} ERROR:$PRODUCT start failed" >> $STARTUP_LOG echo "${timestamp} ERROR:$PRODUCT start failed:Firewall state not changed" >> $STARTUP_LOG
;; ;;
restart) restart)
echo "${timestamp} ERROR:$PRODUCT restart failed" >> $STARTUP_LOG echo "${timestamp} ERROR:$PRODUCT restart failed:Firewall state not changed" >> $STARTUP_LOG
;; ;;
restore) restore)
echo "${timestamp} ERROR:$PRODUCT restore failed" >> $STARTUP_LOG echo "${timestamp} ERROR:$PRODUCT restore failed:Firewall state not changed" >> $STARTUP_LOG
;; ;;
esac esac
fi fi

14
Shorewall/Perl/prog.functions6
View File

@ -44,16 +44,16 @@ fatal_error()
# #
startup_error() # $* = Error Message startup_error() # $* = Error Message
{ {
echo " ERROR: $@" >&2 echo " ERROR: $@: Firewall state not changed" >&2
case $COMMAND in case $COMMAND in
start) start)
logger -p kern.err "ERROR:$PRODUCT start failed" logger -p kern.err "ERROR:$PRODUCT start failed:Firewall state not changed"
;; ;;
restart) restart)
logger -p kern.err "ERROR:$PRODUCT restart failed" logger -p kern.err "ERROR:$PRODUCT restart failed:Firewall state not changed"
;; ;;
restore) restore)
logger -p kern.err "ERROR:$PRODUCT restore failed" logger -p kern.err "ERROR:$PRODUCT restore failed:Firewall state not changed"
;; ;;
esac esac
@ -62,13 +62,13 @@ startup_error() # $* = Error Message
case $COMMAND in case $COMMAND in
start) start)
echo "${timestamp} ERROR:$PRODUCT start failed" >> $STARTUP_LOG echo "${timestamp} ERROR:$PRODUCT start failed:Firewall state not changed" >> $STARTUP_LOG
;; ;;
restart) restart)
echo "${timestamp} ERROR:$PRODUCT restart failed" >> $STARTUP_LOG echo "${timestamp} ERROR:$PRODUCT restart failed:Firewall state not changed" >> $STARTUP_LOG
;; ;;
restore) restore)
echo "${timestamp} ERROR:$PRODUCT restore failed" >> $STARTUP_LOG echo "${timestamp} ERROR:$PRODUCT restore failed:Firewall state not changed" >> $STARTUP_LOG
;; ;;
esac esac
fi fi

4
Shorewall/changelog.txt
View File

@ -2,6 +2,10 @@ Changes in Shorewall 4.3.8
1) Apply Tuomo Soini's patch for USE_DEFAULT_RT. 1) Apply Tuomo Soini's patch for USE_DEFAULT_RT.
2) Use 'startup_error' for those errors caught early.
3) Fix swping
Changes in Shorewall 4.3.7 Changes in Shorewall 4.3.7
1) Fix forward treatment of interface options. 1) Fix forward treatment of interface options.

8
Shorewall/releasenotes.txt
View File

@ -43,6 +43,9 @@ released late in 2009.
kernel's (see FAQ 82) that caused 'shorewall start' to fail when kernel's (see FAQ 82) that caused 'shorewall start' to fail when
USE_DEFAULT_RT=Yes . USE_DEFAULT_RT=Yes .
2) The swping program was not purging the interface status files when
it first started.
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
K N O W N P R O B L E M S R E M A I N I N G K N O W N P R O B L E M S R E M A I N I N G
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
@ -53,7 +56,10 @@ None.
N E W F E A T U R E S I N 4 . 3 . 8 N E W F E A T U R E S I N 4 . 3 . 8
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
None. 1) The generated program now attempts to detect all dynamic
information when it first starts. If any of those steps fail, an
error message is generated and the state of the firewall is not
changed.
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
N E W F E A T U R E S IN 4 . 3 N E W F E A T U R E S IN 4 . 3