diff --git a/Shorewall-perl/Shorewall/Chains.pm b/Shorewall-perl/Shorewall/Chains.pm index 136f29c7d..b85125654 100644 --- a/Shorewall-perl/Shorewall/Chains.pm +++ b/Shorewall-perl/Shorewall/Chains.pm @@ -1668,6 +1668,9 @@ sub create_netfilter_load() { ); push_indent; + + save_progress_message "Preparing iptables-restore input..."; + # # Establish the values of shell variables used in the following shell commands and/or 'here documents' input. # @@ -1736,6 +1739,8 @@ sub create_netfilter_load() { # Now generate the actual iptabes-restore command # emitj( ' exec 3>&-', + '', + 'progress_message2 "Running iptables-restore..."', '', 'iptables-restore < ${VARDIR}/.iptables-restore-input' ); diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm index 04a2da8f1..a3d01cf0b 100644 --- a/Shorewall-perl/Shorewall/Rules.pm +++ b/Shorewall-perl/Shorewall/Rules.pm @@ -816,7 +816,7 @@ sub process_macro ( $$$$$$$$$$$$ ) { $mtarget = find_logactionchain $mtarget; } else { - fatal_error "Invalid Action ($mtarget)" unless $actiontype & STANDARD; + fatal_error "Invalid Action ($mtarget)" unless $actiontype & ( STANDARD | NATRULE ); } if ( $msource ) {