From 76e15b17a9725e40b47976f5861f4ff206971196 Mon Sep 17 00:00:00 2001
From: paulgear <paulgear@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 7 Jun 2006 05:29:52 +0000
Subject: [PATCH] Fix callss to new messaging functions

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4006 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 contrib/shoregen/shoregen | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/contrib/shoregen/shoregen b/contrib/shoregen/shoregen
index 9cf28df0a..5018c0b30 100644
--- a/contrib/shoregen/shoregen
+++ b/contrib/shoregen/shoregen
@@ -1,13 +1,11 @@
 #!/usr/bin/perl -w
 #
-# $Id: shoregen,v 1.27 2004/04/24 12:31:18 paulgear Exp $
-# 
-# Generate shorewall configuration for a host from central configuration
-# files.
+# shoregen: 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
 # 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
 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
 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) {
     $router = 1;
@@ -215,7 +213,7 @@ print "fw=$fw, router=$router\n" if $DEBUG > 3;
 
 # Find all valid 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";
 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
@@ -338,7 +336,7 @@ close $outfile or warn "Can't close $dir/$conf for writing: $!";
 
 $conf = "rules";
 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