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

Make 'update -A' convert the tcrules file

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2014-05-16 14:46:15 -07:00
parent d5e83a5295
commit 6d3b1d80d4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -730,7 +730,7 @@ sub compiler {
#
# Do all of the zone-independent stuff (mostly /proc)
#
add_common_rules( $convert );
add_common_rules( $convert, $tcrules );
#
# More /proc
#

8
Shorewall/Perl/Shorewall/Misc.pm
View File

@ -775,8 +775,8 @@ sub process_stoppedrules() {
sub setup_mss();
sub add_common_rules ( $ ) {
my $upgrade = shift;
sub add_common_rules ( $$ ) {
my ( $upgrade_blacklist, $upgrade_tcrules ) = @_;
my $interface;
my $chainref;
my $target;
@ -929,8 +929,8 @@ sub add_common_rules ( $ ) {
run_user_exit1 'initdone';
if ( $upgrade ) {
exit 0 unless convert_blacklist;
if ( $upgrade_blacklist ) {
exit 0 unless convert_blacklist || $upgrade_tcrules;
} else {
setup_blacklist;
}