21 files changed, 238 insertions, 219 deletions

diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am
index 58db0604..78a950c2 100644
--- a/plugins-scripts/Makefile.am
+++ b/plugins-scripts/Makefile.am
@@ -19,10 +19,15 @@ libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \
         utils.sh utils.pm
 
 EXTRA_DIST=check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \
-        check_log.sh check_ntp.pl check_oracle.sh check_rpc.pl check_sensors.sh \
+        check_log.sh check_oracle.sh check_rpc.pl check_sensors.sh \
         check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_file_age.pl \
         utils.sh.in utils.pm.in t
 
+EDIT = sed \
+  -e 's|[@]NP_VERSION[@]|$(NP_VERSION)|g' \
+  -e 's|[@]TRUSTED_PATH[@]|$(with_trusted_path)|g' \
+  -e 's|[@]PERL[@]|$(PERL)|g'
+
 TESTS_ENVIRONMENT=perl -I $(top_builddir) -I $(top_srcdir)
 
 TESTS = @SCRIPT_TEST@
@@ -38,11 +43,11 @@ test-debug:
 CLEANFILES=$(libexec_SCRIPTS)
 
 .pl :
-        NP_VERSION=$(NP_VERSION) $(AWK) -f ./subst $< > $@
+        $(EDIT) $< > $@
         chmod +x $@
 
 .sh :
-        NP_VERSION=$(NP_VERSION) $(AWK) -f ./subst $< > $@
+        $(EDIT) $< > $@
         chmod +x $@
 
 clean-local:
diff --git a/plugins-scripts/check_breeze.pl b/plugins-scripts/check_breeze.pl
index a4e8542c..12a60ee6 100755
--- a/plugins-scripts/check_breeze.pl
+++ b/plugins-scripts/check_breeze.pl
@@ -1,10 +1,11 @@
-#!/usr/bin/perl -wT
+#!@PERL@ -w
 
 
 use strict;
 use Getopt::Long;
 use vars qw($opt_V $opt_h $opt_w $opt_c $opt_H $opt_C $PROGNAME);
-use lib utils.pm ;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw(%ERRORS &print_revision &support &usage);
 
 $PROGNAME = "check_breeze";
@@ -12,7 +13,7 @@ $PROGNAME = "check_breeze";
 sub print_help ();
 sub print_usage ();
 
-$ENV{'PATH'}='';
+$ENV{'PATH'}='@TRUSTED_PATH@';
 $ENV{'BASH_ENV'}=''; 
 $ENV{'ENV'}='';
 
diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
index 0c89db57..99948a41 100755
--- a/plugins-scripts/check_disk_smb.pl
+++ b/plugins-scripts/check_disk_smb.pl
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w
+#!@PERL@ -w
 #
 #
 # check_disk.pl <host> <share> <user> <pass> [warn] [critical] [port]
 #
-# Nagios host script to get the disk usage from a SMB share
+# Monitoring host script to get the disk usage from a SMB share
 #
 # Changes and Modifications
 # =========================
@@ -24,7 +24,8 @@ use strict;
 use Getopt::Long;
 use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $opt_a $verbose);
 use vars qw($PROGNAME);
-use lib utils.pm ;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
 
 sub print_help ();
@@ -32,7 +33,7 @@ sub print_usage ();
 
 $PROGNAME = "check_disk_smb";
 
-$ENV{'PATH'}='';
+$ENV{'PATH'}='@TRUSTED_PATH@';
 $ENV{'BASH_ENV'}=''; 
 $ENV{'ENV'}='';
 
@@ -171,7 +172,7 @@ my $res = undef;
 my $perfdata = "";
 my @lines = undef;
 
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub { 
         print "No Answer from Client\n";
         exit $ERRORS{"UNKNOWN"};
@@ -293,7 +294,7 @@ sub print_help () {
         print_revision($PROGNAME,'@NP_VERSION@');
         print "Copyright (c) 2000 Michael Anthon/Karl DeBisschop
 
-Perl Check SMB Disk plugin for Nagios
+Perl Check SMB Disk plugin for monitoring
 
 ";
         print_usage();
diff --git a/plugins-scripts/check_file_age.pl b/plugins-scripts/check_file_age.pl
index dcd5efab..ae25201e 100755
--- a/plugins-scripts/check_file_age.pl
+++ b/plugins-scripts/check_file_age.pl
@@ -1,4 +1,4 @@
-#!/bin/perl -w
+#!@PERL@ -w
 
 # check_file_age.pl Copyright (C) 2003 Steven Grimm <koreth-nagios@midwinter.com>
 #
@@ -17,26 +17,30 @@
 # GNU General Public License for more details.
 #
 # you should have received a copy of the GNU General Public License
-# along with this program (or with Nagios);  if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA
+# along with this program if not, write to the Free Software Foundation,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 use strict;
 use English;
 use Getopt::Long;
 use File::stat;
 use vars qw($PROGNAME);
-use lib ".";
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw (%ERRORS &print_revision &support);
 
 sub print_help ();
 sub print_usage ();
 
-my ($opt_c, $opt_f, $opt_w, $opt_C, $opt_W, $opt_h, $opt_V);
+my ($opt_c, $opt_f, $opt_w, $opt_C, $opt_W, $opt_h, $opt_V, $opt_i);
 my ($result, $message, $age, $size, $st);
 
 $PROGNAME="check_file_age";
 
+$ENV{'PATH'}='@TRUSTED_PATH@';
+$ENV{'BASH_ENV'}=''; 
+$ENV{'ENV'}='';
+
 $opt_w = 240;
 $opt_c = 600;
 $opt_W = 0;
@@ -47,6 +51,7 @@ Getopt::Long::Configure('bundling');
 GetOptions(
         "V"   => \$opt_V, "version"     => \$opt_V,
         "h"   => \$opt_h, "help"        => \$opt_h,
+        "i"   => \$opt_i, "ignore-missing"      => \$opt_i,
         "f=s" => \$opt_f, "file"        => \$opt_f,
         "w=f" => \$opt_w, "warning-age=f" => \$opt_w,
         "W=f" => \$opt_W, "warning-size=f" => \$opt_W,
@@ -72,8 +77,15 @@ if (! $opt_f) {
 
 # Check that file exists (can be directory or link)
 unless (-e $opt_f) {
-        print "FILE_AGE CRITICAL: File not found - $opt_f\n";
-        exit $ERRORS{'CRITICAL'};
+        if ($opt_i) {
+                $result = 'OK';
+                print "FILE_AGE $result: $opt_f doesn't exist, but ignore-missing was set\n";
+                exit $ERRORS{$result};
+
+        } else {
+                print "FILE_AGE CRITICAL: File not found - $opt_f\n";
+                exit $ERRORS{'CRITICAL'};
+        }
 }
 
 $st = File::stat::stat($opt_f);
@@ -95,7 +107,7 @@ exit $ERRORS{$result};
 
 sub print_usage () {
         print "Usage:\n";
-        print "  $PROGNAME [-w <secs>] [-c <secs>] [-W <size>] [-C <size>] -f <file>\n";
+        print "  $PROGNAME [-w <secs>] [-c <secs>] [-W <size>] [-C <size>] [-i] -f <file>\n";
         print "  $PROGNAME [-h | --help]\n";
         print "  $PROGNAME [-V | --version]\n";
 }
@@ -105,6 +117,7 @@ sub print_help () {
         print "Copyright (c) 2003 Steven Grimm\n\n";
         print_usage();
         print "\n";
+        print "  -i | --ignore-missing :  return OK if the file does not exist\n";
         print "  <secs>  File must be no more than this many seconds old (default: warn 240 secs, crit 600)\n";
         print "  <size>  File must be at least this many bytes long (default: crit 0 bytes)\n";
         print "\n";
diff --git a/plugins-scripts/check_flexlm.pl b/plugins-scripts/check_flexlm.pl
index 54d933c7..49d674d4 100755
--- a/plugins-scripts/check_flexlm.pl
+++ b/plugins-scripts/check_flexlm.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@PERL@ -w
 #
 # usage: 
 #    check_flexlm.pl license_file
@@ -9,7 +9,7 @@
 # Check and interpret the output of lmstat
 # and create returncodes and output.
 #
-# Contrary to the nagios concept, this script takes
+# Contrary to most other plugins, this script takes
 # a file, not a hostname as an argument and returns
 # the status of hosts and services described in that
 # file. Use these hosts.cfg entries as an example
@@ -35,7 +35,8 @@
 use strict;
 use Getopt::Long;
 use vars qw($opt_V $opt_h $opt_F $opt_t $verbose $PROGNAME);
-use lib utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw(%ERRORS &print_revision &support &usage);
 
 $PROGNAME="check_flexlm";
@@ -43,7 +44,7 @@ $PROGNAME="check_flexlm";
 sub print_help ();
 sub print_usage ();
 
-$ENV{'PATH'}='';
+$ENV{'PATH'}='@TRUSTED_PATH@';
 $ENV{'BASH_ENV'}=''; 
 $ENV{'ENV'}='';
 
@@ -72,7 +73,7 @@ unless (defined $opt_F) {
         print_usage();
         exit $ERRORS{'UNKNOWN'};
 }
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
         print "Timeout: No Answer from Client\n";
         exit $ERRORS{'UNKNOWN'};
diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl
index 588993be..1a7fbba4 100755
--- a/plugins-scripts/check_ifoperstatus.pl
+++ b/plugins-scripts/check_ifoperstatus.pl
@@ -1,9 +1,9 @@
-#!/usr/local/bin/perl -w
+#!@PERL@ -w
 #
-# check_ifoperstatus.pl - nagios plugin 
+# check_ifoperstatus.pl - monitoring plugin
 #
 # Copyright (C) 2000 Christoph Kron,
-# Modified 5/2002 to conform to updated Nagios Plugin Guidelines
+# Modified 5/2002 to conform to updated Monitoring Plugins Guidelines
 # Added support for named interfaces per Valdimir Ivaschenko (S. Ghosh)
 # Added SNMPv3 support (10/2003)
 #
@@ -19,10 +19,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA
 #
 #
-# Report bugs to:  nagiosplug-help@lists.sourceforge.net
+# Report bugs to:  help@monitoring-plugins.org
 #
 # 11.01.2000 Version 1.0
 #
@@ -34,7 +35,8 @@
 
 use POSIX;
 use strict;
-use lib utils.pm ;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 
 use Net::SNMP;
@@ -47,6 +49,10 @@ sub usage ($);
 sub print_usage ();
 sub process_arguments ();
 
+$ENV{'PATH'}='@TRUSTED_PATH@';
+$ENV{'BASH_ENV'}=''; 
+$ENV{'ENV'}='';
+
 my $timeout;
 my $status;
 my %ifOperStatus =      ('1','up',
@@ -97,7 +103,7 @@ my %session_opts;
 $status = process_arguments();
 
 
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
         print ("ERROR: No snmp response from $hostname (alarm)\n");
         exit $ERRORS{"UNKNOWN"};
@@ -288,7 +294,7 @@ sub print_usage() {
 sub print_help() {
         print_revision($PROGNAME, '@NP_VERSION@');
         print_usage();
-        printf "check_ifoperstatus plugin for Nagios monitors operational \n";
+        printf "check_ifoperstatus plugin for monitoring operational \n";
         printf "status of a particular network interface on the target host\n";
         printf "\nUsage:\n";
         printf "   -H (--hostname)   Hostname to query - (required)\n";
diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl
index 63c71ffa..e9e62149 100755
--- a/plugins-scripts/check_ifstatus.pl
+++ b/plugins-scripts/check_ifstatus.pl
@@ -1,10 +1,10 @@
-#!/usr/local/bin/perl -w
+#!@PERL@ -w
 #
-# check_ifstatus.pl - nagios plugin 
+# check_ifstatus.pl - monitoring plugin
 # 
 #
 # Copyright (C) 2000 Christoph Kron
-# Modified 5/2002 to conform to updated Nagios Plugin Guidelines (S. Ghosh)
+# Modified 5/2002 to conform to updated Monitoring Plugins Guidelines (S. Ghosh)
 #  Added -x option (4/2003)
 #  Added -u option (4/2003)
 #  Added -M option (10/2003)
@@ -22,17 +22,18 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 #
 #
-# Report bugs to: ck@zet.net, nagiosplug-help@lists.sf.net
+# Report bugs to: ck@zet.net, help@monitoring-plugins.org
 # 
 # 11.01.2000 Version 1.0
 #
 
 use POSIX;
 use strict;
-use lib utils.pm ;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 
 use Net::SNMP;
@@ -46,6 +47,9 @@ sub usage ($);
 sub print_usage ();
 sub process_arguments ();
 
+$ENV{'PATH'}='@TRUSTED_PATH@';
+$ENV{'BASH_ENV'}=''; 
+$ENV{'ENV'}='';
 
 my $status;
 my %ifOperStatus =      ('1','up',
@@ -99,7 +103,7 @@ my %session_opts;
 
 
 
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
      print ("ERROR: No snmp response from $hostname (alarm timeout)\n");
      exit $ERRORS{"UNKNOWN"};
@@ -239,7 +243,7 @@ sub print_usage() {
 sub print_help() {
         print_revision($PROGNAME, '@NP_VERSION@');
         print_usage();
-        printf "check_ifstatus plugin for Nagios monitors operational \n";
+        printf "check_ifstatus plugin for monitoring operational \n";
         printf "status of each network interface on the target host\n";
         printf "\nUsage:\n";
         printf "   -H (--hostname)   Hostname to query - (required)\n";
diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl
index 42a9bca9..afedfb95 100755
--- a/plugins-scripts/check_ircd.pl
+++ b/plugins-scripts/check_ircd.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!@PERL@ -w
 
 # -----------------------------------------------------------------------------
 # File Name:            check_ircd.pl
@@ -16,8 +16,6 @@
 # -----------------------------------------------------------------------------
 # Copyright 1999 (c) Richard Mayhew
 #
-# Credits go to Ethan Galstad for coding Nagios
-#
 # If any changes are made to this script, please mail me a copy of the
 # changes :)
 #
@@ -51,7 +49,8 @@ use strict;
 use Getopt::Long;
 use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $verbose);
 use vars qw($PROGNAME);
-use lib utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
 
 # ----------------------------------------------------[ Function Prototypes ]--
@@ -63,9 +62,9 @@ sub bindRemote ($$);
 
 # -------------------------------------------------------------[ Enviroment ]--
 
-$ENV{PATH} = "";
-$ENV{ENV} = "";
-$ENV{BASH_ENV} = "";
+$ENV{'PATH'}='@TRUSTED_PATH@';
+$ENV{'BASH_ENV'}=''; 
+$ENV{'ENV'}='';
 
 # -----------------------------------------------------------------[ Global ]--
 
@@ -121,7 +120,7 @@ sub print_help ()
         print_revision($PROGNAME,'@NP_VERSION@');
         print "Copyright (c) 2000 Richard Mayhew/Karl DeBisschop
 
-Perl Check IRCD plugin for Nagios
+Perl Check IRCD plugin for monitoring
 
 ";
         print_usage();
@@ -205,7 +204,7 @@ MAIN:
 
         if ($opt_t && $opt_t =~ /^([0-9]+)$/) { $TIMEOUT = $1; }
 
-        # Just in case of problems, let's not hang Nagios
+        # Just in case of problems, let's not hang the monitoring system
         $SIG{'ALRM'} = sub {
                 print "Somthing is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n";
                 exit $ERRORS{"UNKNOWN"};
diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
index a1bfb486..8653a5e1 100755
--- a/plugins-scripts/check_log.sh
+++ b/plugins-scripts/check_log.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Log file pattern detector plugin for Nagios
+# Log file pattern detector plugin for monitoring
 # Written by Ethan Galstad (nagios@nagios.org)
 # Last Modified: 07-31-1999
 #
@@ -29,15 +29,15 @@
 #
 # If you use this plugin make sure to keep the following in mind:
 #
-#    1.  The "max_attempts" value for the service should be 1, as this
-#        will prevent Nagios from retrying the service check (the
+#    1.  The "max_attempts" value for the service should be 1, as this will
+#        prevent the monitoring system from retrying the service check (the
 #        next time the check is run it will not produce the same results).
 #
-#    2.  The "notify_recovery" value for the service should be 0, so that
-#        Nagios does not notify you of "recoveries" for the check.  Since
-#        pattern matches in the log file will only be reported once and not
-#        the next time, there will always be "recoveries" for the service, even
-#        though recoveries really don't apply to this type of check.
+#    2.  The "notify_recovery" value for the service should be 0, so that the
+#        monitoring system does not notify you of "recoveries" for the check.
+#        Since pattern matches in the log file will only be reported once and
+#        not the next time, there will always be "recoveries" for the service,
+#        even though recoveries really don't apply to this type of check.
 #
 #    3.  You *must* supply a different <old_file_log> for each service that
 #        you define to use this plugin script - even if the different services
@@ -57,21 +57,13 @@
 
 # Paths to commands used in this script.  These
 # may have to be modified to match your system setup.
-# TV: removed PATH restriction. Need to think more about what this means overall
-#PATH=""
-
-ECHO="/bin/echo"
-GREP="/bin/egrep"
-DIFF="/bin/diff"
-TAIL="/bin/tail"
-CAT="/bin/cat"
-RM="/bin/rm"
-CHMOD="/bin/chmod"
-TOUCH="/bin/touch"
 
 PROGNAME=`/bin/basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
 REVISION="@NP_VERSION@"
+PATH="@TRUSTED_PATH@"
+
+export PATH
 
 . $PROGPATH/utils.sh
 
@@ -86,7 +78,7 @@ print_help() {
     echo ""
     print_usage
     echo ""
-    echo "Log file pattern detector plugin for Nagios"
+    echo "Log file pattern detector plugin for monitoring"
     echo ""
     support
 }
@@ -167,10 +159,10 @@ done
 # If the source log file doesn't exist, exit
 
 if [ ! -e $logfile ]; then
-    $ECHO "Log check error: Log file $logfile does not exist!\n"
+    echo "Log check error: Log file $logfile does not exist!"
     exit $STATE_UNKNOWN
 elif [ ! -r $logfile ] ; then
-    $ECHO "Log check error: Log file $logfile is not readable!\n"
+    echo "Log check error: Log file $logfile is not readable!"
     exit $STATE_UNKNOWN
 fi
 
@@ -179,8 +171,8 @@ fi
 # the old diff file and exit
 
 if [ ! -e $oldlog ]; then
-    $CAT $logfile > $oldlog
-    $ECHO "Log check data initialized...\n"
+    cat $logfile > $oldlog
+    echo "Log check data initialized..."
     exit $STATE_OK
 fi
 
@@ -193,26 +185,26 @@ if [ -x /bin/mktemp ]; then
 else
     tempdiff=`/bin/date '+%H%M%S'`
     tempdiff="/tmp/check_log.${tempdiff}"
-    $TOUCH $tempdiff
-    $CHMOD 600 $tempdiff
+    touch $tempdiff
+    chmod 600 $tempdiff
 fi
 
-$DIFF $logfile $oldlog | $GREP -v "^>" > $tempdiff
+diff $logfile $oldlog | grep -v "^>" > $tempdiff
 
 # Count the number of matching log entries we have
-count=`$GREP -c "$query" $tempdiff`
+count=`grep -c "$query" $tempdiff`
 
 # Get the last matching entry in the diff file
-lastentry=`$GREP "$query" $tempdiff | $TAIL -1`
+lastentry=`grep "$query" $tempdiff | tail -1`
 
-$RM -f $tempdiff
-$CAT $logfile > $oldlog
+rm -f $tempdiff
+cat $logfile > $oldlog
 
 if [ "$count" = "0" ]; then # no matches, exit with no error
-    $ECHO "Log check ok - 0 pattern matches found\n"
+    echo "Log check ok - 0 pattern matches found"
     exitstatus=$STATE_OK
 else # Print total matche count and the last entry we found
-    $ECHO "($count) $lastentry"
+    echo "($count) $lastentry"
     exitstatus=$STATE_CRITICAL
 fi
 
diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl
index 31eb46a4..df1385d2 100755
--- a/plugins-scripts/check_mailq.pl
+++ b/plugins-scripts/check_mailq.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!@PERL@ -w
 
 # check_mailq - check to see how many messages are in the smtp queue awating
 #   transmittal.  
@@ -20,8 +20,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
+# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+# USA
 #
 ############################################################################
 
@@ -31,7 +31,8 @@ use Getopt::Long;
 use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t
                                         $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq @lines
                                         %srcdomains %dstdomains);
-use lib  utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw(%ERRORS &print_revision &support &usage );
 
 
@@ -39,7 +40,7 @@ sub print_help ();
 sub print_usage ();
 sub process_arguments ();
 
-$ENV{'PATH'}='';
+$ENV{'PATH'}='@TRUSTED_PATH@';
 $ENV{'BASH_ENV'}=''; 
 $ENV{'ENV'}='';
 $PROGNAME = "check_mailq";
@@ -199,20 +200,20 @@ if ($mailq eq "sendmail") {
         ## now check the queue length(s)
 
         if ($msg_q == 0) {
-                $msg = "OK: mailq is empty";
+                $msg = "OK: $mailq mailq is empty";
                 $state = $ERRORS{'OK'};
         } else {
                 print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose;
         
                 # overall queue length
                 if ($msg_q < $opt_w) {
-                        $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
+                        $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
                         $state = $ERRORS{'OK'};
                 }elsif ($msg_q >= $opt_w  && $msg_q < $opt_c) {
-                        $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)";
+                        $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)";
                         $state = $ERRORS{'WARNING'};
                 }else {
-                        $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)";
+                        $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)";
                         $state = $ERRORS{'CRITICAL'};
                 }
 
@@ -344,20 +345,20 @@ elsif ( $mailq eq "postfix" ) {
 
         # check queue length(s)
         if ($msg_q == 0){
-                $msg = "OK: mailq reports queue is empty";
+                $msg = "OK: $mailq mailq reports queue is empty";
                 $state = $ERRORS{'OK'};
         } else {
                 print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose;
 
                 # overall queue length
                 if ($msg_q < $opt_w) {
-                        $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
+                        $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
                         $state = $ERRORS{'OK'};
                 }elsif  ($msg_q >= $opt_w  && $msg_q < $opt_c) {
-                        $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)";
+                        $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)";
                         $state = $ERRORS{'WARNING'};
                 }else {
-                        $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)";
+                        $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)";
                         $state = $ERRORS{'CRITICAL'};
                 }
 
@@ -373,7 +374,7 @@ elsif ( $mailq eq "postfix" ) {
                 #        }
                 #}
         }
-} # end of ($mailq eq "postfixl")
+} # end of ($mailq eq "postfix")
 elsif ( $mailq eq "qmail" ) {
 
         # open qmail-qstat 
@@ -431,13 +432,13 @@ elsif ( $mailq eq "qmail" ) {
                 
                 # overall queue length
                 if ($msg_q < $opt_w) {
-                        $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
+                        $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
                         $state = $ERRORS{'OK'};
                 }elsif ($msg_q >= $opt_w  && $msg_q < $opt_c) {
-                        $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)";
+                        $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)";
                         $state = $ERRORS{'WARNING'};
                 }else {
-                        $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)";
+                        $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)";
                         $state = $ERRORS{'CRITICAL'};
                 }
 
@@ -489,17 +490,54 @@ elsif ( $mailq eq "exim" ) {
                 exit $ERRORS{CRITICAL};
         }
         if ($msg_q < $opt_w) {
-                $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
+                $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
                 $state = $ERRORS{'OK'};
         }elsif ($msg_q >= $opt_w  && $msg_q < $opt_c) {
-                $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)";
+                $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)";
                 $state = $ERRORS{'WARNING'};
         }else {
-                $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)";
+                $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)";
                 $state = $ERRORS{'CRITICAL'};
         }
 } # end of ($mailq eq "exim")
 
+elsif ( $mailq eq "nullmailer" ) {
+        ## open mailq
+        if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
+                if (! open (MAILQ, "$utils::PATH_TO_MAILQ | " ) ) {
+                        print "ERROR: could not open $utils::PATH_TO_MAILQ \n";
+                        exit $ERRORS{'UNKNOWN'};
+                }
+        }elsif( defined $utils::PATH_TO_MAILQ){
+                unless (-x $utils::PATH_TO_MAILQ) {
+                        print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n";
+                        exit $ERRORS{'UNKNOWN'};
+                }
+        } else {
+                print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n";
+                exit $ERRORS{'UNKNOWN'};
+        }
+
+        while (<MAILQ>) {
+            #2006-06-22 16:00:00  282 bytes
+
+            if (/^[1-9][0-9]*-[01][0-9]-[0-3][0-9]\s[0-2][0-9]\:[0-2][0-9]\:[0-2][0-9]\s{2}[0-9]+\sbytes$/) {
+                $msg_q++ ;
+            }
+        }
+        close(MAILQ) ;
+        if ($msg_q < $opt_w) {
+                $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
+                $state = $ERRORS{'OK'};
+        }elsif ($msg_q >= $opt_w  && $msg_q < $opt_c) {
+                $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)";
+                $state = $ERRORS{'WARNING'};
+        }else {
+                $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)";
+                $state = $ERRORS{'CRITICAL'};
+        }
+} # end of ($mailq eq "nullmailer")
+
 # Perfdata support
 print "$msg|unsent=$msg_q;$opt_w;$opt_c;0\n";
 exit $state;
@@ -559,7 +597,7 @@ sub process_arguments(){
         }
 
         if (defined $opt_M) {
-                if ($opt_M =~ /^(sendmail|qmail|postfix|exim)$/) {
+                if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer)$/) {
                         $mailq = $opt_M ;
                 }elsif( $opt_M eq ''){
                         $mailq = 'sendmail';
@@ -568,7 +606,30 @@ sub process_arguments(){
                         exit $ERRORS{'UNKNOWN'};
                 }
         }else{
-                $mailq = 'sendmail' ;
+                if (defined $utils::PATH_TO_QMAIL_QSTAT
+                    && -x $utils::PATH_TO_QMAIL_QSTAT)
+                {
+                        $mailq = 'qmail';
+                }
+                elsif (-d '/var/lib/postfix' || -d '/var/local/lib/postfix'
+                       || -e '/usr/sbin/postfix' || -e '/usr/local/sbin/postfix')
+                {
+                        $mailq = 'postfix';
+                }
+                elsif (-d '/usr/lib/exim4' || -d '/usr/local/lib/exim4'
+                       || -e '/usr/sbin/exim' || -e '/usr/local/sbin/exim')
+                {
+                        $mailq = 'exim';
+                }
+                elsif (-d '/usr/lib/nullmailer' || -d '/usr/local/lib/nullmailer'
+                       || -e '/usr/sbin/nullmailer-send'
+                       || -e '/usr/local/sbin/nullmailer-send')
+                {
+                        $mailq = 'nullmailer';
+                }
+                else {
+                        $mailq = 'sendmail';
+                }
         }
                 
         return $ERRORS{'OK'};
@@ -591,7 +652,7 @@ sub print_help () {
         print "-W (--Warning)   = Min. number of messages for same domain in queue to generate warning\n";
         print "-C (--Critical)  = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n";
         print "-t (--timeout)   = Plugin timeout in seconds (default = $utils::TIMEOUT)\n";
-        print "-M (--mailserver) = [ sendmail | qmail | postfix | exim ] (default = sendmail)\n";
+        print "-M (--mailserver) = [ sendmail | qmail | postfix | exim | nullmailer ] (default = autodetect)\n";
         print "-h (--help)\n";
         print "-V (--version)\n";
         print "-v (--verbose)   = debugging output\n";
@@ -599,6 +660,8 @@ sub print_help () {
         print "Note: -w and -c are required arguments.  -W and -C are optional.\n";
         print " -W and -C are applied to domains listed on the queues - both FROM and TO. (sendmail)\n";
         print " -W and -C are applied message not yet preproccessed. (qmail)\n";
+        print " This plugin tries to autodetect which mailserver you are running,\n";
+        print " you can override the autodetection with -M.\n";
         print " This plugin uses the system mailq command (sendmail) or qmail-stat (qmail)\n";
         print " to look at the queues. Mailq can usually only be accessed by root or \n";
         print " a TrustedUser. You will have to set appropriate permissions for the plugin to work.\n";
diff --git a/plugins-scripts/check_mssql.pl b/plugins-scripts/check_mssql.pl
index 9a8fc511..a436a8ff 100755
--- a/plugins-scripts/check_mssql.pl
+++ b/plugins-scripts/check_mssql.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@PERL@ -w
 
 #
 # Copyright 2003 Roy Sigurd Karlsbakk
@@ -19,9 +19,9 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
 #
-# Report bugs to: nagiosplug-help@lists.sourceforge.net
+# Report bugs to: help@monitoring-plugins.org
 # 
 #
 
@@ -29,12 +29,17 @@
 use DBI;
 use DBD::Sybase;
 use Getopt::Long;
-use lib ".";
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 use strict;
 
 my $PROGNAME = "check_mssql";
 
+$ENV{'PATH'}='@TRUSTED_PATH@';
+$ENV{'BASH_ENV'}=''; 
+$ENV{'ENV'}='';
+
 my (
         $server,$database,$username,$password,$query,$help,$verbose,$timeout,
         $dbh,$sth,$row,
@@ -44,7 +49,7 @@ my $exitcode = $ERRORS{'OK'};
 
 process_arguments();
 
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
      print ("SQL UNKNOWN: ERROR connection $server (alarm timeout)\n");
      exit $ERRORS{"UNKNOWN"};
diff --git a/plugins-scripts/check_netdns.pl b/plugins-scripts/check_netdns.pl
index ecdbdb1a..82939bff 100755
--- a/plugins-scripts/check_netdns.pl
+++ b/plugins-scripts/check_netdns.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@PERL@ -w
 
 # Perl version of check_dns plugin which calls DNS directly instead of
 # relying on nslookup (which has bugs)
@@ -27,11 +27,16 @@
 
 use Getopt::Long;
 use Net::DNS;
-use lib utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils ;
 
 my $PROGNAME = "check_netdns";
 
+$ENV{'PATH'}='@TRUSTED_PATH@';
+$ENV{'BASH_ENV'}=''; 
+$ENV{'ENV'}='';
+
 Getopt::Long::Configure(`bundling`);
 GetOptions("V" => $opt_V,         "version" => $opt_V,
                                          "h" => $opt_h,         "help" => $opt_h,
diff --git a/plugins-scripts/check_ntp.pl b/plugins-scripts/check_ntp.pl
index 5c87e0a6..13da939c 100755
--- a/plugins-scripts/check_ntp.pl
+++ b/plugins-scripts/check_ntp.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@PERL@ -w
 #
 # (c)1999 Ian Cass, Knowledge Matters Ltd.
 # Read the GNU copyright stuff for all the legalese
@@ -69,7 +69,7 @@ $PROGNAME="check_ntp";
 sub print_help ();
 sub print_usage ();
 
-$ENV{'PATH'}='';
+$ENV{'PATH'}='@TRUSTED_PATH@';
 $ENV{'BASH_ENV'}='';
 $ENV{'ENV'}='';
 
diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
index 2a8ab21d..ceac95dc 100755
--- a/plugins-scripts/check_oracle.sh
+++ b/plugins-scripts/check_oracle.sh
@@ -3,12 +3,13 @@
 # latigid010@yahoo.com
 # 01/06/2000
 #
-#  This Nagios plugin was created to check Oracle status
+#  This Monitoring plugin was created to check Oracle status
 #
 
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
 REVISION="@NP_VERSION@"
+PATH="@TRUSTED_PATH@"
 
 . $PROGPATH/utils.sh
 
@@ -163,7 +164,7 @@ case "$cmd" in
     }'
     ;;
 --db)
-    pmonchk=`ps -ef | grep -v grep | grep -c "ora_pmon_${2}$"`
+    pmonchk=`ps -ef | grep -v grep | grep -E -c "(asm|ora)_pmon_${2}$"`
     if [ ${pmonchk} -ge 1 ] ; then
         echo "${2} OK - ${pmonchk} PMON process(es) running"
         exit $STATE_OK
diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl
index d2701e95..cbdeceb4 100755
--- a/plugins-scripts/check_rpc.pl
+++ b/plugins-scripts/check_rpc.pl
@@ -1,6 +1,6 @@
-#!/usr/local/bin/perl -w
+#!@PERL@ -w
 #
-# check_rpc plugin for nagios
+# check_rpc plugin for monitoring
 #
 # usage:
 #    check_rpc host service
@@ -20,7 +20,8 @@
 #
 
 use strict;
-use lib utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 use vars qw($PROGNAME);
 my ($verbose,@proto,%prognum,$host,$response,$prognum,$port,$cmd,$progver,$state);
@@ -36,9 +37,9 @@ sub print_help ();
 sub print_usage ();
 sub in ($$);
 
-$ENV{'BASH_ENV'}='';
+$ENV{'PATH'}='@TRUSTED_PATH@';
+$ENV{'BASH_ENV'}=''; 
 $ENV{'ENV'}='';
-$ENV{'PATH'}='';
 $ENV{'LC_ALL'}='C';
 
 #Initialise protocol for each progname number
@@ -254,7 +255,7 @@ $proto = 't' if ($opt_t);
 $proto = 'u' if ($opt_u);
 
 
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
         print ("ERROR: No response from RPC server (alarm)\n");
         exit $ERRORS{"UNKNOWN"};
diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh
index 874e1049..05c64c48 100755
--- a/plugins-scripts/check_sensors.sh
+++ b/plugins-scripts/check_sensors.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
 REVISION="@NP_VERSION@"
+PATH="@TRUSTED_PATH@"
 
-. $PROGPATH/utils.sh
+export PATH
 
+. $PROGPATH/utils.sh
 
 print_usage() {
         echo "Usage: $PROGNAME" [--ignore-fault]
diff --git a/plugins-scripts/check_wave.pl b/plugins-scripts/check_wave.pl
index 2671112a..979416e0 100755
--- a/plugins-scripts/check_wave.pl
+++ b/plugins-scripts/check_wave.pl
@@ -1,9 +1,10 @@
-#!/usr/bin/perl -wT
+#!@PERL@ -w
 #
 
 
 use strict;
-use lib utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 use vars qw($PROGNAME);
 use Getopt::Long;
@@ -15,7 +16,7 @@ $PROGNAME = "check_wave";
 sub print_help ();
 sub print_usage ();
 
-$ENV{'PATH'}='';
+$ENV{'PATH'}='@TRUSTED_PATH@';
 $ENV{'BASH_ENV'}='';
 $ENV{'ENV'}='';
 
diff --git a/plugins-scripts/subst.in b/plugins-scripts/subst.in
deleted file mode 100644
index a70ad884..00000000
--- a/plugins-scripts/subst.in
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/awk
-
-function which(c,path) {
-        cmd = "test -x " c;
-
-        if (system(cmd)==0) {
-                return c;
-        } 
-
-        sub(/\/.*\//,"",c);
-  for (dir in path) {
-                        cmd = "test -x " path[dir] "/" c;
-                        if (system(cmd)==0) {
-                                        return path[dir] "/" c;
-                        } 
-        }
-
-
-        return c;
-}
-
-# used to replace "use lib utils.pm" with "use lib @libexecdir"
-#
-function led() {
-        led1 = "@libexecdir@";
-        led2 = "@exec_prefix@";
-        led3 = "@prefix@";
-        if ( match(led1, /^\$\{exec_prefix\}/ ) != 0 ) {
-                return "\"" led3 "/libexec\" " ;
-        
-        }
-        return "\"" led1 "\"" ;
-}
-
-BEGIN {
-        split(ENVIRON["PATH"] ":/sbin:/usr/sbin",path,/:/);
-
-}
-
-# Plugin revision
-/@NP_VERSION@/ {sub(/@NP_VERSION@/,ENVIRON["NP_VERSION"]);}
-
-# scripting language (first line)
-
-/^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");}
-/^#! ?\/.*\/perl/ {sub(/^#! ?\/.*\/perl/,"#! @PERL@");}
-/^#! ?\/.*\/[a-z]{0,2}awk/ {sub(/^#! ?\/.*\/[a-z]{0,2}awk/,"#! @AWK@");}
-/^#! ?\/.*\/sh/ {sub(/^#! ?\/.*\/sh/,"#! @SHELL@");}
-
-# If a script contains a reference to a fully qualified command,
-# subst will replace the fully qualified command with whatever is
-# returned from the which subroutine. run before changes to INC to add libexecdir
-# FIXME: Prepend executables with a substitution keyword instead.
-#
-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
-        match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
-        c=substr($0,RSTART,RLENGTH);
-        sub(c,which(c,path));
-}
-
-# add to libexecdir to INC for perl utils.pm
-/^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } }
-
-
-# Trusted path mechanism (deprecated)
-
-/^[ \t]*\$ENV[ \t]*\{[ \t'"]*PATH[ \t"']*\}[ \t]*=/ {
-        sub(/\=[ \t]*['"][^"']+["']/,"='@with_trusted_path@' # autoconf-derived");
-}
-
-/^[\t ]*(export[\t ]*)?PATH[\t ]*=['"]+.+["']$/ {
-        sub(/\=.*$/,"='@with_trusted_path@' # autoconf-derived");
-}
-
-{
-        print;
-}
-
diff --git a/plugins-scripts/t/check_file_age.t b/plugins-scripts/t/check_file_age.t
index 384c276b..a5156491 100644
--- a/plugins-scripts/t/check_file_age.t
+++ b/plugins-scripts/t/check_file_age.t
@@ -5,7 +5,7 @@
 #
 
 use strict;
-use Test::More tests => 15;
+use Test::More tests => 16;
 use NPTest;
 
 my $successOutput = '/^FILE_AGE OK: /';
@@ -58,6 +58,11 @@ $result = NPTest->testCmd(
 cmp_ok( $result->return_code, '==', 0, "Checking file size" );
 
 $result = NPTest->testCmd(
+        "./check_file_age -f /non/existent --ignore-missing"
+        );
+cmp_ok( $result->return_code, '==', 0, "Honours --ignore-missing" );
+
+$result = NPTest->testCmd(
         "./check_file_age -f $temp_file -c 1000 -W 101"
         );
 cmp_ok( $result->return_code, '==', 1, "One byte too short" );
diff --git a/plugins-scripts/utils.pm.in b/plugins-scripts/utils.pm.in
index 37cd62c3..0f53243c 100644
--- a/plugins-scripts/utils.pm.in
+++ b/plugins-scripts/utils.pm.in
@@ -1,6 +1,6 @@
-# Utility drawer for Nagios plugins.
+# Utility drawer for Monitoring Plugins.
 #
-# This will be deprecated soon. Please use Nagios::Plugin from CPAN
+# This will be deprecated soon. Please use Monitoring::Plugin from CPAN
 # for new plugins
 
 package utils;
diff --git a/plugins-scripts/utils.sh.in b/plugins-scripts/utils.sh.in
index 4a07df89..031c0357 100644
--- a/plugins-scripts/utils.sh.in
+++ b/plugins-scripts/utils.sh.in
@@ -6,19 +6,13 @@ STATE_CRITICAL=2
 STATE_UNKNOWN=3
 STATE_DEPENDENT=4
 
-if test -x /usr/bin/printf; then
-        ECHO=/usr/bin/printf
-else
-        ECHO=echo
-fi
-
 print_revision() {
         echo "$1 v$2 (@PACKAGE@ @VERSION@)"
-        $ECHO "@WARRANTY@" | sed -e 's/\n/ /g'
+        printf '%b' "@WARRANTY@"
 }
 
 support() {
-        $ECHO "@SUPPORT@" | sed -e 's/\n/ /g'
+        printf '%b' "@SUPPORT@"
 }
 
 #