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

Issue a warning message when both 'route_rules' and 'rtrules' exist.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-01-12 07:10:16 -08:00
parent 057ea718cd
commit ec8491caf8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Shorewall/Perl/Shorewall/Providers.pm
View File

@ -1097,7 +1097,15 @@ sub process_providers( $ ) {
}
if ( $providers ) {
my $fn = open_file( 'route_rules' ) || open_file( 'rtrules' );
my $fn = open_file( 'route_rules' );
if ( $fn ){
if ( -f ( my $fn1 = find_file 'rtrules' ) ) {
warning_message "Both $fn and $fn1 exists: $fn1 will be ignored";
}
} else {
$fn = open_file( 'rtrules' );
}
if ( $fn ) {
first_entry "$doing $fn...";