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

Add more progress messages; fix NAT rules in macros

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6221 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-03 18:56:56 +00:00
parent c28cb4aad0
commit 3474415660
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shorewall-perl/Shorewall/Chains.pm
View File

@ -1668,6 +1668,9 @@ sub create_netfilter_load() {
); );
push_indent; 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. # 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 # Now generate the actual iptabes-restore command
# #
emitj( ' exec 3>&-', emitj( ' exec 3>&-',
'',
'progress_message2 "Running iptables-restore..."',
'', '',
'iptables-restore < ${VARDIR}/.iptables-restore-input' 'iptables-restore < ${VARDIR}/.iptables-restore-input'
); );

2
Shorewall-perl/Shorewall/Rules.pm
View File

@ -816,7 +816,7 @@ sub process_macro ( $$$$$$$$$$$$ ) {
$mtarget = find_logactionchain $mtarget; $mtarget = find_logactionchain $mtarget;
} else { } else {
fatal_error "Invalid Action ($mtarget)" unless $actiontype & STANDARD; fatal_error "Invalid Action ($mtarget)" unless $actiontype & ( STANDARD | NATRULE );
} }
if ( $msource ) { if ( $msource ) {