holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Fix some bugs in Tuomas's patch

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1771 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2004-11-26 23:24:50 +00:00
parent 224197fdf3
commit 86b2044f29
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall2/changelog.txt
View File

@ -148,3 +148,5 @@ Changes since 2.0.3
71) Add the 'icmp_echo_ignore_all' file to the /proc display. 71) Add the 'icmp_echo_ignore_all' file to the /proc display.
72) Apply Tuomas Jormola's IPTABLES patch. 72) Apply Tuomas Jormola's IPTABLES patch.
73) Fixed some bugs in Tuomas's patch.

8
Shorewall2/releasenotes.txt
View File

@ -1,4 +1,4 @@
Shorewall 2.2.0-Beta5 Shorewall 2.2.0-Beta6
---------------------------------------------------------------------- ----------------------------------------------------------------------
Problems Corrected since 2.0.3 Problems Corrected since 2.0.3
@ -132,6 +132,12 @@ Problems corrected since 2.2.0 Beta 3.
Problems corrected since 2.2.0 Beta 4: Problems corrected since 2.2.0 Beta 4:
1) A typo in shorewall.conf (NETNOTSYN) has been corrected. 1) A typo in shorewall.conf (NETNOTSYN) has been corrected.
Problems corrected since 2.2.0 Beta 5:
1) Many problems associated with an empty IPTABLES variable have been
corrected.
----------------------------------------------------------------------- -----------------------------------------------------------------------
Issues when migrating from Shorewall 2.0 to Shorewall 2.1: Issues when migrating from Shorewall 2.0 to Shorewall 2.1:

16
Shorewall2/shorewall
View File

@ -418,7 +418,6 @@ monitor_firewall() # $1 = timeout -- if negative, prompt each time that
# an 'interesting' packet count changes # an 'interesting' packet count changes
{ {
get_config
host=$(echo $HOSTNAME | sed 's/\..*$//') host=$(echo $HOSTNAME | sed 's/\..*$//')
oldrejects=$($IPTABLES -L -v -n | grep 'LOG') oldrejects=$($IPTABLES -L -v -n | grep 'LOG')
@ -528,7 +527,6 @@ logwatch() # $1 = timeout -- if negative, prompt each time that
# an 'interesting' packet count changes # an 'interesting' packet count changes
{ {
get_config
host=$(echo $HOSTNAME | sed 's/\..*$//') host=$(echo $HOSTNAME | sed 's/\..*$//')
oldrejects=$($IPTABLES -L -v -n | grep 'LOG') oldrejects=$($IPTABLES -L -v -n | grep 'LOG')
@ -756,6 +754,8 @@ ensure_config_path
export CONFIG_PATH export CONFIG_PATH
get_config
[ -z "${STATEDIR}" ] && STATEDIR=/var/state/shorewall [ -z "${STATEDIR}" ] && STATEDIR=/var/state/shorewall
if [ ! -f $FIREWALL ]; then if [ ! -f $FIREWALL ]; then
@ -822,8 +822,6 @@ case "$1" in
;; ;;
esac esac
get_config
if [ -n "$FAST" ]; then if [ -n "$FAST" ]; then
RESTOREPATH=/var/lib/shorewall/$RESTOREFILE RESTOREPATH=/var/lib/shorewall/$RESTOREFILE
@ -842,7 +840,6 @@ case "$1" in
;; ;;
stop|reset|clear|refresh) stop|reset|clear|refresh)
[ $# -ne 1 ] && usage 1 [ $# -ne 1 ] && usage 1
get_config
exec $SHOREWALL_SHELL $FIREWALL $debugging $nolock $1 exec $SHOREWALL_SHELL $FIREWALL $debugging $nolock $1
;; ;;
check|restart) check|restart)
@ -867,12 +864,10 @@ case "$1" in
usage 1 usage 1
;; ;;
esac esac
get_config
exec $SHOREWALL_SHELL $FIREWALL $debugging $nolock $1 exec $SHOREWALL_SHELL $FIREWALL $debugging $nolock $1
;; ;;
add|delete) add|delete)
[ $# -ne 3 ] && usage 1 [ $# -ne 3 ] && usage 1
get_config
exec $SHOREWALL_SHELL $FIREWALL $debugging $nolock $1 $2 $3 exec $SHOREWALL_SHELL $FIREWALL $debugging $nolock $1 $2 $3
;; ;;
show|list) show|list)
@ -900,7 +895,6 @@ case "$1" in
;; ;;
log) log)
[ $# -gt 2 ] && usage 1 [ $# -gt 2 ] && usage 1
get_config
echo "Shorewall-$version Log at $HOSTNAME - $(date)" echo "Shorewall-$version Log at $HOSTNAME - $(date)"
echo echo
show_reset show_reset
@ -948,7 +942,6 @@ case "$1" in
status) status)
[ -n "$debugging" ] && set -x [ -n "$debugging" ] && set -x
[ $# -eq 1 ] || usage 1 [ $# -eq 1 ] || usage 1
get_config
clear clear
echo "Shorewall-$version Status at $HOSTNAME - $(date)" echo "Shorewall-$version Status at $HOSTNAME - $(date)"
echo echo
@ -1007,7 +1000,6 @@ case "$1" in
hits) hits)
[ -n "$debugging" ] && set -x [ -n "$debugging" ] && set -x
[ $# -eq 1 ] || usage 1 [ $# -eq 1 ] || usage 1
get_config
clear clear
echo "Shorewall-$version Hits at $HOSTNAME - $(date)" echo "Shorewall-$version Hits at $HOSTNAME - $(date)"
echo echo
@ -1118,8 +1110,6 @@ case "$1" in
save) save)
[ -n "$debugging" ] && set -x [ -n "$debugging" ] && set -x
get_config
case $# in case $# in
1) 1)
;; ;;
@ -1175,7 +1165,6 @@ case "$1" in
mutex_off mutex_off
;; ;;
forget) forget)
get_config
case $# in case $# in
1) 1)
;; ;;
@ -1234,7 +1223,6 @@ case "$1" in
esac esac
;; ;;
restore) restore)
get_config
case $# in case $# in
1) 1)
;; ;;