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

Fix a couple of issues with product name

Browse Source 
- Use $Product rather that addressfamily-dependent logic
- Revert unneeded change from 5.2.3.7

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2020-03-28 14:24:32 -07:00
parent be924ff765
commit 78da975989
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -978,11 +978,7 @@ sub compiler {
# #
report_used_capabilities; report_used_capabilities;
if ( $family == F_IPV4 ) { progress_message3 "$Product configuration verified";
progress_message3 "Shorewall configuration verified";
} else {
progress_message3 "Shorewall6 configuration verified";
}
} }
close_log if $log; close_log if $log;

4
Shorewall/Perl/Shorewall/Config.pm
View File

@ -2036,7 +2036,7 @@ sub finalize_script( $ ) {
rename $tempfile, $file or fatal_error "Cannot Rename $tempfile to $file: $!"; rename $tempfile, $file or fatal_error "Cannot Rename $tempfile to $file: $!";
chmod 0700, $file or fatal_error "Cannot secure $file for execute access"; chmod 0700, $file or fatal_error "Cannot secure $file for execute access";
progress_message3 "Shorewall configuration compiled to $file" unless $export; progress_message3 "$Product configuration compiled to $file" unless $export;
} }
} }
@ -2058,7 +2058,7 @@ sub finalize_aux_config() {
close $script; close $script;
$script = 0; $script = 0;
rename $tempfile, "$file.conf" or fatal_error "Cannot Rename $tempfile to $file.conf: $!"; rename $tempfile, "$file.conf" or fatal_error "Cannot Rename $tempfile to $file.conf: $!";
progress_message3 "Shorewall configuration compiled to $file"; progress_message3 "$Product configuration compiled to $file";
} }
# #

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

@ -2455,7 +2455,7 @@ sub setup_tc( $ ) {
} }
} }
} elsif ( -f ( my $fn = find_file( 'tcrules' ) ) ) { } elsif ( -f ( my $fn = find_file( 'tcrules' ) ) ) {
warning_message "The tcrules file is no longer supported -- use '$shorewallrc{product} update' to convert $fn to an equivalent 'mangle' file"; warning_message "The tcrules file is no longer supported -- use '$product update' to convert $fn to an equivalent 'mangle' file";
} }
if ( my $fn = open_file( 'mangle', 1, 1 ) ) { if ( my $fn = open_file( 'mangle', 1, 1 ) ) {