Fix callss to new messaging functions

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4006 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
paulgear 2006-06-07 05:29:52 +00:00
parent 2437ec6e4f
commit 76e15b17a9

View File

@ -1,13 +1,11 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# $Id: shoregen,v 1.27 2004/04/24 12:31:18 paulgear Exp $ # shoregen: Generate shorewall configuration for a host from central
# # configuration files.
# Generate shorewall configuration for a host from central configuration
# files.
# #
# #
# (c) Copyright 2004 Paul D. Gear <paul@gear.dyndns.org> # (c) Copyright 2004-2006 Paul D. Gear <paul@gear.dyndns.org>
# #
# This program is free software; you can redistribute it and/or modify it # This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the # under the terms of the GNU General Public License as published by the
@ -198,12 +196,12 @@ close $infile;
# The firewall name must be defined # The firewall name must be defined
unless (defined $fw) { unless (defined $fw) {
fatal 1, "Can't find firewall name (FW variable) for $host in $dir/shorewall.conf"; fatal "Can't find firewall name (FW variable) for $host in $dir/shorewall.conf";
} }
# Router must be defined # Router must be defined
unless (defined $router) { unless (defined $router) {
fatal 1, "Can't find IP_FORWARDING setting for $host in $dir/shorewall.conf"; fatal "Can't find IP_FORWARDING setting for $host in $dir/shorewall.conf";
} }
if ($router =~ m/On|Yes/i) { if ($router =~ m/On|Yes/i) {
$router = 1; $router = 1;
@ -215,7 +213,7 @@ print "fw=$fw, router=$router\n" if $DEBUG > 3;
# Find all valid zones # Find all valid zones
unless (-r "zones") { unless (-r "zones") {
fatal 2, "You must provide a global zone file"; fatal "You must provide a global zone file";
} }
@ -295,7 +293,7 @@ $hostzones{$fw} = 1;
$conf = "policy"; $conf = "policy";
if (! -r $conf) { if (! -r $conf) {
fatal 3, "You must provide a global \"$conf\" file"; fatal "You must provide a global \"$conf\" file";
} }
open( $outfile, ">$dir/$conf" ) or open( $outfile, ">$dir/$conf" ) or
@ -338,7 +336,7 @@ close $outfile or warn "Can't close $dir/$conf for writing: $!";
$conf = "rules"; $conf = "rules";
if (! -r $conf) { if (! -r $conf) {
fatal 4, "You must provide a global \"$conf\" file"; fatal "You must provide a global \"$conf\" file";
} }
open( $outfile, ">$dir/$conf" ) or open( $outfile, ">$dir/$conf" ) or