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

fix mutex/nolock issues

Browse Source
This commit is contained in:
Tom Eastep 2010-07-23 13:24:07 -07:00
parent 0faceea651
commit d33c96e4c6
7 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall-lite/shorewall-lite
View File

@ -631,11 +631,15 @@ case "$COMMAND" in
stop|clear) stop|clear)
[ $# -ne 1 ] && usage 1 [ $# -ne 1 ] && usage 1
verify_firewall_script verify_firewall_script
run_it $g_firewall $debugging $nolock $COMMAND [ -n "$nolock" ] || mutex_on
run_it $g_firewall $debugging $COMMAND
[ -n "$nolock" ] || mutex_off
;; ;;
reset) reset)
verify_firewall_script verify_firewall_script
run_it $SHOREWALL_SHELL $g_firewall $debugging $nolock $@ [ -n "$nolock" ] || mutex_on
run_it $SHOREWALL_SHELL $g_firewall $debugging $@
[ -n "$nolock" ] || mutex_off
;; ;;
restart) restart)
shift shift

2
Shorewall/changelog.txt
View File

@ -8,6 +8,8 @@ Changes in Shorewall 4.4.11.1
4) Don't slow down 'stop' with 'wait'. 4) Don't slow down 'stop' with 'wait'.
5) Resolve mutex/nolock issues.
Changes in Shorewall 4.4.11 Changes in Shorewall 4.4.11
1) Apply patch from Gabriel. 1) Apply patch from Gabriel.

6
Shorewall/known_problems.txt
View File

@ -32,4 +32,10 @@
Suggested workaround is to set startup=1 in your Suggested workaround is to set startup=1 in your
/etc/default/shorewall* files. /etc/default/shorewall* files.
5) /sbin/shorewall and /sbin/shorewall6 sometimes fail to honor the
'nolock' option. In other cases, this option is incorrectly passed
on to the compiled script, causing the script to issue a usage
synopsis and to terminate.

5
Shorewall/releasenotes.txt
View File

@ -233,6 +233,11 @@ I I I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E
3) Previously, using a destination port-range with :random produced a 3) Previously, using a destination port-range with :random produced a
fatal compilation error in REDIRECT rules. fatal compilation error in REDIRECT rules.
4) /sbin/shorewall and /sbin/shorewall6 sometimes failed to honor the
'nolock' option. In other cases, this option was incorrectly passed
on to the compiled script, causing the script to issue a usage
synopsis and to terminate.
4.4.11 4.4.11
1) The IPv6 allowBcast action generated an invalid rule. 1) The IPv6 allowBcast action generated an invalid rule.

12
Shorewall/shorewall
View File

@ -1631,17 +1631,17 @@ case "$COMMAND" in
get_config get_config
[ $# -ne 1 ] && usage 1 [ $# -ne 1 ] && usage 1
[ -x $g_firewall ] || fatal_error "Shorewall has never been started" [ -x $g_firewall ] || fatal_error "Shorewall has never been started"
mutex_on [ -n "$nolock" ] || mutex_on
run_it $g_firewall $g_debugging $nolock $COMMAND run_it $g_firewall $g_debugging $COMMAND
mutex_off [ -n "$nolock" ] || mutex_off
;; ;;
reset) reset)
get_config get_config
shift shift
mutex_on [ -n "$nolock" ] || mutex_on
[ -x $g_firewall ] || fatal_error "Shorewall has never been started" [ -x $g_firewall ] || fatal_error "Shorewall has never been started"
run_it $g_firewall $g_debugging $nolock reset $@ run_it $g_firewall $g_debugging reset $@
mutex_off [ -n "$nolock" ] || mutex_off
;; ;;
compile) compile)
get_config Yes get_config Yes

4
Shorewall6-lite/shorewall6-lite
View File

@ -615,7 +615,9 @@ case "$COMMAND" in
stop|reset|clear) stop|reset|clear)
[ $# -ne 1 ] && usage 1 [ $# -ne 1 ] && usage 1
verify_firewall_script verify_firewall_script
run_it $g_firewall $debugging $nolock $COMMAND [ -n "$nolock" ] || mutex_on
run_it $g_firewall $debugging $COMMAND
[ -n "$nolock" ] || mutex_on
;; ;;
restart) restart)
shift shift

12
Shorewall6/shorewall6
View File

@ -1544,17 +1544,17 @@ case "$COMMAND" in
[ $# -ne 1 ] && usage 1 [ $# -ne 1 ] && usage 1
get_config get_config
[ -x $g_firewall ] || fatal_error "Shorewall6 has never been started" [ -x $g_firewall ] || fatal_error "Shorewall6 has never been started"
mutex_on [ -n "$nolock" ] || mutex_on
run_it $g_firewall $g_debugging $nolock $COMMAND run_it $g_firewall $g_debugging $COMMAND
mutex_off [ -n "$nolock" ] || mutex_off
;; ;;
reset) reset)
get_config get_config
shift shift
mutex_on [ -n "$nolock" ] || mutex_on
[ -x $g_firewall ] || fatal_error "Shorewall6 has never been started" [ -x $g_firewall ] || fatal_error "Shorewall6 has never been started"
run_it $g_firewall $g_debugging $nolock reset $@ run_it $g_firewall $g_debugging reset $@
mutex_off [ -n "$nolock" ] || mutex_off
;; ;;
compile) compile)
get_config Yes get_config Yes