diff --git a/Shorewall/compiler b/Shorewall/compiler index 295bef0c6..047f439ef 100755 --- a/Shorewall/compiler +++ b/Shorewall/compiler @@ -1142,12 +1142,14 @@ compile_refresh_firewall() # process_action_file() # $1 = File Name { - local user_exit=$(find_file $1) + if ! list_search $1 $BUILTIN_ACTIONS; then + local user_exit=$(find_file $1) - if [ -f $user_exit ]; then - progress_message "Processing $user_exit ..." - - . $user_exit + if [ -f $user_exit ]; then + progress_message "Processing $user_exit ..." + + . $user_exit + fi fi } @@ -1362,7 +1364,7 @@ merge_levels() # $1=level at which superior action is called, $2=level at which # define_builtin_actions() { ACTIONS="dropBcast allowBcast dropNotSyn rejNotSyn dropInvalid allowInvalid allowinUPnP allowoutUPnP forwardUPnP Limit" - + BUILTIN_ACTIONS="$ACTIONS" USEDACTIONS= } diff --git a/Shorewall/lib.config b/Shorewall/lib.config index 8d5ece775..6b1d7d7d1 100644 --- a/Shorewall/lib.config +++ b/Shorewall/lib.config @@ -1874,6 +1874,8 @@ do_initialize() { run_user_exit params + [ "$PROGRAM" = compiler ] && run_user_exit compile + config=$(find_file shorewall.conf) if [ -f $config ]; then diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index bfc64bf2e..c059b23ad 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -74,9 +74,6 @@ http://www.shorewall.net/pub/shorewall/3.2/shorewall-3.2.8/releasenotes.txt /etc/shorewall/params and those required at run-time may be set in /etc/shorewall/init. - As part of this change, the 'compile' extension script introduced - in Shorewall 3.2.9 has been removed. - 2) Shorewall supports the notion of "default actions". A default action defines a set of rules that are applied before a policy is enforced. Default actions accomplish two goals: