extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-23 22:58:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply missing config file fix to trunk

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7739 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-11-24 02:28:18 +00:00
parent 9d5e2f7941
commit 6e6da40039
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,7 @@ sub setup_accounting() {
my $fn = open_file 'accounting';
first_entry "$doing $fn...";
first_entry "$doing $fn..." if $fn;
while ( read_a_line ) {

6
Shorewall-perl/Shorewall/Nat.pm
View File

@ -307,7 +307,7 @@ sub setup_masq()
{
my $fn = open_file 'masq';
first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty masq file' , 's'; } );
first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty masq file' , 's'; } ) if $fn;
while ( read_a_line ) {
@ -412,7 +412,7 @@ sub setup_nat() {
my $fn = open_file 'nat';
first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty nat file' , 's'; } );
first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty nat file' , 's'; } ) if $fn;
while ( read_a_line ) {
@ -436,7 +436,7 @@ sub setup_netmap() {
my $fn = open_file 'netmap';
first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty netmap file' , 's'; } );
first_entry( sub { progress_message2 "$doing $fn..."; require_capability 'NAT_ENABLED' , 'a non-empty netmap file' , 's'; } ) if $fn;
while ( read_a_line ) {

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

@ -221,7 +221,7 @@ sub setup_rfc1918_filteration( $ ) {
my $fn = open_file 'rfc1918';
first_entry "$doing $fn...";
first_entry "$doing $fn..." if $fn;
while ( read_a_line ) {
@ -341,7 +341,7 @@ sub process_criticalhosts() {
my $fn = open_file 'routestopped';
first_entry "$doing $fn for critical hosts...";
first_entry "$doing $fn for critical hosts..." if $fn;
while ( read_a_line ) {
@ -382,7 +382,7 @@ sub process_routestopped() {
my $fn = open_file 'routestopped';
first_entry "$doing $fn...";
first_entry "$doing $fn..." if $fn;
while ( read_a_line ) {
@ -702,7 +702,7 @@ sub setup_mac_lists( $ ) {
my $fn = open_file 'maclist';
first_entry "$doing $fn...";
first_entry "$doing $fn..." if $fn;
while ( read_a_line ) {
@ -899,6 +899,10 @@ sub process_rule1 ( $$$$$$$$$$$ ) {
my $actionchainref;
my $optimize = $wildcard ? ( $basictarget =~ /!$/ ? 0 : $config{OPTIMIZE} ) : 0;
unless ( defined $param ) {
( $basictarget, $param ) = ( $1, $2 ) if $action =~ /^(\w+)[(](.*)[)]$/;
}
$param = '' unless defined $param;
#
@ -1345,7 +1349,7 @@ sub process_rules() {
my $fn = open_file 'rules';
first_entry "$doing $fn...";
first_entry "$doing $fn..." if $fn;
while ( read_a_line ) {

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

@ -270,7 +270,7 @@ sub setup_tunnels() {
#
my $fn = open_file 'tunnels';
first_entry "$doing $fn...";
first_entry "$doing $fn..." if $fn;
while ( read_a_line ) {