summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BRANCHES9
-rw-r--r--Makefile.am5
-rwxr-xr-xNP-VERSION-GEN46
-rw-r--r--NPTest.pm2
-rw-r--r--acinclude.m41
-rwxr-xr-xautogen.sh2
-rw-r--r--command.cfg.in2
-rw-r--r--configure.in1
-rw-r--r--contrib/check_adptraid.sh2
-rw-r--r--contrib/check_apc_ups.pl4
-rw-r--r--contrib/check_appletalk.pl6
-rw-r--r--contrib/check_arping.pl4
-rw-r--r--contrib/check_email_loop.pl2
-rw-r--r--contrib/check_fan_cpq_present4
-rw-r--r--contrib/check_fan_fsc_present4
-rw-r--r--contrib/check_frontpage6
-rw-r--r--contrib/check_http-with-client-certificate.c2
-rw-r--r--contrib/check_hw.sh2
-rwxr-xr-xcontrib/check_ica_master_browser.pl7
-rwxr-xr-xcontrib/check_ica_metaframe_pub_apps.pl7
-rwxr-xr-xcontrib/check_ica_program_neigbourhood.pl7
-rw-r--r--contrib/check_inodes-freebsd.pl4
-rw-r--r--contrib/check_javaproc.pl2
-rwxr-xr-xcontrib/check_joy.sh2
-rw-r--r--contrib/check_log2.pl4
-rwxr-xr-xcontrib/check_lotus.pl7
-rw-r--r--contrib/check_mem.pl2
-rwxr-xr-xcontrib/check_ms_spooler.pl7
-rw-r--r--contrib/check_ora_table_space.pl4
-rw-r--r--contrib/check_oracle_instance.pl4
-rw-r--r--contrib/check_oracle_tbs2
-rw-r--r--contrib/check_pfstate4
-rw-r--r--contrib/check_rbl.c8
-rw-r--r--contrib/check_smb.sh2
-rw-r--r--contrib/check_snmp_disk_monitor.pl2
-rwxr-xr-xcontrib/check_snmp_printer.pl4
-rw-r--r--contrib/check_snmp_process_monitor.pl2
-rw-r--r--contrib/check_snmp_procs.pl4
-rw-r--r--contrib/check_temp_cpq4
-rw-r--r--contrib/check_temp_fsc4
-rwxr-xr-xcontrib/check_traceroute.pl7
-rw-r--r--contrib/check_uptime.c4
-rw-r--r--contrib/check_vcs.pl2
-rwxr-xr-xcontrib/check_wins.pl7
-rwxr-xr-xcontrib/packet_utils.pm3
-rw-r--r--contrib/utils.py2
-rw-r--r--doc/BRANCHING10
-rw-r--r--doc/developer-guidelines.sgml4
-rw-r--r--lib/extra_opts.c5
-rw-r--r--lib/parse_ini.c4
-rw-r--r--lib/tests/test_base64.c1
-rw-r--r--lib/tests/test_cmd.c1
-rw-r--r--lib/tests/test_disk.c1
-rw-r--r--lib/tests/test_ini.c1
-rw-r--r--lib/tests/test_opts.c2
-rw-r--r--lib/tests/test_tcp.c1
-rw-r--r--lib/tests/test_utils.c1
-rw-r--r--lib/utils_base.c3
-rw-r--r--lib/utils_cmd.c3
-rw-r--r--lib/utils_disk.c3
-rw-r--r--lib/utils_tcp.c3
-rw-r--r--plugins-root/Makefile.am13
-rw-r--r--plugins-root/check_dhcp.c8
-rw-r--r--plugins-root/check_icmp.c8
-rw-r--r--plugins-root/t/check_icmp.t2
-rw-r--r--plugins-scripts/Makefile.am13
-rwxr-xr-xplugins-scripts/check_breeze.pl4
-rwxr-xr-xplugins-scripts/check_disk_smb.pl5
-rwxr-xr-xplugins-scripts/check_file_age.pl5
-rwxr-xr-xplugins-scripts/check_flexlm.pl5
-rwxr-xr-x[-rw-r--r--]plugins-scripts/check_ifoperstatus.pl5
-rwxr-xr-xplugins-scripts/check_ifstatus.pl5
-rwxr-xr-xplugins-scripts/check_ircd.pl5
-rwxr-xr-xplugins-scripts/check_log.sh2
-rwxr-xr-xplugins-scripts/check_mailq.pl5
-rwxr-xr-xplugins-scripts/check_mssql.pl3
-rwxr-xr-xplugins-scripts/check_netdns.pl1
-rwxr-xr-xplugins-scripts/check_ntp.pl5
-rwxr-xr-xplugins-scripts/check_oracle.sh2
-rwxr-xr-xplugins-scripts/check_rpc.pl18
-rwxr-xr-xplugins-scripts/check_sensors.sh2
-rwxr-xr-xplugins-scripts/check_wave.pl5
-rw-r--r--plugins-scripts/subst.in3
-rw-r--r--plugins-scripts/t/check_file_age.t1
-rw-r--r--plugins-scripts/t/check_rpc.t1
-rw-r--r--plugins-scripts/t/utils.t1
-rw-r--r--plugins-scripts/utils.pm.in3
-rw-r--r--plugins/Makefile.am16
-rw-r--r--plugins/check_apt.c9
-rw-r--r--plugins/check_by_ssh.c8
-rw-r--r--plugins/check_cluster.c9
-rw-r--r--plugins/check_dig.c8
-rw-r--r--plugins/check_disk.c8
-rw-r--r--plugins/check_dns.c8
-rw-r--r--plugins/check_dummy.c8
-rw-r--r--plugins/check_fping.c8
-rw-r--r--plugins/check_game.c8
-rw-r--r--plugins/check_hpjd.c8
-rw-r--r--plugins/check_http.c12
-rw-r--r--plugins/check_ide_smart.c8
-rw-r--r--plugins/check_ldap.c8
-rw-r--r--plugins/check_load.c8
-rw-r--r--plugins/check_mrtg.c8
-rw-r--r--plugins/check_mrtgtraf.c8
-rw-r--r--plugins/check_mysql.c8
-rw-r--r--plugins/check_mysql_query.c8
-rw-r--r--plugins/check_nagios.c8
-rw-r--r--plugins/check_nt.c8
-rw-r--r--plugins/check_ntp.c8
-rw-r--r--plugins/check_ntp_peer.c8
-rw-r--r--plugins/check_ntp_time.c8
-rw-r--r--plugins/check_nwstat.c8
-rw-r--r--plugins/check_overcr.c8
-rw-r--r--plugins/check_pgsql.c8
-rw-r--r--plugins/check_ping.c8
-rw-r--r--plugins/check_procs.c8
-rw-r--r--plugins/check_radius.c8
-rw-r--r--plugins/check_real.c8
-rw-r--r--plugins/check_smtp.c8
-rw-r--r--plugins/check_snmp.c8
-rw-r--r--plugins/check_ssh.c12
-rw-r--r--plugins/check_swap.c8
-rw-r--r--plugins/check_tcp.c7
-rw-r--r--plugins/check_time.c8
-rw-r--r--plugins/check_ups.c8
-rw-r--r--plugins/check_users.c8
-rw-r--r--plugins/common.h3
-rw-r--r--plugins/negate.c8
-rw-r--r--plugins/netutils.c3
-rw-r--r--plugins/netutils.h3
-rw-r--r--plugins/popen.c3
-rw-r--r--plugins/popen.h1
-rw-r--r--plugins/runcmd.c3
-rw-r--r--plugins/runcmd.h1
-rw-r--r--plugins/sslutils.c3
-rw-r--r--plugins/t/check_by_ssh.t1
-rw-r--r--plugins/t/check_cluster.t1
-rw-r--r--plugins/t/check_dig.t1
-rw-r--r--plugins/t/check_disk.t1
-rw-r--r--plugins/t/check_dns.t1
-rw-r--r--plugins/t/check_dummy.t1
-rw-r--r--plugins/t/check_fping.t1
-rw-r--r--plugins/t/check_ftp.t1
-rw-r--r--plugins/t/check_hpjd.t1
-rw-r--r--plugins/t/check_http.t1
-rw-r--r--plugins/t/check_imap.t1
-rw-r--r--plugins/t/check_jabber.t1
-rw-r--r--plugins/t/check_load.t1
-rw-r--r--plugins/t/check_mysql.t1
-rw-r--r--plugins/t/check_mysql_query.t1
-rw-r--r--plugins/t/check_nagios.t1
-rw-r--r--plugins/t/check_ntp.t1
-rw-r--r--plugins/t/check_ping.t1
-rw-r--r--plugins/t/check_pop.t1
-rw-r--r--plugins/t/check_procs.t1
-rw-r--r--plugins/t/check_smtp.t1
-rw-r--r--plugins/t/check_snmp.t1
-rw-r--r--plugins/t/check_swap.t1
-rw-r--r--plugins/t/check_tcp.t1
-rw-r--r--plugins/t/check_time.t1
-rw-r--r--plugins/t/check_udp.t1
-rw-r--r--plugins/t/check_users.t1
-rw-r--r--plugins/t/negate.t2
-rw-r--r--plugins/urlize.c8
-rw-r--r--plugins/utils.c21
-rw-r--r--plugins/utils.h3
-rwxr-xr-xtest.pl.in2
-rw-r--r--tools/README1
-rwxr-xr-xtools/git2svn.pl129
-rw-r--r--tools/mini_epn.c2
-rwxr-xr-xtools/setup1
-rwxr-xr-xtools/tinderbox_build2
172 files changed, 419 insertions, 531 deletions
diff --git a/BRANCHES b/BRANCHES
deleted file mode 100644
index b1e8576..0000000
--- a/BRANCHES
+++ /dev/null
@@ -1,9 +0,0 @@
1# $Id$
2#
3# This file describes the current branches in CVS for nagiosplug
4# Used by sfsnapshot to generate the snapshots
5#
6# Format:
7# cvs_branch_name:description
8HEAD:Stable - 1.4.x releases
9r1_4-patches:Testing multiple branches
diff --git a/Makefile.am b/Makefile.am
index 0452133..3cd939a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = gl @INCLUDE_TAP_DIR@ lib plugins plugins-scripts plugins-root po @PERL
5# Have to list TAP_DIR manually to get in distribution 5# Have to list TAP_DIR manually to get in distribution
6EXTRA_DIST = config.rpath \ 6EXTRA_DIST = config.rpath \
7 ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \ 7 ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \
8 REQUIREMENTS SUPPORT THANKS \ 8 NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \
9 NPTest.pm contrib pkg nagios-plugins.spec \ 9 NPTest.pm contrib pkg nagios-plugins.spec \
10 config_test/Makefile config_test/run_tests config_test/child_test.c \ 10 config_test/Makefile config_test/run_tests config_test/child_test.c \
11 perlmods tools/build_perl_modules \ 11 perlmods tools/build_perl_modules \
@@ -19,7 +19,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\"
19 19
20dist-hook: 20dist-hook:
21 make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec 21 make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
22 rm -rf `find $(distdir) -name .svn` 22 echo ${VERSION} >$(distdir)/version
23 23
24install-root: 24install-root:
25 cd plugins-root && $(MAKE) $@ 25 cd plugins-root && $(MAKE) $@
@@ -62,3 +62,4 @@ THANKS: THANKS.in
62 62
63pkgclean: 63pkgclean:
64 rm -rf $(BUILDDIR) $(PACKDIR) 64 rm -rf $(BUILDDIR) $(PACKDIR)
65
diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN
new file mode 100755
index 0000000..1169710
--- /dev/null
+++ b/NP-VERSION-GEN
@@ -0,0 +1,46 @@
1#!/bin/sh
2#
3# This is from the Git repository (GIT-VERSION-GEN with modifications)
4#
5
6SRC_ROOT=`dirname $0`
7
8NPVF=NP-VERSION-FILE
9DEF_VER=1.4.13.git
10
11LF='
12'
13
14# First see if there is a version file (included in release tarballs),
15# then try git-describe, then default.
16if test -f $SRC_ROOT/version
17then
18 VN=`cat $SRC_ROOT/version` || VN="$DEF_VER"
19elif test -d $SRC_ROOT/.git -o -f $SRC_ROOT/.git &&
20 VN=`cd $SRC_ROOT; git describe --abbrev=4 HEAD 2>/dev/null` &&
21 case "$VN" in
22 *$LF*) (exit 1) ;;
23 release-[0-9]*)
24 git update-index -q --refresh
25 test -z "`git diff-index --name-only HEAD --`" ||
26 VN="$VN-dirty" ;;
27 esac
28then
29 VN=`echo "$VN" | sed -e 's/^release-//' | sed -e 's/-/./g'`;
30else
31 VN="$DEF_VER"
32fi
33
34VN=`expr "$VN" : v*'\(.*\)'`
35
36if test -r $NPVF
37then
38 VC=`sed -e 's/^NP_VERSION = //' <$NPVF`
39else
40 VC=unset
41fi
42test "$VN" = "$VC" || {
43 echo >&2 "NP_VERSION = $VN"
44 echo "NP_VERSION = $VN" >$NPVF
45}
46
diff --git a/NPTest.pm b/NPTest.pm
index d4542dd..1cd89db 100644
--- a/NPTest.pm
+++ b/NPTest.pm
@@ -21,7 +21,7 @@ use Data::Dumper;
21use Test; 21use Test;
22 22
23use vars qw($VERSION); 23use vars qw($VERSION);
24$VERSION = do { my @r = (q$Revision$ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker 24$VERSION = "1556."; # must be all one line, for MakeMaker
25 25
26=head1 NAME 26=head1 NAME
27 27
diff --git a/acinclude.m4 b/acinclude.m4
index 7de6555..acee3e1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -8,7 +8,6 @@ dnl e.g. 6 arguments (linux)
8dnl e.g. 5 arguments (solaris) 8dnl e.g. 5 arguments (solaris)
9dnl e.g. 3 arguments (osf/1) 9dnl e.g. 3 arguments (osf/1)
10dnl 10dnl
11dnl @version $Id$
12dnl @author Brian Stafford <brian@stafford.uklinux.net> 11dnl @author Brian Stafford <brian@stafford.uklinux.net>
13dnl 12dnl
14dnl based on version by Caolan McNamara <caolan@skynet.ie> 13dnl based on version by Caolan McNamara <caolan@skynet.ie>
diff --git a/autogen.sh b/autogen.sh
index 3bc484b..c584309 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $Id$
4#
5# Requires: automake, autoconf, dpkg-dev 3# Requires: automake, autoconf, dpkg-dev
6# set -e 4# set -e
7 5
diff --git a/command.cfg.in b/command.cfg.in
index 65b5f4e..aff33d2 100644
--- a/command.cfg.in
+++ b/command.cfg.in
@@ -1,8 +1,6 @@
1############################################################################### 1###############################################################################
2# COMMAND CONFIGURATION 2# COMMAND CONFIGURATION
3# 3#
4# $Id$
5#
6# SYNTAX: 4# SYNTAX:
7# command[<command_name>]=<command_line> 5# command[<command_name>]=<command_line>
8# 6#
diff --git a/configure.in b/configure.in
index 7687ae6..203166e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,4 @@
1dnl Process this file with autoconf to produce a configure script. 1dnl Process this file with autoconf to produce a configure script.
2AC_REVISION ($Revision$)
3AC_PREREQ(2.59) 2AC_PREREQ(2.59)
4AC_INIT(nagios-plugins,1.4.13) 3AC_INIT(nagios-plugins,1.4.13)
5AC_CONFIG_SRCDIR(NPTest.pm) 4AC_CONFIG_SRCDIR(NPTest.pm)
diff --git a/contrib/check_adptraid.sh b/contrib/check_adptraid.sh
index d7f8d0c..e3c47be 100644
--- a/contrib/check_adptraid.sh
+++ b/contrib/check_adptraid.sh
@@ -13,7 +13,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
13 13
14PROGNAME=`basename $0` 14PROGNAME=`basename $0`
15PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` 15PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
16REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'` 16REVISION=`echo '$Revision: 302 $' | sed -e 's/[^0-9.]//g'`
17 17
18. $PROGPATH/utils.sh 18. $PROGPATH/utils.sh
19 19
diff --git a/contrib/check_apc_ups.pl b/contrib/check_apc_ups.pl
index 2b6990f..6bf1766 100644
--- a/contrib/check_apc_ups.pl
+++ b/contrib/check_apc_ups.pl
@@ -38,7 +38,7 @@ GetOptions
38 "H=s" => \$opt_H, "hostname=s" => \$opt_H); 38 "H=s" => \$opt_H, "hostname=s" => \$opt_H);
39 39
40if ($opt_V) { 40if ($opt_V) {
41 print_revision($PROGNAME,'$Revision$'); 41 print_revision($PROGNAME,'$Revision: 1771 $');
42 exit $ERRORS{'OK'}; 42 exit $ERRORS{'OK'};
43} 43}
44 44
@@ -252,7 +252,7 @@ sub print_usage () {
252} 252}
253 253
254sub print_help () { 254sub print_help () {
255 print_revision($PROGNAME,'$Revision$'); 255 print_revision($PROGNAME,'$Revision: 1771 $');
256 print "Copyright (c) 2001 Gerald Combs/Jeffrey Blank/Karl DeBisschop 256 print "Copyright (c) 2001 Gerald Combs/Jeffrey Blank/Karl DeBisschop
257 257
258This plugin reports the status of an APC UPS equipped with an SNMP management 258This plugin reports the status of an APC UPS equipped with an SNMP management
diff --git a/contrib/check_appletalk.pl b/contrib/check_appletalk.pl
index 6df4c7a..9277686 100644
--- a/contrib/check_appletalk.pl
+++ b/contrib/check_appletalk.pl
@@ -9,7 +9,7 @@
9# using "aecho" 9# using "aecho"
10# 10#
11# initial version: 23 October 2002 by Stefan Beck, IT Software Solutions 11# initial version: 23 October 2002 by Stefan Beck, IT Software Solutions
12# current status: $Revision$ 12# current status: $Revision: 1771 $
13# 13#
14# Copyright Notice: GPL 14# Copyright Notice: GPL
15# 15#
@@ -122,7 +122,7 @@ while (<CMD>) {
122} 122}
123 123
124sub print_help() { 124sub print_help() {
125 print_revision( $PROGNAME, '$Revision$ ' ); 125 print_revision( $PROGNAME, '$Revision: 1771 $ ' );
126 print "Copyright (c) 2002 Stefan Beck\n"; 126 print "Copyright (c) 2002 Stefan Beck\n";
127 print "\n"; 127 print "\n";
128 print "Check if an atalkhost responds to an atalk echo using\n"; 128 print "Check if an atalkhost responds to an atalk echo using\n";
@@ -159,7 +159,7 @@ sub print_usage () {
159} 159}
160 160
161sub version () { 161sub version () {
162 print_revision( $PROGNAME, '$Revision$ ' ); 162 print_revision( $PROGNAME, '$Revision: 1771 $ ' );
163 exit $ERRORS{'OK'}; 163 exit $ERRORS{'OK'};
164} 164}
165 165
diff --git a/contrib/check_arping.pl b/contrib/check_arping.pl
index b78ec68..c41c4a8 100644
--- a/contrib/check_arping.pl
+++ b/contrib/check_arping.pl
@@ -55,7 +55,7 @@ if ($status == 0)
55 55
56 56
57if ($opt_V) { 57if ($opt_V) {
58 print_revision($PROGNAME,'$Revision$ '); 58 print_revision($PROGNAME,'$Revision: 1112 $ ');
59 exit $ERRORS{'OK'}; 59 exit $ERRORS{'OK'};
60} 60}
61 61
@@ -115,6 +115,6 @@ sub print_help {
115 print " -t (--timeout) Timeout in seconds.\n"; 115 print " -t (--timeout) Timeout in seconds.\n";
116 print " -V (--version) Plugin version\n"; 116 print " -V (--version) Plugin version\n";
117 print " -h (--help) usage help \n\n"; 117 print " -h (--help) usage help \n\n";
118 print_revision($PROGNAME, '$Revision$'); 118 print_revision($PROGNAME, '$Revision: 1112 $');
119 119
120} 120}
diff --git a/contrib/check_email_loop.pl b/contrib/check_email_loop.pl
index fb418ee..1b02ea3 100644
--- a/contrib/check_email_loop.pl
+++ b/contrib/check_email_loop.pl
@@ -1,6 +1,6 @@
1#!/usr/bin/perl -w 1#!/usr/bin/perl -w
2# 2#
3# $Id$ 3# $Id: check_email_loop.pl 1290 2005-11-29 23:21:06Z harpermann $
4# 4#
5# (c)2000 Benjamin Schmid, blueshift@gmx.net (emergency use only ;-) 5# (c)2000 Benjamin Schmid, blueshift@gmx.net (emergency use only ;-)
6# Copyleft by GNU GPL 6# Copyleft by GNU GPL
diff --git a/contrib/check_fan_cpq_present b/contrib/check_fan_cpq_present
index 476a0c3..0bd1390 100644
--- a/contrib/check_fan_cpq_present
+++ b/contrib/check_fan_cpq_present
@@ -111,7 +111,7 @@ sub print_usage () {
111 } 111 }
112 112
113sub print_help () { 113sub print_help () {
114 print_revision($PROGNAME,'$Revision$\n '); 114 print_revision($PROGNAME,'$Revision: 1113 $\n ');
115 print "Copyright (c) 2003 Rainer Duffner\n "; 115 print "Copyright (c) 2003 Rainer Duffner\n ";
116 print_usage(); 116 print_usage();
117 print "\n"; 117 print "\n";
@@ -122,7 +122,7 @@ sub print_help () {
122 } 122 }
123 123
124sub version () { 124sub version () {
125 print_revision($PROGNAME,'$Revision$ '); 125 print_revision($PROGNAME,'$Revision: 1113 $ ');
126 exit $ERRORS{'OK'}; 126 exit $ERRORS{'OK'};
127} 127}
128 128
diff --git a/contrib/check_fan_fsc_present b/contrib/check_fan_fsc_present
index 5bddb87..19f8e7f 100644
--- a/contrib/check_fan_fsc_present
+++ b/contrib/check_fan_fsc_present
@@ -113,7 +113,7 @@ sub print_usage () {
113 } 113 }
114 114
115sub print_help () { 115sub print_help () {
116 print_revision($PROGNAME,'$Revision$\n '); 116 print_revision($PROGNAME,'$Revision: 1113 $\n ');
117 print "Copyright (c) 2003 Rainer Duffner\n "; 117 print "Copyright (c) 2003 Rainer Duffner\n ";
118 print_usage(); 118 print_usage();
119 print "\n"; 119 print "\n";
@@ -124,7 +124,7 @@ sub print_help () {
124 } 124 }
125 125
126sub version () { 126sub version () {
127 print_revision($PROGNAME,'$Revision$ '); 127 print_revision($PROGNAME,'$Revision: 1113 $ ');
128 exit $ERRORS{'OK'}; 128 exit $ERRORS{'OK'};
129} 129}
130 130
diff --git a/contrib/check_frontpage b/contrib/check_frontpage
index ee958d3..21c5267 100644
--- a/contrib/check_frontpage
+++ b/contrib/check_frontpage
@@ -1,6 +1,6 @@
1#! /usr/bin/perl -w 1#! /usr/bin/perl -w
2# 2#
3# $Id$ 3# $Id: check_frontpage 1112 2005-01-27 04:46:08Z stanleyhopcroft $
4# 4#
5# Check that FrontPage extensions appear to be working on a specified host. 5# Check that FrontPage extensions appear to be working on a specified host.
6# Currently only checks that the hit counter is not returning an error. 6# Currently only checks that the hit counter is not returning an error.
@@ -42,7 +42,7 @@ GetOptions
42 "H=s" => \$opt_H, "hostname=s" => \$opt_H); 42 "H=s" => \$opt_H, "hostname=s" => \$opt_H);
43 43
44if ($opt_V) { 44if ($opt_V) {
45 print_revision($PROGNAME,'$Revision$'); #' 45 print_revision($PROGNAME,'$Revision: 1112 $'); #'
46 exit $ERRORS{'OK'}; 46 exit $ERRORS{'OK'};
47} 47}
48 48
@@ -139,7 +139,7 @@ sub print_usage () {
139} 139}
140 140
141sub print_help () { 141sub print_help () {
142 print_revision($PROGNAME,'$Revision$'); 142 print_revision($PROGNAME,'$Revision: 1112 $');
143 print "Copyright (c) 2003 Kev Green\n"; 143 print "Copyright (c) 2003 Kev Green\n";
144 print "\n"; 144 print "\n";
145 print "FrontPage remains a copyright/trademark of Microsoft Corporation.\n"; 145 print "FrontPage remains a copyright/trademark of Microsoft Corporation.\n";
diff --git a/contrib/check_http-with-client-certificate.c b/contrib/check_http-with-client-certificate.c
index 157d028..60e1481 100644
--- a/contrib/check_http-with-client-certificate.c
+++ b/contrib/check_http-with-client-certificate.c
@@ -37,7 +37,7 @@
37 *****************************************************************************/ 37 *****************************************************************************/
38 38
39const char *progname = "check_http"; 39const char *progname = "check_http";
40#define REVISION "$Revision$" 40#define REVISION "$Revision: 1117 $"
41#define CVSREVISION "1.24" 41#define CVSREVISION "1.24"
42#define COPYRIGHT "2003" 42#define COPYRIGHT "2003"
43#define AUTHORS "Fabian Pehla" 43#define AUTHORS "Fabian Pehla"
diff --git a/contrib/check_hw.sh b/contrib/check_hw.sh
index f03398e..9d3b574 100644
--- a/contrib/check_hw.sh
+++ b/contrib/check_hw.sh
@@ -16,7 +16,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
16 16
17PROGNAME=`basename $0` 17PROGNAME=`basename $0`
18PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` 18PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
19REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'` 19REVISION=`echo '$Revision: 939 $' | sed -e 's/[^0-9.]//g'`
20 20
21. $PROGPATH/utils.sh 21. $PROGPATH/utils.sh
22 22
diff --git a/contrib/check_ica_master_browser.pl b/contrib/check_ica_master_browser.pl
index 1bbab60..922e718 100755
--- a/contrib/check_ica_master_browser.pl
+++ b/contrib/check_ica_master_browser.pl
@@ -1,8 +1,7 @@
1#!/usr/bin/perl -w 1#!/usr/bin/perl -w
2 2
3# $Id$ 3# $Id: check_ica_master_browser.pl 1099 2005-01-25 09:09:33Z stanleyhopcroft $
4 4
5# $Log$
6# Revision 1.1 2005/01/25 09:09:33 stanleyhopcroft 5# Revision 1.1 2005/01/25 09:09:33 stanleyhopcroft
7# New plugin - checks that ICA master browser is what it should be (important for firewalled dialup) 6# New plugin - checks that ICA master browser is what it should be (important for firewalled dialup)
8# 7#
@@ -170,7 +169,7 @@ sub print_usage () {
170} 169}
171 170
172sub print_help () { 171sub print_help () {
173 print_revision($PROGNAME,'$Revision$ '); 172 print_revision($PROGNAME,'$Revision: 1099 $ ');
174 print "Copyright (c) 2002 Ed Rolison/Tom De Blende/S Hopcroft 173 print "Copyright (c) 2002 Ed Rolison/Tom De Blende/S Hopcroft
175 174
176Perl Check Citrix Master Browser plugin for Nagios. 175Perl Check Citrix Master Browser plugin for Nagios.
@@ -218,7 +217,7 @@ The ICA Client requests the address of the ICA master browser from the Citrix se
218} 217}
219 218
220sub version () { 219sub version () {
221 print_revision($PROGNAME,'$Revision$ '); 220 print_revision($PROGNAME,'$Revision: 1099 $ ');
222 exit $ERRORS{'OK'}; 221 exit $ERRORS{'OK'};
223} 222}
224 223
diff --git a/contrib/check_ica_metaframe_pub_apps.pl b/contrib/check_ica_metaframe_pub_apps.pl
index cc1325b..0edbdca 100755
--- a/contrib/check_ica_metaframe_pub_apps.pl
+++ b/contrib/check_ica_metaframe_pub_apps.pl
@@ -1,8 +1,7 @@
1#!/usr/bin/perl -w 1#!/usr/bin/perl -w
2 2
3# $Id$ 3# $Id: check_ica_metaframe_pub_apps.pl 1098 2005-01-25 09:07:39Z stanleyhopcroft $
4 4
5# $Log$
6# Revision 1.1 2005/01/25 09:07:39 stanleyhopcroft 5# Revision 1.1 2005/01/25 09:07:39 stanleyhopcroft
7# Replacement (structured name mainly) for check_citrix: check of ICA browse service 6# Replacement (structured name mainly) for check_citrix: check of ICA browse service
8# 7#
@@ -303,7 +302,7 @@ sub print_usage () {
303} 302}
304 303
305sub print_help () { 304sub print_help () {
306 print_revision($PROGNAME,'$Revision$ '); 305 print_revision($PROGNAME,'$Revision: 1098 $ ');
307 print "Copyright (c) 2002 Ed Rolison/Tom De Blende/S Hopcroft 306 print "Copyright (c) 2002 Ed Rolison/Tom De Blende/S Hopcroft
308 307
309Perl Check Citrix plugin for Nagios. 308Perl Check Citrix plugin for Nagios.
@@ -350,7 +349,7 @@ The plugin works by
350} 349}
351 350
352sub version () { 351sub version () {
353 print_revision($PROGNAME,'$Revision$ '); 352 print_revision($PROGNAME,'$Revision: 1098 $ ');
354 exit $ERRORS{'OK'}; 353 exit $ERRORS{'OK'};
355} 354}
356 355
diff --git a/contrib/check_ica_program_neigbourhood.pl b/contrib/check_ica_program_neigbourhood.pl
index f29c0d1..1f0fb45 100755
--- a/contrib/check_ica_program_neigbourhood.pl
+++ b/contrib/check_ica_program_neigbourhood.pl
@@ -1,8 +1,7 @@
1#!/usr/bin/perl -w 1#!/usr/bin/perl -w
2 2
3# $Id$ 3# $Id: check_ica_program_neigbourhood.pl 1097 2005-01-25 09:05:53Z stanleyhopcroft $
4 4
5# $Log$
6# Revision 1.1 2005/01/25 09:05:53 stanleyhopcroft 5# Revision 1.1 2005/01/25 09:05:53 stanleyhopcroft
7# New plugin to check Citrix Metaframe XP "Program Neighbourhood" 6# New plugin to check Citrix Metaframe XP "Program Neighbourhood"
8# 7#
@@ -290,7 +289,7 @@ sub print_help() {
290# 1 2 3 4 5 6 7 8 289# 1 2 3 4 5 6 7 8
291#12345678901234567890123456789012345678901234567890123456789012345678901234567890 290#12345678901234567890123456789012345678901234567890123456789012345678901234567890
292 291
293 print_revision($PROGNAME,'$Revision$ '); 292 print_revision($PROGNAME,'$Revision: 1097 $ ');
294 293
295my $help = <<EOHELP ; 294my $help = <<EOHELP ;
296Copyright (c) 2004 Karl DeBisschop/S Hopcroft 295Copyright (c) 2004 Karl DeBisschop/S Hopcroft
@@ -345,7 +344,7 @@ sub usage {
345} 344}
346 345
347sub version () { 346sub version () {
348 print_revision($PROGNAME,'$Revision$ '); 347 print_revision($PROGNAME,'$Revision: 1097 $ ');
349 exit $ERRORS{'OK'}; 348 exit $ERRORS{'OK'};
350} 349}
351 350
diff --git a/contrib/check_inodes-freebsd.pl b/contrib/check_inodes-freebsd.pl
index 6dc8375..d66e5e3 100644
--- a/contrib/check_inodes-freebsd.pl
+++ b/contrib/check_inodes-freebsd.pl
@@ -41,7 +41,7 @@ GetOptions
41 41
42 42
43if ($opt_V) { 43if ($opt_V) {
44 print_revision($PROGNAME,'$Revision$ '); 44 print_revision($PROGNAME,'$Revision: 72 $ ');
45 exit $ERRORS{'OK'}; 45 exit $ERRORS{'OK'};
46} 46}
47 47
@@ -114,7 +114,7 @@ sub print_usage () {
114} 114}
115 115
116sub print_help () { 116sub print_help () {
117 print_revision($PROGNAME,'$Revision$'); 117 print_revision($PROGNAME,'$Revision: 72 $');
118 print "Copyright (c) 2002 Andrew Ryder\n"; 118 print "Copyright (c) 2002 Andrew Ryder\n";
119 print "\n"; 119 print "\n";
120 print_usage(); 120 print_usage();
diff --git a/contrib/check_javaproc.pl b/contrib/check_javaproc.pl
index a9b52bc..b68764e 100644
--- a/contrib/check_javaproc.pl
+++ b/contrib/check_javaproc.pl
@@ -170,7 +170,7 @@ Perl Check java processes plugin for Nagios
170} 170}
171 171
172sub revision() { 172sub revision() {
173 print_revision($PROGNAME,'$Revision$ '); 173 print_revision($PROGNAME,'$Revision: 211 $ ');
174} 174}
175 175
176sub version () { 176sub version () {
diff --git a/contrib/check_joy.sh b/contrib/check_joy.sh
index cd076db..8783a59 100755
--- a/contrib/check_joy.sh
+++ b/contrib/check_joy.sh
@@ -4,7 +4,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
4 4
5PROGNAME=`basename $0` 5PROGNAME=`basename $0`
6PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` 6PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
7REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'` 7REVISION=`echo '$Revision: 2 $' | sed -e 's/[^0-9.]//g'`
8STATUS="" 8STATUS=""
9 9
10. $PROGPATH/utils.sh 10. $PROGPATH/utils.sh
diff --git a/contrib/check_log2.pl b/contrib/check_log2.pl
index 61a1170..f1533a0 100644
--- a/contrib/check_log2.pl
+++ b/contrib/check_log2.pl
@@ -1,6 +1,6 @@
1#!/usr/bin/perl -w 1#!/usr/bin/perl -w
2# 2#
3# $Id$ 3# $Id: check_log2.pl 1300 2005-12-16 18:41:45Z harpermann $
4# 4#
5# Log file regular expression detector for Nagios. 5# Log file regular expression detector for Nagios.
6# Written by Aaron Bostick (abostick@mydoconline.com) 6# Written by Aaron Bostick (abostick@mydoconline.com)
@@ -77,7 +77,7 @@ sub print_help ();
77 $neg_re_pattern = ''; 77 $neg_re_pattern = '';
78 $pattern_count = 0; 78 $pattern_count = 0;
79 $pattern_line = ''; 79 $pattern_line = '';
80 $plugin_revision = '$Revision$ '; 80 $plugin_revision = '$Revision: 1300 $ ';
81 81
82 # Grab options from command line 82 # Grab options from command line
83 GetOptions 83 GetOptions
diff --git a/contrib/check_lotus.pl b/contrib/check_lotus.pl
index c94e6c2..8bedced 100755
--- a/contrib/check_lotus.pl
+++ b/contrib/check_lotus.pl
@@ -1,8 +1,7 @@
1#!/usr/bin/perl -w 1#!/usr/bin/perl -w
2 2
3# $Id$ 3# $Id: check_lotus.pl 1096 2005-01-25 09:04:26Z stanleyhopcroft $
4 4
5# $Log$
6# Revision 1.1 2005/01/25 09:04:26 stanleyhopcroft 5# Revision 1.1 2005/01/25 09:04:26 stanleyhopcroft
7# New plugin to check responsiveness of Louts Notes (v5 at least) servers 6# New plugin to check responsiveness of Louts Notes (v5 at least) servers
8# 7#
@@ -219,7 +218,7 @@ sub print_usage () {
219} 218}
220 219
221sub print_help () { 220sub print_help () {
222 print_revision($PROGNAME,'$Revision$ '); 221 print_revision($PROGNAME,'$Revision: 1096 $ ');
223 print "Copyright (c) 2004 Ed Rolison/S Hopcroft 222 print "Copyright (c) 2004 Ed Rolison/S Hopcroft
224 223
225Perl Check Lotus Notes plugin for Nagios. 224Perl Check Lotus Notes plugin for Nagios.
@@ -250,7 +249,7 @@ Returns OK if the named server responds with its name.
250} 249}
251 250
252sub version () { 251sub version () {
253 print_revision($PROGNAME,'$Revision$ '); 252 print_revision($PROGNAME,'$Revision: 1096 $ ');
254 exit $ERRORS{'OK'}; 253 exit $ERRORS{'OK'};
255} 254}
256 255
diff --git a/contrib/check_mem.pl b/contrib/check_mem.pl
index f0c8212..3227ce2 100644
--- a/contrib/check_mem.pl
+++ b/contrib/check_mem.pl
@@ -1,5 +1,5 @@
1#!/usr/bin/perl -w 1#!/usr/bin/perl -w
2# $Id$ 2# $Id: check_mem.pl 2 2002-02-28 06:42:51Z egalstad $
3 3
4# check_mem.pl Copyright (C) 2000 Dan Larsson <dl@tyfon.net> 4# check_mem.pl Copyright (C) 2000 Dan Larsson <dl@tyfon.net>
5# 5#
diff --git a/contrib/check_ms_spooler.pl b/contrib/check_ms_spooler.pl
index cf2464a..3a80a76 100755
--- a/contrib/check_ms_spooler.pl
+++ b/contrib/check_ms_spooler.pl
@@ -1,8 +1,7 @@
1#!/usr/bin/perl -w 1#!/usr/bin/perl -w
2 2
3# $Id$ 3# $Id: check_ms_spooler.pl 64 2002-07-16 00:04:42Z stanleyhopcroft $
4 4
5# $Log$
6# Revision 1.1 2002/07/16 00:04:42 stanleyhopcroft 5# Revision 1.1 2002/07/16 00:04:42 stanleyhopcroft
7# Primitive and in need of refinement test of MS spooler (with smbclient) 6# Primitive and in need of refinement test of MS spooler (with smbclient)
8# 7#
@@ -268,7 +267,7 @@ sub print_usage () {
268} 267}
269 268
270sub print_help () { 269sub print_help () {
271 print_revision($PROGNAME,'$Revision$ '); 270 print_revision($PROGNAME,'$Revision: 64 $ ');
272 print "Copyright (c) 2001 Karl DeBisschop/S Hopcroft 271 print "Copyright (c) 2001 Karl DeBisschop/S Hopcroft
273 272
274Perl Check MS Spooler plugin for NetSaint. Display a subset of the queues on an SMB (Samba or MS) print spooler. 273Perl Check MS Spooler plugin for NetSaint. Display a subset of the queues on an SMB (Samba or MS) print spooler.
@@ -292,7 +291,7 @@ Perl Check MS Spooler plugin for NetSaint. Display a subset of the queues on an
292} 291}
293 292
294sub version () { 293sub version () {
295 print_revision($PROGNAME,'$Revision$ '); 294 print_revision($PROGNAME,'$Revision: 64 $ ');
296 exit $ERRORS{'OK'}; 295 exit $ERRORS{'OK'};
297} 296}
298 297
diff --git a/contrib/check_ora_table_space.pl b/contrib/check_ora_table_space.pl
index 24497b2..7ce90c8 100644
--- a/contrib/check_ora_table_space.pl
+++ b/contrib/check_ora_table_space.pl
@@ -4,8 +4,8 @@
4# Written by: Erwan Arzur (erwan@netvalue.com) 4# Written by: Erwan Arzur (erwan@netvalue.com)
5# License: GPL 5# License: GPL
6# 6#
7# Last Modified: $Date$ 7# Last Modified: $Date: 2002-02-28 01:42:51 -0500 (Thu, 28 Feb 2002) $
8# Revisiin: $Revision$ 8# Revisiin: $Revision: 2 $
9# 9#
10# "check_ora_table_space.pl" plugin to check the state of Oracle 10# "check_ora_table_space.pl" plugin to check the state of Oracle
11# table spaces. Scarce documentation. 11# table spaces. Scarce documentation.
diff --git a/contrib/check_oracle_instance.pl b/contrib/check_oracle_instance.pl
index 1175c1e..3ba8d57 100644
--- a/contrib/check_oracle_instance.pl
+++ b/contrib/check_oracle_instance.pl
@@ -1,5 +1,5 @@
1#!/usr/bin/perl 1#!/usr/bin/perl
2# $Id$ 2# $Id: check_oracle_instance.pl 10 2002-04-03 02:58:47Z sghosh $
3 3
4# Copyright (c) 2002 Sven Dolderer 4# Copyright (c) 2002 Sven Dolderer
5# some pieces of Code adopted from Adam vonNieda's oracletool.pl 5# some pieces of Code adopted from Adam vonNieda's oracletool.pl
@@ -23,7 +23,7 @@ require DBD::Oracle || die "It appears that the DBD::Oracle module is not instal
23 23
24use vars qw($VERSION $PROGNAME $logfile $debug $state $dbh $database $username $password $message $sql $cursor $opt_asession $opt_nsession $opt_tablespace $opt_nextents $opt_fextents $opt_aextents $privsok $warn $critical); 24use vars qw($VERSION $PROGNAME $logfile $debug $state $dbh $database $username $password $message $sql $cursor $opt_asession $opt_nsession $opt_tablespace $opt_nextents $opt_fextents $opt_aextents $privsok $warn $critical);
25 25
26'$Revision$' =~ /^.*(\d+.\d+) \$$/; # Use The Revision from RCS/CVS 26'$Revision: 10 $' =~ /^.*(\d+.\d+) \$$/; # Use The Revision from RCS/CVS
27$VERSION = $1; 27$VERSION = $1;
28$0 =~ m!^.*/([^/]+)$!; 28$0 =~ m!^.*/([^/]+)$!;
29$PROGNAME = $1; 29$PROGNAME = $1;
diff --git a/contrib/check_oracle_tbs b/contrib/check_oracle_tbs
index 0efdd1e..8281a4e 100644
--- a/contrib/check_oracle_tbs
+++ b/contrib/check_oracle_tbs
@@ -30,7 +30,7 @@ if (!$ENV{ORACLE_HOME}) {
30my $state = $ERRORS{'UNKNOWN'}; 30my $state = $ERRORS{'UNKNOWN'};
31my $answer = undef; 31my $answer = undef;
32 32
33my ($MAJOR_VERSION, $MINOR_VERSION) = q$Revision$ =~ /(\d+)\.(\d+)/; 33my ($MAJOR_VERSION, $MINOR_VERSION) = q$Revision: 1134 $ =~ /(\d+)\.(\d+)/;
34my $VERSION = sprintf("%d.%02d", $MAJOR_VERSION - 1, $MINOR_VERSION); 34my $VERSION = sprintf("%d.%02d", $MAJOR_VERSION - 1, $MINOR_VERSION);
35 35
36my $opt_debug; # -d|--debug 36my $opt_debug; # -d|--debug
diff --git a/contrib/check_pfstate b/contrib/check_pfstate
index 6fe0d9b..57dde3f 100644
--- a/contrib/check_pfstate
+++ b/contrib/check_pfstate
@@ -27,7 +27,7 @@ GetOptions
27 "c=s" => \$opt_c, "critical=s" => \$opt_c); 27 "c=s" => \$opt_c, "critical=s" => \$opt_c);
28 28
29if ($opt_V) { 29if ($opt_V) {
30 print_revision($PROGNAME,'$Revision$'); 30 print_revision($PROGNAME,'$Revision: 1112 $');
31 exit $ERRORS{'OK'}; 31 exit $ERRORS{'OK'};
32} 32}
33if ($opt_h) { 33if ($opt_h) {
@@ -67,7 +67,7 @@ exit $ERRORS{'OK'};
67 67
68 68
69sub print_help { 69sub print_help {
70 print_revision($PROGNAME,'$Revision$'); 70 print_revision($PROGNAME,'$Revision: 1112 $');
71 print "Copyright (c) 2002 Jason Dixon\n\nThis plugin checks the number of state table entries on a PF-enabled OpenBSD system.\n\n"; 71 print "Copyright (c) 2002 Jason Dixon\n\nThis plugin checks the number of state table entries on a PF-enabled OpenBSD system.\n\n";
72 print "Usage:\t-H, --hostname=<HOST> [-w, --warning=<WARNING>] [-c, --critical=<CRITICAL>]\n\n\tDefault warning is 50000 and critical is 60000.\n\n"; 72 print "Usage:\t-H, --hostname=<HOST> [-w, --warning=<WARNING>] [-c, --critical=<CRITICAL>]\n\n\tDefault warning is 50000 and critical is 60000.\n\n";
73 support(); 73 support();
diff --git a/contrib/check_rbl.c b/contrib/check_rbl.c
index 6831b65..eec84ad 100644
--- a/contrib/check_rbl.c
+++ b/contrib/check_rbl.c
@@ -11,7 +11,7 @@
11* * License: GPL 11* * License: GPL
12* * Copyright (c) 2000 12* * Copyright (c) 2000
13* * 13* *
14* * $Id$ 14* * $Id: check_rbl.c 970 2004-12-02 00:30:32Z opensides $
15* 15*
16*****************************************************************************/ 16*****************************************************************************/
17 17
@@ -22,7 +22,7 @@
22#include "string.h" 22#include "string.h"
23 23
24const char progname = "check_rbl"; 24const char progname = "check_rbl";
25const char *revision = "$Revision$"; 25const char *revision = "$Revision: 970 $";
26//const char *copyright = "2000-2003"; 26//const char *copyright = "2000-2003";
27//const char *email = "nagiosplug-devel@lists.sourceforge.net"; 27//const char *email = "nagiosplug-devel@lists.sourceforge.net";
28 28
@@ -263,7 +263,7 @@ int call_getopt(int argc, char **argv)
263 } 263 }
264 break; 264 break;
265 case 'V': /* version */ 265 case 'V': /* version */
266 print_revision(progname,"$Revision$"); 266 print_revision(progname,"$Revision: 970 $");
267 exit(STATE_OK); 267 exit(STATE_OK);
268 case 'h': /* help */ 268 case 'h': /* help */
269 print_help(); 269 print_help();
@@ -291,7 +291,7 @@ int validate_arguments(void)
291 291
292void print_help(void) 292void print_help(void)
293{ 293{
294 print_revision(progname,"$Revision$"); 294 print_revision(progname,"$Revision: 970 $");
295 printf 295 printf
296 ("Copyright (c) 2000 Karl DeBisschop\n\n" 296 ("Copyright (c) 2000 Karl DeBisschop\n\n"
297 "This plugin uses dig to test whether the specified host is on any RBL lists.\n\n"); 297 "This plugin uses dig to test whether the specified host is on any RBL lists.\n\n");
diff --git a/contrib/check_smb.sh b/contrib/check_smb.sh
index 728535a..9d0da72 100644
--- a/contrib/check_smb.sh
+++ b/contrib/check_smb.sh
@@ -26,7 +26,7 @@
26# 26#
27PROGNAME=`basename $0` 27PROGNAME=`basename $0`
28PROGPATH=`echo $0 | /bin/sed -e 's,[\\/][^\\/][^\\/]*$,,'` 28PROGPATH=`echo $0 | /bin/sed -e 's,[\\/][^\\/][^\\/]*$,,'`
29REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'` 29REVISION=`echo '$Revision: 71 $' | sed -e 's/[^0-9.]//g'`
30 30
31 31
32. $PROGPATH/utils.sh 32. $PROGPATH/utils.sh
diff --git a/contrib/check_snmp_disk_monitor.pl b/contrib/check_snmp_disk_monitor.pl
index 7a70f71..9a2edaa 100644
--- a/contrib/check_snmp_disk_monitor.pl
+++ b/contrib/check_snmp_disk_monitor.pl
@@ -52,7 +52,7 @@ sub process_options {
52} 52}
53 53
54sub local_print_revision { 54sub local_print_revision {
55 print_revision( $PROGNAME, '$Revision$ ' ) 55 print_revision( $PROGNAME, '$Revision: 82 $ ' )
56} 56}
57 57
58sub print_usage { 58sub print_usage {
diff --git a/contrib/check_snmp_printer.pl b/contrib/check_snmp_printer.pl
index 9fc5fed..cc7943b 100755
--- a/contrib/check_snmp_printer.pl
+++ b/contrib/check_snmp_printer.pl
@@ -116,7 +116,7 @@ GetOptions
116$PROGNAME = "check_snmp_printer"; 116$PROGNAME = "check_snmp_printer";
117 117
118if ($opt_V) { 118if ($opt_V) {
119 print_revision($PROGNAME,'$Revision$'); 119 print_revision($PROGNAME,'$Revision: 795 $');
120 exit $ERRORS{'OK'}; 120 exit $ERRORS{'OK'};
121} 121}
122 122
@@ -572,7 +572,7 @@ sub print_usage () {
572} 572}
573 573
574sub print_help () { 574sub print_help () {
575 print_revision($PROGNAME,'$Revision$'); 575 print_revision($PROGNAME,'$Revision: 795 $');
576 print "Copyright (c) 2002 Subhendu Ghosh/Ethan Galstad. 576 print "Copyright (c) 2002 Subhendu Ghosh/Ethan Galstad.
577 577
578This plugin reports the status of an network printer with an SNMP management 578This plugin reports the status of an network printer with an SNMP management
diff --git a/contrib/check_snmp_process_monitor.pl b/contrib/check_snmp_process_monitor.pl
index c98ee7d..0f44597 100644
--- a/contrib/check_snmp_process_monitor.pl
+++ b/contrib/check_snmp_process_monitor.pl
@@ -91,7 +91,7 @@ sub process_options {
91} 91}
92 92
93sub local_print_revision { 93sub local_print_revision {
94 print_revision( $PROGNAME, '$Revision$ ' ) 94 print_revision( $PROGNAME, '$Revision: 84 $ ' )
95} 95}
96 96
97sub print_usage { 97sub print_usage {
diff --git a/contrib/check_snmp_procs.pl b/contrib/check_snmp_procs.pl
index 991fc71..4d19ff1 100644
--- a/contrib/check_snmp_procs.pl
+++ b/contrib/check_snmp_procs.pl
@@ -109,7 +109,7 @@ if (GetOptions(
109} 109}
110 110
111if ($opt_version) { 111if ($opt_version) {
112 print_revision($PROGNAME, "\$Revision$REVISION \$"); 112 print_revision($PROGNAME, "\$Revision: 1771 $REVISION \$");
113 exit $ERRORS{'OK'}; 113 exit $ERRORS{'OK'};
114} 114}
115 115
@@ -529,7 +529,7 @@ sub print_usage {
529 529
530# 530#
531sub print_help { 531sub print_help {
532 print_revision($PROGNAME, "\$Revision$REVISION \$"); 532 print_revision($PROGNAME, "\$Revision: 1771 $REVISION \$");
533 print "Copyright (c) 2003 David Alden 533 print "Copyright (c) 2003 David Alden
534 534
535Check if processes are running on a host via snmp 535Check if processes are running on a host via snmp
diff --git a/contrib/check_temp_cpq b/contrib/check_temp_cpq
index 14b06a2..6edae6e 100644
--- a/contrib/check_temp_cpq
+++ b/contrib/check_temp_cpq
@@ -138,7 +138,7 @@ sub print_usage () {
138 } 138 }
139 139
140sub print_help () { 140sub print_help () {
141 print_revision($PROGNAME,'$Revision$\n '); 141 print_revision($PROGNAME,'$Revision: 1113 $\n ');
142 print "Copyright (c) 2003 Rainer Duffner\n "; 142 print "Copyright (c) 2003 Rainer Duffner\n ";
143 print_usage(); 143 print_usage();
144 print "\n"; 144 print "\n";
@@ -151,7 +151,7 @@ sub print_help () {
151 } 151 }
152 152
153sub version () { 153sub version () {
154 print_revision($PROGNAME,'$Revision$ '); 154 print_revision($PROGNAME,'$Revision: 1113 $ ');
155 exit $ERRORS{'OK'}; 155 exit $ERRORS{'OK'};
156} 156}
157 157
diff --git a/contrib/check_temp_fsc b/contrib/check_temp_fsc
index 6cae859..33470ea 100644
--- a/contrib/check_temp_fsc
+++ b/contrib/check_temp_fsc
@@ -138,7 +138,7 @@ sub print_usage () {
138 } 138 }
139 139
140sub print_help () { 140sub print_help () {
141 print_revision($PROGNAME,'$Revision$\n '); 141 print_revision($PROGNAME,'$Revision: 1113 $\n ');
142 print "Copyright (c) 2003 Rainer Duffner\n "; 142 print "Copyright (c) 2003 Rainer Duffner\n ";
143 print_usage(); 143 print_usage();
144 print "\n"; 144 print "\n";
@@ -149,7 +149,7 @@ sub print_help () {
149 } 149 }
150 150
151sub version () { 151sub version () {
152 print_revision($PROGNAME,'$Revision$ '); 152 print_revision($PROGNAME,'$Revision: 1113 $ ');
153 exit $ERRORS{'OK'}; 153 exit $ERRORS{'OK'};
154} 154}
155 155
diff --git a/contrib/check_traceroute.pl b/contrib/check_traceroute.pl
index c8d497b..569dc53 100755
--- a/contrib/check_traceroute.pl
+++ b/contrib/check_traceroute.pl
@@ -1,8 +1,7 @@
1#!/usr/bin/perl 1#!/usr/bin/perl
2 2
3# $Id$ 3# $Id: check_traceroute.pl 1115 2005-01-27 10:34:16Z stanleyhopcroft $
4 4
5# $Log$
6# Revision 1.1 2005/01/27 10:34:16 stanleyhopcroft 5# Revision 1.1 2005/01/27 10:34:16 stanleyhopcroft
7# Jon Meek's check_traceroute for Mon hacked by YT for Nagios. Prob pretty weak 6# Jon Meek's check_traceroute for Mon hacked by YT for Nagios. Prob pretty weak
8# 7#
@@ -32,7 +31,7 @@ getopts('i:H:N:R:T:dhrvV');
32do { print_help ; exit $ERRORS{OK}; } 31do { print_help ; exit $ERRORS{OK}; }
33 if $opt_h ; 32 if $opt_h ;
34 33
35do { print_revision($PROGNAME, '$Revision$'); exit $ERRORS{OK}; } 34do { print_revision($PROGNAME, '$Revision: 1115 $'); exit $ERRORS{OK}; }
36 if $opt_V ; 35 if $opt_V ;
37 36
38do { print_help; exit $ERRORS{OK}; } 37do { print_help; exit $ERRORS{OK}; }
@@ -176,7 +175,7 @@ sub print_usage () {
176} 175}
177 176
178sub print_help () { 177sub print_help () {
179 print_revision($PROGNAME, '$Revision$') ; 178 print_revision($PROGNAME, '$Revision: 1115 $') ;
180 print "Copyright (c) 2004 J Meek/Karl DeBisschop 179 print "Copyright (c) 2004 J Meek/Karl DeBisschop
181 180
182This plugin checks whether traceroute to the destination succeeds and if so that the route string option (-R) matches the list of routers 181This plugin checks whether traceroute to the destination succeeds and if so that the route string option (-R) matches the list of routers
diff --git a/contrib/check_uptime.c b/contrib/check_uptime.c
index fe98123..7afeb23 100644
--- a/contrib/check_uptime.c
+++ b/contrib/check_uptime.c
@@ -9,7 +9,7 @@
9 * Based on CHECK_LOAD.C 9 * Based on CHECK_LOAD.C
10 * Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br> 10 * Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>
11 * 11 *
12 * Last Modified: $Date$ 12 * Last Modified: $Date: 2002-02-28 21:42:56 -0500 (Thu, 28 Feb 2002) $
13 * 13 *
14 * Command line: CHECK_UPTIME <host_address> 14 * Command line: CHECK_UPTIME <host_address>
15 * 15 *
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
44 if(argc != 2){ 44 if(argc != 2){
45 printf("Incorrect number of arguments supplied\n"); 45 printf("Incorrect number of arguments supplied\n");
46 printf("\n"); 46 printf("\n");
47 print_revision(argv[0],"$Revision$"); 47 print_revision(argv[0],"$Revision: 6 $");
48 printf("Copyright (c) 2000 Teresa Ramanan (tlr@redowl.org)\n"); 48 printf("Copyright (c) 2000 Teresa Ramanan (tlr@redowl.org)\n");
49 printf("\n"); 49 printf("\n");
50 printf("Usage: %s <host_address>\n",argv[0]); 50 printf("Usage: %s <host_address>\n",argv[0]);
diff --git a/contrib/check_vcs.pl b/contrib/check_vcs.pl
index 7ee0072..38afdae 100644
--- a/contrib/check_vcs.pl
+++ b/contrib/check_vcs.pl
@@ -71,7 +71,7 @@ sub print_help ();
71 $vcs_negate = ''; 71 $vcs_negate = '';
72 $vcs_result = ''; 72 $vcs_result = '';
73 $vcs_expected_result = 'ONLINE'; 73 $vcs_expected_result = 'ONLINE';
74 $plugin_revision = '$Revision$ '; 74 $plugin_revision = '$Revision: 33 $ ';
75 75
76 # Grab options from command line 76 # Grab options from command line
77 GetOptions 77 GetOptions
diff --git a/contrib/check_wins.pl b/contrib/check_wins.pl
index 0d11737..f11f864 100755
--- a/contrib/check_wins.pl
+++ b/contrib/check_wins.pl
@@ -1,8 +1,7 @@
1#!/usr/bin/perl -w 1#!/usr/bin/perl -w
2 2
3# $Id$ 3# $Id: check_wins.pl 940 2004-11-25 04:46:16Z stanleyhopcroft $
4 4
5# $Log$
6# Revision 1.3 2004/11/25 04:46:16 stanleyhopcroft 5# Revision 1.3 2004/11/25 04:46:16 stanleyhopcroft
7# Non functional tidy ups to check_wins 6# Non functional tidy ups to check_wins
8# 7#
@@ -190,7 +189,7 @@ sub print_usage () {
190} 189}
191 190
192sub print_help () { 191sub print_help () {
193 print_revision($PROGNAME,'$Revision$ '); 192 print_revision($PROGNAME,'$Revision: 940 $ ');
194 print "Copyright (c) 2001 Karl DeBisschop/S Hopcroft 193 print "Copyright (c) 2001 Karl DeBisschop/S Hopcroft
195 194
196Perl Check WINS plugin for NetSaint. 195Perl Check WINS plugin for NetSaint.
@@ -237,7 +236,7 @@ The plugin works by
237} 236}
238 237
239sub version () { 238sub version () {
240 print_revision($PROGNAME,'$Revision$ '); 239 print_revision($PROGNAME,'$Revision: 940 $ ');
241 exit $ERRORS{'OK'}; 240 exit $ERRORS{'OK'};
242} 241}
243 242
diff --git a/contrib/packet_utils.pm b/contrib/packet_utils.pm
index cd1e830..783b333 100755
--- a/contrib/packet_utils.pm
+++ b/contrib/packet_utils.pm
@@ -1,8 +1,7 @@
1package packet_utils; 1package packet_utils;
2 2
3# $Id$ 3# $Id: packet_utils.pm 1100 2005-01-25 09:12:47Z stanleyhopcroft $
4 4
5# $Log$
6# Revision 1.1 2005/01/25 09:12:47 stanleyhopcroft 5# Revision 1.1 2005/01/25 09:12:47 stanleyhopcroft
7# packet creation and dumping hacks used by check_ica* and check_lotus 6# packet creation and dumping hacks used by check_ica* and check_lotus
8# 7#
diff --git a/contrib/utils.py b/contrib/utils.py
index 73d795c..db0f1c9 100644
--- a/contrib/utils.py
+++ b/contrib/utils.py
@@ -8,7 +8,7 @@
8 8
9#========================================================================== 9#==========================================================================
10# 10#
11# Version: = '$Id$' 11# Version: = '$Id: utils.py 2 2002-02-28 06:42:51Z egalstad $'
12# 12#
13# (C) Rob W.W. Hooft, Nonius BV, 1998 13# (C) Rob W.W. Hooft, Nonius BV, 1998
14# 14#
diff --git a/doc/BRANCHING b/doc/BRANCHING
deleted file mode 100644
index d923a30..0000000
--- a/doc/BRANCHING
+++ /dev/null
@@ -1,10 +0,0 @@
1NOTES ON BRANCHING NAGIOSPLUG
2
3Questions:
4Is this necessary?
5
6Branch format: b1_4_1
7
8cvs tab -b r1_4-patches
9
10Consider the SF snapshot branches - should you remove any other branches?
diff --git a/doc/developer-guidelines.sgml b/doc/developer-guidelines.sgml
index 121549f..ed7e422 100644
--- a/doc/developer-guidelines.sgml
+++ b/doc/developer-guidelines.sgml
@@ -16,8 +16,8 @@
16 16
17 <revhistory> 17 <revhistory>
18 <revision> 18 <revision>
19 <revnumber>$Revision$</revnumber> 19 <revnumber>1796</revnumber>
20 <date>$Date$</date> 20 <date>2007-09-24 14:51:07 -0400 (Mon, 24 Sep 2007)</date>
21 </revision> 21 </revision>
22 </revhistory> 22 </revhistory>
23 23
diff --git a/lib/extra_opts.c b/lib/extra_opts.c
index 7e50c17..2939c7a 100644
--- a/lib/extra_opts.c
+++ b/lib/extra_opts.c
@@ -5,9 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2007 Nagios Plugins Development Team 6* Copyright (c) 2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date: 2008-03-15 18:42:01 -0400 (Sat, 15 Mar 2008) $
9*
10*
11* This program is free software: you can redistribute it and/or modify 8* This program is free software: you can redistribute it and/or modify
12* it under the terms of the GNU General Public License as published by 9* it under the terms of the GNU General Public License as published by
13* the Free Software Foundation, either version 3 of the License, or 10* the Free Software Foundation, either version 3 of the License, or
@@ -21,8 +18,6 @@
21* You should have received a copy of the GNU General Public License 18* You should have received a copy of the GNU General Public License
22* along with this program. If not, see <http://www.gnu.org/licenses/>. 19* along with this program. If not, see <http://www.gnu.org/licenses/>.
23* 20*
24* $Id: parse_ini.c 1950 2008-03-15 22:42:01Z dermoth $
25*
26*****************************************************************************/ 21*****************************************************************************/
27 22
28#include "common.h" 23#include "common.h"
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index c19952d..1d64a50 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -5,9 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2007 Nagios Plugins Development Team 6* Copyright (c) 2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10*
11* This program is free software: you can redistribute it and/or modify 8* This program is free software: you can redistribute it and/or modify
12* it under the terms of the GNU General Public License as published by 9* it under the terms of the GNU General Public License as published by
13* the Free Software Foundation, either version 3 of the License, or 10* the Free Software Foundation, either version 3 of the License, or
@@ -21,7 +18,6 @@
21* You should have received a copy of the GNU General Public License 18* You should have received a copy of the GNU General Public License
22* along with this program. If not, see <http://www.gnu.org/licenses/>. 19* along with this program. If not, see <http://www.gnu.org/licenses/>.
23* 20*
24* $Id$
25* 21*
26*****************************************************************************/ 22*****************************************************************************/
27 23
diff --git a/lib/tests/test_base64.c b/lib/tests/test_base64.c
index 12b9268..5103d10 100644
--- a/lib/tests/test_base64.c
+++ b/lib/tests/test_base64.c
@@ -13,7 +13,6 @@
13* You should have received a copy of the GNU General Public License 13* You should have received a copy of the GNU General Public License
14* along with this program. If not, see <http://www.gnu.org/licenses/>. 14* along with this program. If not, see <http://www.gnu.org/licenses/>.
15* 15*
16* $Id$
17* 16*
18*****************************************************************************/ 17*****************************************************************************/
19 18
diff --git a/lib/tests/test_cmd.c b/lib/tests/test_cmd.c
index 961da64..29ca42a 100644
--- a/lib/tests/test_cmd.c
+++ b/lib/tests/test_cmd.c
@@ -13,7 +13,6 @@
13* You should have received a copy of the GNU General Public License 13* You should have received a copy of the GNU General Public License
14* along with this program. If not, see <http://www.gnu.org/licenses/>. 14* along with this program. If not, see <http://www.gnu.org/licenses/>.
15* 15*
16* $Id$
17* 16*
18*****************************************************************************/ 17*****************************************************************************/
19 18
diff --git a/lib/tests/test_disk.c b/lib/tests/test_disk.c
index 06c9baa..d604222 100644
--- a/lib/tests/test_disk.c
+++ b/lib/tests/test_disk.c
@@ -13,7 +13,6 @@
13* You should have received a copy of the GNU General Public License 13* You should have received a copy of the GNU General Public License
14* along with this program. If not, see <http://www.gnu.org/licenses/>. 14* along with this program. If not, see <http://www.gnu.org/licenses/>.
15* 15*
16* $Id$
17* 16*
18*****************************************************************************/ 17*****************************************************************************/
19 18
diff --git a/lib/tests/test_ini.c b/lib/tests/test_ini.c
index 76a948b..c0853d7 100644
--- a/lib/tests/test_ini.c
+++ b/lib/tests/test_ini.c
@@ -13,7 +13,6 @@
13* You should have received a copy of the GNU General Public License 13* You should have received a copy of the GNU General Public License
14* along with this program. If not, see <http://www.gnu.org/licenses/>. 14* along with this program. If not, see <http://www.gnu.org/licenses/>.
15* 15*
16* $Id$
17* 16*
18*****************************************************************************/ 17*****************************************************************************/
19 18
diff --git a/lib/tests/test_opts.c b/lib/tests/test_opts.c
index 6d6167e..ad9a854 100644
--- a/lib/tests/test_opts.c
+++ b/lib/tests/test_opts.c
@@ -13,8 +13,6 @@
13* You should have received a copy of the GNU General Public License 13* You should have received a copy of the GNU General Public License
14* along with this program. If not, see <http://www.gnu.org/licenses/>. 14* along with this program. If not, see <http://www.gnu.org/licenses/>.
15* 15*
16* $Id: test_ini.c 1951 2008-03-16 18:10:47Z dermoth $
17*
18*****************************************************************************/ 16*****************************************************************************/
19 17
20#include "common.h" 18#include "common.h"
diff --git a/lib/tests/test_tcp.c b/lib/tests/test_tcp.c
index 9694707..6cf9394 100644
--- a/lib/tests/test_tcp.c
+++ b/lib/tests/test_tcp.c
@@ -13,7 +13,6 @@
13* You should have received a copy of the GNU General Public License 13* You should have received a copy of the GNU General Public License
14* along with this program. If not, see <http://www.gnu.org/licenses/>. 14* along with this program. If not, see <http://www.gnu.org/licenses/>.
15* 15*
16* $Id$
17* 16*
18*****************************************************************************/ 17*****************************************************************************/
19 18
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index b2a9e69..64efca2 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -13,7 +13,6 @@
13* You should have received a copy of the GNU General Public License 13* You should have received a copy of the GNU General Public License
14* along with this program. If not, see <http://www.gnu.org/licenses/>. 14* along with this program. If not, see <http://www.gnu.org/licenses/>.
15* 15*
16* $Id$
17* 16*
18*****************************************************************************/ 17*****************************************************************************/
19 18
diff --git a/lib/utils_base.c b/lib/utils_base.c
index 68f4567..d6437fc 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2006 Nagios Plugins Development Team 6* Copyright (c) 2006 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Library of useful functions for plugins 8* Library of useful functions for plugins
11* 9*
12* 10*
@@ -23,7 +21,6 @@
23* You should have received a copy of the GNU General Public License 21* You should have received a copy of the GNU General Public License
24* along with this program. If not, see <http://www.gnu.org/licenses/>. 22* along with this program. If not, see <http://www.gnu.org/licenses/>.
25* 23*
26* $Id$
27* 24*
28*****************************************************************************/ 25*****************************************************************************/
29 26
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index 5ba2f55..e10ab91 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2005-2006 Nagios Plugins Development Team 6* Copyright (c) 2005-2006 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description : 8* Description :
11* 9*
12* A simple interface to executing programs from other programs, using an 10* A simple interface to executing programs from other programs, using an
@@ -35,7 +33,6 @@
35* You should have received a copy of the GNU General Public License 33* You should have received a copy of the GNU General Public License
36* along with this program. If not, see <http://www.gnu.org/licenses/>. 34* along with this program. If not, see <http://www.gnu.org/licenses/>.
37* 35*
38* $Id$
39* 36*
40*****************************************************************************/ 37*****************************************************************************/
41 38
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
index ba2b21d..3d20f4d 100644
--- a/lib/utils_disk.c
+++ b/lib/utils_disk.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains utilities for check_disk. These are tested by libtap 10* This file contains utilities for check_disk. These are tested by libtap
@@ -25,7 +23,6 @@
25* You should have received a copy of the GNU General Public License 23* You should have received a copy of the GNU General Public License
26* along with this program. If not, see <http://www.gnu.org/licenses/>. 24* along with this program. If not, see <http://www.gnu.org/licenses/>.
27* 25*
28* $Id$
29* 26*
30*****************************************************************************/ 27*****************************************************************************/
31 28
diff --git a/lib/utils_tcp.c b/lib/utils_tcp.c
index 58d50b6..8589ce6 100644
--- a/lib/utils_tcp.c
+++ b/lib/utils_tcp.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains utilities for check_tcp. These are tested by libtap 10* This file contains utilities for check_tcp. These are tested by libtap
@@ -25,7 +23,6 @@
25* You should have received a copy of the GNU General Public License 23* You should have received a copy of the GNU General Public License
26* along with this program. If not, see <http://www.gnu.org/licenses/>. 24* along with this program. If not, see <http://www.gnu.org/licenses/>.
27* 25*
28* $Id$
29* 26*
30*****************************************************************************/ 27*****************************************************************************/
31 28
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 107d993..de8813f 100644
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -1,5 +1,11 @@
1## Process this file with automake to produce Makefile.in 1## Process this file with automake to produce Makefile.in
2 2
3NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
4 @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
5-include NP-VERSION-FILE
6
7AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
8
3VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t $(srcdir) 9VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t $(srcdir)
4 10
5INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@ 11INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@
@@ -74,3 +80,10 @@ pst3_LDFLAGS = @PST3CFLAGS@
74 80
75check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) 81check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS)
76check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS) 82check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS)
83
84all-local: .FORCE-NP-VERSION-FILE
85
86clean-local:
87 rm -f NP-VERSION-FILE
88
89.PHONY: .FORCE-NP-VERSION-FILE
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 35874a9..bdd348f 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -6,8 +6,6 @@
6* Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org) 6* Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)
7* Copyright (c) 2001-2007 Nagios Plugin Development Team 7* Copyright (c) 2001-2007 Nagios Plugin Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains the check_dhcp plugin 11* This file contains the check_dhcp plugin
@@ -32,12 +30,10 @@
32* You should have received a copy of the GNU General Public License 30* You should have received a copy of the GNU General Public License
33* along with this program. If not, see <http://www.gnu.org/licenses/>. 31* along with this program. If not, see <http://www.gnu.org/licenses/>.
34* 32*
35* $Id$
36* 33*
37*****************************************************************************/ 34*****************************************************************************/
38 35
39const char *progname = "check_dhcp"; 36const char *progname = "check_dhcp";
40const char *revision = "$Revision$";
41const char *copyright = "2001-2007"; 37const char *copyright = "2001-2007";
42const char *email = "nagiosplug-devel@lists.sourceforge.net"; 38const char *email = "nagiosplug-devel@lists.sourceforge.net";
43 39
@@ -1168,7 +1164,7 @@ int call_getopt(int argc, char **argv){
1168 break; 1164 break;
1169 1165
1170 case 'V': /* version */ 1166 case 'V': /* version */
1171 print_revision(progname,revision); 1167 print_revision(progname, NP_VERSION);
1172 exit(STATE_OK); 1168 exit(STATE_OK);
1173 1169
1174 case 'h': /* help */ 1170 case 'h': /* help */
@@ -1385,7 +1381,7 @@ void print_hardware_address(const unsigned char *address){
1385/* print usage help */ 1381/* print usage help */
1386void print_help(void){ 1382void print_help(void){
1387 1383
1388 print_revision(progname,revision); 1384 print_revision(progname, NP_VERSION);
1389 1385
1390 printf("Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)\n"); 1386 printf("Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)\n");
1391 printf (COPYRIGHT, copyright, email); 1387 printf (COPYRIGHT, copyright, email);
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index cc3f3d5..bbdfae7 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -6,8 +6,6 @@
6* Copyright (c) 2005-2008 Nagios Plugins Development Team 6* Copyright (c) 2005-2008 Nagios Plugins Development Team
7* Original Author : Andreas Ericsson <ae@op5.se> 7* Original Author : Andreas Ericsson <ae@op5.se>
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains the check_icmp plugin 11* This file contains the check_icmp plugin
@@ -35,14 +33,12 @@
35* You should have received a copy of the GNU General Public License 33* You should have received a copy of the GNU General Public License
36* along with this program. If not, see <http://www.gnu.org/licenses/>. 34* along with this program. If not, see <http://www.gnu.org/licenses/>.
37* 35*
38* $Id$
39* 36*
40*****************************************************************************/ 37*****************************************************************************/
41 38
42/* progname may change */ 39/* progname may change */
43/* char *progname = "check_icmp"; */ 40/* char *progname = "check_icmp"; */
44char *progname; 41char *progname;
45const char *revision = "$Revision$";
46const char *copyright = "2005-2008"; 42const char *copyright = "2005-2008";
47const char *email = "nagiosplug-devel@lists.sourceforge.net"; 43const char *email = "nagiosplug-devel@lists.sourceforge.net";
48 44
@@ -516,7 +512,7 @@ main(int argc, char **argv)
516 set_source_ip(optarg); 512 set_source_ip(optarg);
517 break; 513 break;
518 case 'V': /* version */ 514 case 'V': /* version */
519 /*print_revision (progname, revision);*/ /* FIXME: Why? */ 515 print_revision (progname, NP_VERSION);
520 exit (STATE_OK); 516 exit (STATE_OK);
521 case 'h': /* help */ 517 case 'h': /* help */
522 print_help (); 518 print_help ();
@@ -1272,7 +1268,7 @@ void
1272print_help(void) 1268print_help(void)
1273{ 1269{
1274 1270
1275 /*print_revision (progname, revision);*/ /* FIXME: Why? */ 1271 /*print_revision (progname);*/ /* FIXME: Why? */
1276 1272
1277 printf ("Copyright (c) 2005 Andreas Ericsson <ae@op5.se>\n"); 1273 printf ("Copyright (c) 2005 Andreas Ericsson <ae@op5.se>\n");
1278 printf (COPYRIGHT, copyright, email); 1274 printf (COPYRIGHT, copyright, email);
diff --git a/plugins-root/t/check_icmp.t b/plugins-root/t/check_icmp.t
index 11535ea..78bfd63 100644
--- a/plugins-root/t/check_icmp.t
+++ b/plugins-root/t/check_icmp.t
@@ -2,8 +2,6 @@
2# 2#
3# Ping Response Tests via check_icmp 3# Ping Response Tests via check_icmp
4# 4#
5# $Id$
6#
7 5
8use strict; 6use strict;
9use Test::More; 7use Test::More;
diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am
index 01fca20..c9e3e40 100644
--- a/plugins-scripts/Makefile.am
+++ b/plugins-scripts/Makefile.am
@@ -1,5 +1,11 @@
1## Process this file with automake to produce Makefile.in 1## Process this file with automake to produce Makefile.in
2 2
3NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
4 @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
5-include NP-VERSION-FILE
6
7export NP_VERSION:= $(NP_VERSION)
8
3SUFFIXES = .pl .sh 9SUFFIXES = .pl .sh
4 10
5VPATH=$(top_srcdir) $(top_srcdir)/plugins-scripts $(top_srcdir)/plugins-scripts/t 11VPATH=$(top_srcdir) $(top_srcdir)/plugins-scripts $(top_srcdir)/plugins-scripts/t
@@ -18,6 +24,8 @@ TESTS_ENVIRONMENT=perl -I $(top_builddir) -I $(top_srcdir)
18 24
19TESTS = @SCRIPT_TEST@ 25TESTS = @SCRIPT_TEST@
20 26
27all-local: NP-VERSION-FILE
28
21test: 29test:
22 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl 30 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
23 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl t/utils.t # utils.t is excluded from above, so manually ask to test 31 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl t/utils.t # utils.t is excluded from above, so manually ask to test
@@ -35,3 +43,8 @@ CLEANFILES=$(libexec_SCRIPTS)
35.sh : 43.sh :
36 $(AWK) -f ./subst $< > $@ 44 $(AWK) -f ./subst $< > $@
37 chmod +x $@ 45 chmod +x $@
46
47clean-local:
48 rm -f NP-VERSION-FILE
49
50.PHONY: .FORCE-NP-VERSION-FILE
diff --git a/plugins-scripts/check_breeze.pl b/plugins-scripts/check_breeze.pl
index 0e9cffb..a4e8542 100755
--- a/plugins-scripts/check_breeze.pl
+++ b/plugins-scripts/check_breeze.pl
@@ -26,7 +26,7 @@ GetOptions
26 "C=s" => \$opt_C, "community=s" => \$opt_C); 26 "C=s" => \$opt_C, "community=s" => \$opt_C);
27 27
28if ($opt_V) { 28if ($opt_V) {
29 print_revision($PROGNAME,'$Revision$'); 29 print_revision($PROGNAME,'@NP_VERSION@');
30 exit $ERRORS{'OK'}; 30 exit $ERRORS{'OK'};
31} 31}
32 32
@@ -65,7 +65,7 @@ sub print_usage () {
65} 65}
66 66
67sub print_help () { 67sub print_help () {
68 print_revision($PROGNAME,'$Revision$'); 68 print_revision($PROGNAME,'@NP_VERSION@');
69 print "Copyright (c) 2000 Jeffrey Blank/Karl DeBisschop 69 print "Copyright (c) 2000 Jeffrey Blank/Karl DeBisschop
70 70
71This plugin reports the signal strength of a Breezecom wireless equipment 71This plugin reports the signal strength of a Breezecom wireless equipment
diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
index 4f8a9a7..3f531ac 100755
--- a/plugins-scripts/check_disk_smb.pl
+++ b/plugins-scripts/check_disk_smb.pl
@@ -16,7 +16,6 @@
16# drives is a pain in the butt 16# drives is a pain in the butt
17# 2-May-2002 - SGhosh fix for embedded perl 17# 2-May-2002 - SGhosh fix for embedded perl
18# 18#
19# $Id$
20# 19#
21 20
22require 5.004; 21require 5.004;
@@ -52,7 +51,7 @@ GetOptions
52 "H=s" => \$opt_H, "hostname=s" => \$opt_H); 51 "H=s" => \$opt_H, "hostname=s" => \$opt_H);
53 52
54if ($opt_V) { 53if ($opt_V) {
55 print_revision($PROGNAME,'$Revision$'); #' 54 print_revision($PROGNAME,'@NP_VERSION@'); #'
56 exit $ERRORS{'OK'}; 55 exit $ERRORS{'OK'};
57} 56}
58 57
@@ -243,7 +242,7 @@ sub print_usage () {
243} 242}
244 243
245sub print_help () { 244sub print_help () {
246 print_revision($PROGNAME,'$Revision$'); 245 print_revision($PROGNAME,'@NP_VERSION@');
247 print "Copyright (c) 2000 Michael Anthon/Karl DeBisschop 246 print "Copyright (c) 2000 Michael Anthon/Karl DeBisschop
248 247
249Perl Check SMB Disk plugin for Nagios 248Perl Check SMB Disk plugin for Nagios
diff --git a/plugins-scripts/check_file_age.pl b/plugins-scripts/check_file_age.pl
index ca8883e..dcd5efa 100755
--- a/plugins-scripts/check_file_age.pl
+++ b/plugins-scripts/check_file_age.pl
@@ -1,5 +1,4 @@
1#!/bin/perl -w 1#!/bin/perl -w
2# $Id$
3 2
4# check_file_age.pl Copyright (C) 2003 Steven Grimm <koreth-nagios@midwinter.com> 3# check_file_age.pl Copyright (C) 2003 Steven Grimm <koreth-nagios@midwinter.com>
5# 4#
@@ -55,7 +54,7 @@ GetOptions(
55 "C=f" => \$opt_C, "critical-size=f" => \$opt_C); 54 "C=f" => \$opt_C, "critical-size=f" => \$opt_C);
56 55
57if ($opt_V) { 56if ($opt_V) {
58 print_revision($PROGNAME, '$Revision$'); 57 print_revision($PROGNAME, '@NP_VERSION@');
59 exit $ERRORS{'OK'}; 58 exit $ERRORS{'OK'};
60} 59}
61 60
@@ -102,7 +101,7 @@ sub print_usage () {
102} 101}
103 102
104sub print_help () { 103sub print_help () {
105 print_revision($PROGNAME, '$Revision$'); 104 print_revision($PROGNAME, '@NP_VERSION@');
106 print "Copyright (c) 2003 Steven Grimm\n\n"; 105 print "Copyright (c) 2003 Steven Grimm\n\n";
107 print_usage(); 106 print_usage();
108 print "\n"; 107 print "\n";
diff --git a/plugins-scripts/check_flexlm.pl b/plugins-scripts/check_flexlm.pl
index ade5843..54d933c 100755
--- a/plugins-scripts/check_flexlm.pl
+++ b/plugins-scripts/check_flexlm.pl
@@ -26,7 +26,6 @@
26# initial version: 9-10-99 Ernst-Dieter Martin edmt@infineon.com 26# initial version: 9-10-99 Ernst-Dieter Martin edmt@infineon.com
27# 27#
28# License: GPL 28# License: GPL
29# $Id$
30# 29#
31# lmstat output patches from Steve Rigler/Cliff Rice 13-Apr-2002 30# lmstat output patches from Steve Rigler/Cliff Rice 13-Apr-2002
32# srigler@marathonoil.com,cerice@marathonoil.com 31# srigler@marathonoil.com,cerice@marathonoil.com
@@ -57,7 +56,7 @@ GetOptions
57 "t=i" => \$opt_t, "timeout=i" => \$opt_t); 56 "t=i" => \$opt_t, "timeout=i" => \$opt_t);
58 57
59if ($opt_V) { 58if ($opt_V) {
60 print_revision($PROGNAME,'$Revision$'); 59 print_revision($PROGNAME,'@NP_VERSION@');
61 exit $ERRORS{'OK'}; 60 exit $ERRORS{'OK'};
62} 61}
63 62
@@ -217,7 +216,7 @@ sub print_usage () {
217} 216}
218 217
219sub print_help () { 218sub print_help () {
220 print_revision($PROGNAME,'$Revision$'); 219 print_revision($PROGNAME,'@NP_VERSION@');
221 print "Copyright (c) 2000 Ernst-Dieter Martin/Karl DeBisschop 220 print "Copyright (c) 2000 Ernst-Dieter Martin/Karl DeBisschop
222 221
223Check available flexlm license managers 222Check available flexlm license managers
diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl
index 75e852d..d0a1655 100644..100755
--- a/plugins-scripts/check_ifoperstatus.pl
+++ b/plugins-scripts/check_ifoperstatus.pl
@@ -25,7 +25,6 @@
25# Report bugs to: nagiosplug-help@lists.sourceforge.net 25# Report bugs to: nagiosplug-help@lists.sourceforge.net
26# 26#
27# 11.01.2000 Version 1.0 27# 11.01.2000 Version 1.0
28# $Id$
29# 28#
30# Patches from Guy Van Den Bergh to warn on ifadminstatus down interfaces 29# Patches from Guy Van Den Bergh to warn on ifadminstatus down interfaces
31# instead of critical. 30# instead of critical.
@@ -313,7 +312,7 @@ sub print_help() {
313 printf "intensive. Use it sparingly or not at all. -n is used to match against\n"; 312 printf "intensive. Use it sparingly or not at all. -n is used to match against\n";
314 printf "a much more descriptive ifName value in the IfXTable to verify that the\n"; 313 printf "a much more descriptive ifName value in the IfXTable to verify that the\n";
315 printf "snmpkey has not changed to some other network interface after a reboot.\n\n"; 314 printf "snmpkey has not changed to some other network interface after a reboot.\n\n";
316 print_revision($PROGNAME, '$Revision$'); 315 print_revision($PROGNAME, '@NP_VERSION@');
317 316
318} 317}
319 318
@@ -351,7 +350,7 @@ sub process_arguments() {
351 } 350 }
352 351
353 if ($opt_V) { 352 if ($opt_V) {
354 print_revision($PROGNAME,'$Revision$ '); 353 print_revision($PROGNAME,'@NP_VERSION@');
355 exit $ERRORS{'OK'}; 354 exit $ERRORS{'OK'};
356 } 355 }
357 356
diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl
index 1a168bf..bae3ffa 100755
--- a/plugins-scripts/check_ifstatus.pl
+++ b/plugins-scripts/check_ifstatus.pl
@@ -29,7 +29,6 @@
29# 29#
30# 11.01.2000 Version 1.0 30# 11.01.2000 Version 1.0
31# 31#
32# $Id$
33 32
34use POSIX; 33use POSIX;
35use strict; 34use strict;
@@ -255,7 +254,7 @@ sub print_help (){
255 printf " -t (--timeout) seconds before the plugin times out (default=$TIMEOUT)\n"; 254 printf " -t (--timeout) seconds before the plugin times out (default=$TIMEOUT)\n";
256 printf " -V (--version) Plugin version\n"; 255 printf " -V (--version) Plugin version\n";
257 printf " -h (--help) usage help \n\n"; 256 printf " -h (--help) usage help \n\n";
258 print_revision($PROGNAME, '$Revision$'); 257 print_revision($PROGNAME, '@NP_VERSION@');
259 258
260} 259}
261 260
@@ -285,7 +284,7 @@ sub process_arguments() {
285 exit $ERRORS{'OK'}; 284 exit $ERRORS{'OK'};
286 } 285 }
287 if ($opt_V) { 286 if ($opt_V) {
288 print_revision($PROGNAME,'$Revision$ '); 287 print_revision($PROGNAME,'@NP_VERSION@');
289 exit $ERRORS{'OK'}; 288 exit $ERRORS{'OK'};
290 } 289 }
291 290
diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl
index 7a90a96..cc730cf 100755
--- a/plugins-scripts/check_ircd.pl
+++ b/plugins-scripts/check_ircd.pl
@@ -7,7 +7,6 @@
7# 7#
8# Date: 1999/09/20 8# Date: 1999/09/20
9# 9#
10# $Id$
11# 10#
12# Description: This script will check to see if an IRCD is running 11# Description: This script will check to see if an IRCD is running
13# about how many users it has 12# about how many users it has
@@ -119,7 +118,7 @@ sub print_usage () {
119 118
120sub print_help () 119sub print_help ()
121{ 120{
122 print_revision($PROGNAME,'$Revision$ '); 121 print_revision($PROGNAME,'@NP_VERSION@');
123 print "Copyright (c) 2000 Richard Mayhew/Karl DeBisschop 122 print "Copyright (c) 2000 Richard Mayhew/Karl DeBisschop
124 123
125Perl Check IRCD plugin for Nagios 124Perl Check IRCD plugin for Nagios
@@ -190,7 +189,7 @@ MAIN:
190 "H=s" => \$opt_H, "hostname=s" => \$opt_H); 189 "H=s" => \$opt_H, "hostname=s" => \$opt_H);
191 190
192 if ($opt_V) { 191 if ($opt_V) {
193 print_revision($PROGNAME,'$Revision$ '); 192 print_revision($PROGNAME,'@NP_VERSION@');
194 exit $ERRORS{'OK'}; 193 exit $ERRORS{'OK'};
195 } 194 }
196 195
diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
index 6f6e68c..a1bfb48 100755
--- a/plugins-scripts/check_log.sh
+++ b/plugins-scripts/check_log.sh
@@ -71,7 +71,7 @@ TOUCH="/bin/touch"
71 71
72PROGNAME=`/bin/basename $0` 72PROGNAME=`/bin/basename $0`
73PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` 73PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
74REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'` 74REVISION="@NP_VERSION@"
75 75
76. $PROGPATH/utils.sh 76. $PROGPATH/utils.sh
77 77
diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl
index c676e41..95ef2ce 100755
--- a/plugins-scripts/check_mailq.pl
+++ b/plugins-scripts/check_mailq.pl
@@ -22,7 +22,6 @@
22# along with this program; if not, write to the Free Software 22# along with this program; if not, write to the Free Software
23# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24# 24#
25# $Id$
26# 25#
27############################################################################ 26############################################################################
28 27
@@ -522,7 +521,7 @@ sub process_arguments(){
522 ); 521 );
523 522
524 if ($opt_V) { 523 if ($opt_V) {
525 print_revision($PROGNAME,'$Revision$ '); 524 print_revision($PROGNAME,'@NP_VERSION@');
526 exit $ERRORS{'OK'}; 525 exit $ERRORS{'OK'};
527 } 526 }
528 527
@@ -580,7 +579,7 @@ sub print_usage () {
580} 579}
581 580
582sub print_help () { 581sub print_help () {
583 print_revision($PROGNAME,'$Revision$'); 582 print_revision($PROGNAME,'@NP_VERSION@');
584 print "Copyright (c) 2002 Subhendu Ghosh/Carlos Canau/Benjamin Schmid\n"; 583 print "Copyright (c) 2002 Subhendu Ghosh/Carlos Canau/Benjamin Schmid\n";
585 print "\n"; 584 print "\n";
586 print_usage(); 585 print_usage();
diff --git a/plugins-scripts/check_mssql.pl b/plugins-scripts/check_mssql.pl
index fa15476..9a8fc51 100755
--- a/plugins-scripts/check_mssql.pl
+++ b/plugins-scripts/check_mssql.pl
@@ -23,7 +23,6 @@
23# 23#
24# Report bugs to: nagiosplug-help@lists.sourceforge.net 24# Report bugs to: nagiosplug-help@lists.sourceforge.net
25# 25#
26# $Id$
27# 26#
28 27
29 28
@@ -125,7 +124,7 @@ sub process_arguments {
125 "V" => \$opt_V, "version" => \$opt_V); 124 "V" => \$opt_V, "version" => \$opt_V);
126 125
127 if (defined $opt_V) { 126 if (defined $opt_V) {
128 print_revision($PROGNAME,'$Revision$'); 127 print_revision($PROGNAME,'@NP_VERSION@');
129 exit $ERRORS{'OK'}; 128 exit $ERRORS{'OK'};
130 } 129 }
131 130
diff --git a/plugins-scripts/check_netdns.pl b/plugins-scripts/check_netdns.pl
index 6872b93..ecdbdb1 100755
--- a/plugins-scripts/check_netdns.pl
+++ b/plugins-scripts/check_netdns.pl
@@ -5,7 +5,6 @@
5# 5#
6# Copyright 2000, virCIO, LLP 6# Copyright 2000, virCIO, LLP
7# 7#
8# $Log$
9# Revision 1.3 2002/05/07 05:35:49 sghosh 8# Revision 1.3 2002/05/07 05:35:49 sghosh
10# 2nd fix for ePN 9# 2nd fix for ePN
11# 10#
diff --git a/plugins-scripts/check_ntp.pl b/plugins-scripts/check_ntp.pl
index d4175f6..5c87e0a 100755
--- a/plugins-scripts/check_ntp.pl
+++ b/plugins-scripts/check_ntp.pl
@@ -7,7 +7,6 @@
7# be installed on the system, however since it's part of the ntp suite, you 7# be installed on the system, however since it's part of the ntp suite, you
8# should already have it installed. 8# should already have it installed.
9# 9#
10# $Id$
11# 10#
12# Nothing clever done in this program - its a very simple bare basics hack to 11# Nothing clever done in this program - its a very simple bare basics hack to
13# get the job done. 12# get the job done.
@@ -97,7 +96,7 @@ GetOptions
97 "H=s" => \$opt_H, "hostname=s" => \$opt_H); 96 "H=s" => \$opt_H, "hostname=s" => \$opt_H);
98 97
99if ($opt_V) { 98if ($opt_V) {
100 print_revision($PROGNAME,'$Revision$ '); 99 print_revision($PROGNAME,'@NP_VERSION@');
101 exit $ERRORS{'OK'}; 100 exit $ERRORS{'OK'};
102} 101}
103 102
@@ -443,7 +442,7 @@ sub print_usage () {
443} 442}
444 443
445sub print_help () { 444sub print_help () {
446 print_revision($PROGNAME,'$Revision$'); 445 print_revision($PROGNAME,'@NP_VERSION@');
447 print "Copyright (c) 2003 Bo Kersey/Karl DeBisschop\n"; 446 print "Copyright (c) 2003 Bo Kersey/Karl DeBisschop\n";
448 print "\n"; 447 print "\n";
449 print_usage(); 448 print_usage();
diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
index 0a8f152..664795e 100755
--- a/plugins-scripts/check_oracle.sh
+++ b/plugins-scripts/check_oracle.sh
@@ -8,7 +8,7 @@
8 8
9PROGNAME=`basename $0` 9PROGNAME=`basename $0`
10PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` 10PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
11REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'` 11REVISION="@NP_VERSION@"
12 12
13. $PROGPATH/utils.sh 13. $PROGPATH/utils.sh
14 14
diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl
index 20c204d..d2701e9 100755
--- a/plugins-scripts/check_rpc.pl
+++ b/plugins-scripts/check_rpc.pl
@@ -15,10 +15,8 @@
15# 15#
16# initial version: 3 May 2000 by Truongchinh Nguyen and Karl DeBisschop 16# initial version: 3 May 2000 by Truongchinh Nguyen and Karl DeBisschop
17# Modified May 2002 Subhendu Ghosh - support for ePN and patches 17# Modified May 2002 Subhendu Ghosh - support for ePN and patches
18# current status: $Revision$
19# 18#
20# Copyright Notice: GPL 19# Copyright Notice: GPL
21# $Id$
22# 20#
23 21
24use strict; 22use strict;
@@ -38,13 +36,13 @@ sub print_help ();
38sub print_usage (); 36sub print_usage ();
39sub in ($$); 37sub in ($$);
40 38
41$ENV{'BASH_ENV'}=''; 39$ENV{'BASH_ENV'}='';
42$ENV{'ENV'}=''; 40$ENV{'ENV'}='';
43$ENV{'PATH'}=''; 41$ENV{'PATH'}='';
44$ENV{'LC_ALL'}='C'; 42$ENV{'LC_ALL'}='C';
45 43
46#Initialise protocol for each progname number 44#Initialise protocol for each progname number
47# 'u' for UDP, 't' for TCP 45# 'u' for UDP, 't' for TCP
48$proto[10003]='u'; 46$proto[10003]='u';
49$proto[10004]='u'; 47$proto[10004]='u';
50$proto[10007]='u'; 48$proto[10007]='u';
@@ -67,9 +65,9 @@ GetOptions(
67if ($opt_h) { print_help(); exit $ERRORS{'OK'}; } 65if ($opt_h) { print_help(); exit $ERRORS{'OK'}; }
68 66
69# -V means display version number 67# -V means display version number
70if ($opt_V) { 68if ($opt_V) {
71 print_revision($PROGNAME,'$Revision$ '); 69 print_revision($PROGNAME,'@NP_VERSION@');
72 exit $ERRORS{'OK'}; 70 exit $ERRORS{'OK'};
73} 71}
74 72
75# Hash containing all RPC program names and numbers 73# Hash containing all RPC program names and numbers
@@ -275,7 +273,7 @@ if (defined $opt_c ) {
275 }else{ 273 }else{
276 print "Version $vers is not an integer\n" if $verbose; 274 print "Version $vers is not an integer\n" if $verbose;
277 } 275 }
278 276
279 } 277 }
280}else{ 278}else{
281 get_rpcinfo(); 279 get_rpcinfo();
@@ -311,7 +309,7 @@ sub get_rpcinfo {
311 while ( $line = <CMD> ) { 309 while ( $line = <CMD> ) {
312 printf "$line " if $verbose; 310 printf "$line " if $verbose;
313 chomp $line; 311 chomp $line;
314 312
315 if ( $line =~ /program $prognum version ([0-9]*) ready and waiting/ ) { 313 if ( $line =~ /program $prognum version ([0-9]*) ready and waiting/ ) {
316 $response .= " version $1"; 314 $response .= " version $1";
317 $state = 'OK' unless $state ne 'UNKNOWN'; 315 $state = 'OK' unless $state ne 'UNKNOWN';
@@ -336,7 +334,7 @@ sub get_rpcinfo {
336 334
337 335
338sub print_help() { 336sub print_help() {
339 print_revision($PROGNAME,'$Revision$ '); 337 print_revision($PROGNAME,'@NP_VERSION@');
340 print "Copyright (c) 2002 Karl DeBisschop/Truongchinh Nguyen/Subhendu Ghosh\n"; 338 print "Copyright (c) 2002 Karl DeBisschop/Truongchinh Nguyen/Subhendu Ghosh\n";
341 print "\n"; 339 print "\n";
342 print "Check if a rpc service is registered and running using\n"; 340 print "Check if a rpc service is registered and running using\n";
diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh
index 7e1d333..ae80fc4 100755
--- a/plugins-scripts/check_sensors.sh
+++ b/plugins-scripts/check_sensors.sh
@@ -4,7 +4,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
4 4
5PROGNAME=`basename $0` 5PROGNAME=`basename $0`
6PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` 6PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
7REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'` 7REVISION="@NP_VERSION@"
8 8
9. $PROGPATH/utils.sh 9. $PROGPATH/utils.sh
10 10
diff --git a/plugins-scripts/check_wave.pl b/plugins-scripts/check_wave.pl
index fe21701..2671112 100755
--- a/plugins-scripts/check_wave.pl
+++ b/plugins-scripts/check_wave.pl
@@ -1,6 +1,5 @@
1#!/usr/bin/perl -wT 1#!/usr/bin/perl -wT
2# 2#
3# $Id$
4 3
5 4
6use strict; 5use strict;
@@ -30,7 +29,7 @@ GetOptions
30 "H=s" => \$opt_H, "hostname=s" => \$opt_H); 29 "H=s" => \$opt_H, "hostname=s" => \$opt_H);
31 30
32if ($opt_V) { 31if ($opt_V) {
33 print_revision($PROGNAME,'$Revision$'); #' 32 print_revision($PROGNAME,'@NP_VERSION@'); #'
34 exit $ERRORS{'OK'}; 33 exit $ERRORS{'OK'};
35} 34}
36 35
@@ -112,7 +111,7 @@ sub print_usage () {
112} 111}
113 112
114sub print_help () { 113sub print_help () {
115 print_revision($PROGNAME,'$Revision$'); 114 print_revision($PROGNAME,'@NP_VERSION@');
116 print "Copyright (c) 2000 Jeffery Blank/Karl DeBisschop\n"; 115 print "Copyright (c) 2000 Jeffery Blank/Karl DeBisschop\n";
117 print "\n"; 116 print "\n";
118 print_usage(); 117 print_usage();
diff --git a/plugins-scripts/subst.in b/plugins-scripts/subst.in
index 8986868..80b93d9 100644
--- a/plugins-scripts/subst.in
+++ b/plugins-scripts/subst.in
@@ -37,6 +37,9 @@ BEGIN {
37 37
38} 38}
39 39
40# Plugin revision
41/@NP_VERSION@/ {sub(/@NP_VERSION@/,ENVIRON["NP_VERSION"]);}
42
40# scripting language (first line) 43# scripting language (first line)
41 44
42/^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");} 45/^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");}
diff --git a/plugins-scripts/t/check_file_age.t b/plugins-scripts/t/check_file_age.t
index 372b9f2..384c276 100644
--- a/plugins-scripts/t/check_file_age.t
+++ b/plugins-scripts/t/check_file_age.t
@@ -2,7 +2,6 @@
2# 2#
3# check_file_age tests 3# check_file_age tests
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins-scripts/t/check_rpc.t b/plugins-scripts/t/check_rpc.t
index 9fff0ee..be8ae2f 100644
--- a/plugins-scripts/t/check_rpc.t
+++ b/plugins-scripts/t/check_rpc.t
@@ -2,7 +2,6 @@
2# 2#
3# Remote Procedure Call (RPC) Tests via check_rpc 3# Remote Procedure Call (RPC) Tests via check_rpc
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins-scripts/t/utils.t b/plugins-scripts/t/utils.t
index f37f567..9c2c569 100644
--- a/plugins-scripts/t/utils.t
+++ b/plugins-scripts/t/utils.t
@@ -2,7 +2,6 @@
2# 2#
3# utils.pm tests 3# utils.pm tests
4# 4#
5# $Id$
6# 5#
7# Run with perl t/utils.t 6# Run with perl t/utils.t
8 7
diff --git a/plugins-scripts/utils.pm.in b/plugins-scripts/utils.pm.in
index 08776f1..37cd62c 100644
--- a/plugins-scripts/utils.pm.in
+++ b/plugins-scripts/utils.pm.in
@@ -1,5 +1,4 @@
1# Utility drawer for Nagios plugins. 1# Utility drawer for Nagios plugins.
2# $Id$
3# 2#
4# This will be deprecated soon. Please use Nagios::Plugin from CPAN 3# This will be deprecated soon. Please use Nagios::Plugin from CPAN
5# for new plugins 4# for new plugins
@@ -32,8 +31,6 @@ $TIMEOUT = 15;
32sub print_revision ($$) { 31sub print_revision ($$) {
33 my $commandName = shift; 32 my $commandName = shift;
34 my $pluginRevision = shift; 33 my $pluginRevision = shift;
35 $pluginRevision =~ s/^\$Revision: //;
36 $pluginRevision =~ s/ \$\s*$//;
37 print "$commandName v$pluginRevision (@PACKAGE@ @VERSION@)\n"; 34 print "$commandName v$pluginRevision (@PACKAGE@ @VERSION@)\n";
38 print "@WARRANTY@"; 35 print "@WARRANTY@";
39} 36}
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 85e4a5d..5987690 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,5 +1,11 @@
1## Process this file with automake to produce Makefile.in 1## Process this file with automake to produce Makefile.in
2 2
3NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
4 @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
5-include NP-VERSION-FILE
6
7AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
8
3VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 9VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
4 10
5INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ 11INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
@@ -65,10 +71,10 @@ check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
65check_load_LDADD = $(BASEOBJS) popen.o 71check_load_LDADD = $(BASEOBJS) popen.o
66check_mrtg_LDADD = $(BASEOBJS) 72check_mrtg_LDADD = $(BASEOBJS)
67check_mrtgtraf_LDADD = $(BASEOBJS) 73check_mrtgtraf_LDADD = $(BASEOBJS)
68check_mysql_CFLAGS = $(MYSQLCFLAGS) 74check_mysql_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"'
69check_mysql_CPPFLAGS = $(MYSQLINCLUDE) 75check_mysql_CPPFLAGS = $(MYSQLINCLUDE)
70check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS) 76check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS)
71check_mysql_query_CFLAGS = $(MYSQLCFLAGS) 77check_mysql_query_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"'
72check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE) 78check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE)
73check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS) 79check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS)
74check_nagios_LDADD = $(BASEOBJS) runcmd.o 80check_nagios_LDADD = $(BASEOBJS) runcmd.o
@@ -153,7 +159,7 @@ getaddrinfo.o: getaddrinfo.h $(PLUGINHDRS)
153 159
154gethostbyname.o: gethostbyname.h $(PLUGINHDRS) 160gethostbyname.o: gethostbyname.h $(PLUGINHDRS)
155 161
156all-local: $(check_tcp_programs) 162all-local: $(check_tcp_programs) NP-VERSION-FILE
157 163
158$(check_tcp_programs): check_tcp 164$(check_tcp_programs): check_tcp
159 rm -f $@ 165 rm -f $@
@@ -166,6 +172,10 @@ install-exec-hook:
166 172
167clean-local: 173clean-local:
168 rm -f $(check_tcp_programs) 174 rm -f $(check_tcp_programs)
175 rm -f NP-VERSION-FILE
169 176
170uninstall-local: 177uninstall-local:
171 cd $(DESTDIR)$(libexecdir) && rm -f $(check_tcp_programs) 178 cd $(DESTDIR)$(libexecdir) && rm -f $(check_tcp_programs)
179
180.PHONY: .FORCE-NP-VERSION-FILE
181
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index 49a7c4f..3da54bc 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -7,8 +7,6 @@
7* 7*
8* Original author: Sean Finney 8* Original author: Sean Finney
9* 9*
10* Last Modified: $Date$
11*
12* Description: 10* Description:
13* 11*
14* This file contains the check_apt plugin 12* This file contains the check_apt plugin
@@ -29,12 +27,9 @@
29* You should have received a copy of the GNU General Public License 27* You should have received a copy of the GNU General Public License
30* along with this program. If not, see <http://www.gnu.org/licenses/>. 28* along with this program. If not, see <http://www.gnu.org/licenses/>.
31* 29*
32* $Id$
33*
34*****************************************************************************/ 30*****************************************************************************/
35 31
36const char *progname = "check_apt"; 32const char *progname = "check_apt";
37const char *revision = "$Revision$";
38const char *copyright = "2006-2008"; 33const char *copyright = "2006-2008";
39const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
40 35
@@ -159,7 +154,7 @@ int process_arguments (int argc, char **argv) {
159 print_help(); 154 print_help();
160 exit(STATE_OK); 155 exit(STATE_OK);
161 case 'V': 156 case 'V':
162 print_revision(progname, revision); 157 print_revision(progname, NP_VERSION);
163 exit(STATE_OK); 158 exit(STATE_OK);
164 case 'v': 159 case 'v':
165 verbose++; 160 verbose++;
@@ -404,7 +399,7 @@ char* construct_cmdline(upgrade_type u, const char *opts){
404void 399void
405print_help (void) 400print_help (void)
406{ 401{
407 print_revision(progname, revision); 402 print_revision(progname, NP_VERSION);
408 403
409 printf(_(COPYRIGHT), copyright, email); 404 printf(_(COPYRIGHT), copyright, email);
410 405
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index ce62eba..d0dbf34 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2008 Nagios Plugins Development Team 6* Copyright (c) 2000-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_by_ssh plugin 10* This file contains the check_by_ssh plugin
@@ -25,12 +23,10 @@
25* You should have received a copy of the GNU General Public License 23* You should have received a copy of the GNU General Public License
26* along with this program. If not, see <http://www.gnu.org/licenses/>. 24* along with this program. If not, see <http://www.gnu.org/licenses/>.
27* 25*
28* $Id$
29* 26*
30*****************************************************************************/ 27*****************************************************************************/
31 28
32const char *progname = "check_by_ssh"; 29const char *progname = "check_by_ssh";
33const char *revision = "$Revision$";
34const char *copyright = "2000-2008"; 30const char *copyright = "2000-2008";
35const char *email = "nagiosplug-devel@lists.sourceforge.net"; 31const char *email = "nagiosplug-devel@lists.sourceforge.net";
36 32
@@ -201,7 +197,7 @@ process_arguments (int argc, char **argv)
201 197
202 switch (c) { 198 switch (c) {
203 case 'V': /* version */ 199 case 'V': /* version */
204 print_revision (progname, revision); 200 print_revision (progname, NP_VERSION);
205 exit (STATE_OK); 201 exit (STATE_OK);
206 case 'h': /* help */ 202 case 'h': /* help */
207 print_help (); 203 print_help ();
@@ -339,7 +335,7 @@ validate_arguments (void)
339void 335void
340print_help (void) 336print_help (void)
341{ 337{
342 print_revision (progname, revision); 338 print_revision (progname, NP_VERSION);
343 339
344 printf ("Copyright (c) 1999 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"); 340 printf ("Copyright (c) 1999 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
345 printf (COPYRIGHT, copyright, email); 341 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index 04919e0..0138588 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -6,9 +6,6 @@
6* Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org) 6* Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)
7* Copyright (c) 2007 Nagios Plugins Development Team 7* Copyright (c) 2007 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11*
12* This program is free software: you can redistribute it and/or modify 9* This program is free software: you can redistribute it and/or modify
13* it under the terms of the GNU General Public License as published by 10* it under the terms of the GNU General Public License as published by
14* the Free Software Foundation, either version 3 of the License, or 11* the Free Software Foundation, either version 3 of the License, or
@@ -22,12 +19,10 @@
22* You should have received a copy of the GNU General Public License 19* You should have received a copy of the GNU General Public License
23* along with this program. If not, see <http://www.gnu.org/licenses/>. 20* along with this program. If not, see <http://www.gnu.org/licenses/>.
24* 21*
25* $Id$
26* 22*
27*****************************************************************************/ 23*****************************************************************************/
28 24
29const char *progname = "check_cluster"; 25const char *progname = "check_cluster";
30const char *revision = "$Revision$";
31const char *copyright = "2000-2007"; 26const char *copyright = "2000-2007";
32const char *email = "nagiosplug-devel@lists.sourceforge.net"; 27const char *email = "nagiosplug-devel@lists.sourceforge.net";
33 28
@@ -204,7 +199,7 @@ int process_arguments(int argc, char **argv){
204 break; 199 break;
205 200
206 case 'V': /* version */ 201 case 'V': /* version */
207 print_revision (progname, revision); 202 print_revision (progname, NP_VERSION);
208 exit (STATE_OK); 203 exit (STATE_OK);
209 break; 204 break;
210 205
@@ -228,7 +223,7 @@ int process_arguments(int argc, char **argv){
228void 223void
229print_help(void) 224print_help(void)
230{ 225{
231 print_revision(progname, revision); 226 print_revision(progname, NP_VERSION);
232 printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n"); 227 printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n");
233 printf(COPYRIGHT, copyright, email); 228 printf(COPYRIGHT, copyright, email);
234 229
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 34197ec..08be937 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2002-2008 Nagios Plugins Development Team 6* Copyright (c) 2002-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_dig plugin 10* This file contains the check_dig plugin
@@ -25,7 +23,6 @@
25* You should have received a copy of the GNU General Public License 23* You should have received a copy of the GNU General Public License
26* along with this program. If not, see <http://www.gnu.org/licenses/>. 24* along with this program. If not, see <http://www.gnu.org/licenses/>.
27* 25*
28* $Id$
29* 26*
30*****************************************************************************/ 27*****************************************************************************/
31 28
@@ -36,7 +33,6 @@
36 * because on some architectures those strings are in non-writable memory */ 33 * because on some architectures those strings are in non-writable memory */
37 34
38const char *progname = "check_dig"; 35const char *progname = "check_dig";
39const char *revision = "$Revision$";
40const char *copyright = "2002-2008"; 36const char *copyright = "2002-2008";
41const char *email = "nagiosplug-devel@lists.sourceforge.net"; 37const char *email = "nagiosplug-devel@lists.sourceforge.net";
42 38
@@ -220,7 +216,7 @@ process_arguments (int argc, char **argv)
220 print_help (); 216 print_help ();
221 exit (STATE_OK); 217 exit (STATE_OK);
222 case 'V': /* version */ 218 case 'V': /* version */
223 print_revision (progname, revision); 219 print_revision (progname, NP_VERSION);
224 exit (STATE_OK); 220 exit (STATE_OK);
225 case 'H': /* hostname */ 221 case 'H': /* hostname */
226 host_or_die(optarg); 222 host_or_die(optarg);
@@ -312,7 +308,7 @@ print_help (void)
312 308
313 asprintf (&myport, "%d", DEFAULT_PORT); 309 asprintf (&myport, "%d", DEFAULT_PORT);
314 310
315 print_revision (progname, revision); 311 print_revision (progname, NP_VERSION);
316 312
317 printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"); 313 printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
318 printf (COPYRIGHT, copyright, email); 314 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 12b77a8..98a061f 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2008 Nagios Plugins Development Team 6* Copyright (c) 1999-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_disk plugin 10* This file contains the check_disk plugin
@@ -25,13 +23,11 @@
25* You should have received a copy of the GNU General Public License 23* You should have received a copy of the GNU General Public License
26* along with this program. If not, see <http://www.gnu.org/licenses/>. 24* along with this program. If not, see <http://www.gnu.org/licenses/>.
27* 25*
28* $Id$
29* 26*
30*****************************************************************************/ 27*****************************************************************************/
31 28
32const char *progname = "check_disk"; 29const char *progname = "check_disk";
33const char *program_name = "check_disk"; /* Required for coreutils libs */ 30const char *program_name = "check_disk"; /* Required for coreutils libs */
34const char *revision = "$Revision$";
35const char *copyright = "1999-2008"; 31const char *copyright = "1999-2008";
36const char *email = "nagiosplug-devel@lists.sourceforge.net"; 32const char *email = "nagiosplug-devel@lists.sourceforge.net";
37 33
@@ -787,7 +783,7 @@ process_arguments (int argc, char **argv)
787 group = NULL; 783 group = NULL;
788 break; 784 break;
789 case 'V': /* version */ 785 case 'V': /* version */
790 print_revision (progname, revision); 786 print_revision (progname, NP_VERSION);
791 exit (STATE_OK); 787 exit (STATE_OK);
792 case 'h': /* help */ 788 case 'h': /* help */
793 print_help (); 789 print_help ();
@@ -896,7 +892,7 @@ INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be greate
896void 892void
897print_help (void) 893print_help (void)
898{ 894{
899 print_revision (progname, revision); 895 print_revision (progname, NP_VERSION);
900 896
901 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 897 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
902 printf (COPYRIGHT, copyright, email); 898 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 6bedfef..bb206a0 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2008 Nagios Plugins Development Team 6* Copyright (c) 2000-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_dns plugin 10* This file contains the check_dns plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_dns"; 32const char *progname = "check_dns";
36const char *revision = "$Revision$";
37const char *copyright = "2000-2008"; 33const char *copyright = "2000-2008";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -363,7 +359,7 @@ process_arguments (int argc, char **argv)
363 print_help (); 359 print_help ();
364 exit (STATE_OK); 360 exit (STATE_OK);
365 case 'V': /* version */ 361 case 'V': /* version */
366 print_revision (progname, revision); 362 print_revision (progname, NP_VERSION);
367 exit (STATE_OK); 363 exit (STATE_OK);
368 case 'v': /* version */ 364 case 'v': /* version */
369 verbose = TRUE; 365 verbose = TRUE;
@@ -446,7 +442,7 @@ validate_arguments ()
446void 442void
447print_help (void) 443print_help (void)
448{ 444{
449 print_revision (progname, revision); 445 print_revision (progname, NP_VERSION);
450 446
451 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 447 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
452 printf (COPYRIGHT, copyright, email); 448 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index ff600a7..8c3f535 100644
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_dummy plugin 10* This file contains the check_dummy plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_dummy"; 31const char *progname = "check_dummy";
35const char *revision = "$Revision$";
36const char *copyright = "1999-2007"; 32const char *copyright = "1999-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -55,7 +51,7 @@ main (int argc, char **argv)
55 if (argc < 2) 51 if (argc < 2)
56 usage4 (_("Could not parse arguments")); 52 usage4 (_("Could not parse arguments"));
57 else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) { 53 else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) {
58 print_revision (progname, revision); 54 print_revision (progname, NP_VERSION);
59 exit (STATE_OK); 55 exit (STATE_OK);
60 } 56 }
61 else if (strcmp (argv[1], "-h") == 0 || strcmp (argv[1], "--help") == 0) { 57 else if (strcmp (argv[1], "-h") == 0 || strcmp (argv[1], "--help") == 0) {
@@ -100,7 +96,7 @@ main (int argc, char **argv)
100void 96void
101print_help (void) 97print_help (void)
102{ 98{
103 print_revision (progname, revision); 99 print_revision (progname, NP_VERSION);
104 100
105 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 101 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
106 printf (COPYRIGHT, copyright, email); 102 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index aeb2f93..75c7860 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_disk plugin 10* This file contains the check_disk plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_fping"; 32const char *progname = "check_fping";
36const char *revision = "$Revision$";
37const char *copyright = "2000-2007"; 33const char *copyright = "2000-2007";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -264,7 +260,7 @@ process_arguments (int argc, char **argv)
264 print_help (); 260 print_help ();
265 exit (STATE_OK); 261 exit (STATE_OK);
266 case 'V': /* version */ 262 case 'V': /* version */
267 print_revision (progname, revision); 263 print_revision (progname, NP_VERSION);
268 exit (STATE_OK); 264 exit (STATE_OK);
269 case 'v': /* verbose mode */ 265 case 'v': /* verbose mode */
270 verbose = TRUE; 266 verbose = TRUE;
@@ -368,7 +364,7 @@ void
368print_help (void) 364print_help (void)
369{ 365{
370 366
371 print_revision (progname, revision); 367 print_revision (progname, NP_VERSION);
372 368
373 printf ("Copyright (c) 1999 Didi Rieder <adrieder@sbox.tu-graz.ac.at>\n"); 369 printf ("Copyright (c) 1999 Didi Rieder <adrieder@sbox.tu-graz.ac.at>\n");
374 printf (COPYRIGHT, copyright, email); 370 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_game.c b/plugins/check_game.c
index 2a23b74..235be65 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2002-2007 Nagios Plugins Development Team 6* Copyright (c) 2002-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_game plugin 10* This file contains the check_game plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_game"; 32const char *progname = "check_game";
36const char *revision = "$Revision$";
37const char *copyright = "2002-2007"; 33const char *copyright = "2002-2007";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -202,7 +198,7 @@ process_arguments (int argc, char **argv)
202 print_help (); 198 print_help ();
203 exit (STATE_OK); 199 exit (STATE_OK);
204 case 'V': /* version */ 200 case 'V': /* version */
205 print_revision (progname, revision); 201 print_revision (progname, NP_VERSION);
206 exit (STATE_OK); 202 exit (STATE_OK);
207 case 'v': /* version */ 203 case 'v': /* version */
208 verbose = TRUE; 204 verbose = TRUE;
@@ -293,7 +289,7 @@ validate_arguments (void)
293void 289void
294print_help (void) 290print_help (void)
295{ 291{
296 print_revision (progname, revision); 292 print_revision (progname, NP_VERSION);
297 293
298 printf ("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n"); 294 printf ("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n");
299 printf (COPYRIGHT, copyright, email); 295 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index c815cc7..add9cc8 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_hpjd plugin 10* This file contains the check_hpjd plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_hpjd"; 32const char *progname = "check_hpjd";
36const char *revision = "$Revision$";
37const char *copyright = "2000-2007"; 33const char *copyright = "2000-2007";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -346,7 +342,7 @@ process_arguments (int argc, char **argv)
346 community = strscpy (community, optarg); 342 community = strscpy (community, optarg);
347 break; 343 break;
348 case 'V': /* version */ 344 case 'V': /* version */
349 print_revision (progname, revision); 345 print_revision (progname, NP_VERSION);
350 exit (STATE_OK); 346 exit (STATE_OK);
351 case 'h': /* help */ 347 case 'h': /* help */
352 print_help (); 348 print_help ();
@@ -387,7 +383,7 @@ validate_arguments (void)
387void 383void
388print_help (void) 384print_help (void)
389{ 385{
390 print_revision (progname, revision); 386 print_revision (progname, NP_VERSION);
391 387
392 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 388 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
393 printf (COPYRIGHT, copyright, email); 389 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 0d499d9..f4a7e5e 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2008 Nagios Plugins Development Team 6* Copyright (c) 1999-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_http plugin 10* This file contains the check_http plugin
@@ -30,14 +28,12 @@
30* You should have received a copy of the GNU General Public License 28* You should have received a copy of the GNU General Public License
31* along with this program. If not, see <http://www.gnu.org/licenses/>. 29* along with this program. If not, see <http://www.gnu.org/licenses/>.
32* 30*
33* $Id$
34* 31*
35*****************************************************************************/ 32*****************************************************************************/
36 33
37/* splint -I. -I../../plugins -I../../lib/ -I/usr/kerberos/include/ ../../plugins/check_http.c */ 34/* splint -I. -I../../plugins -I../../lib/ -I/usr/kerberos/include/ ../../plugins/check_http.c */
38 35
39const char *progname = "check_http"; 36const char *progname = "check_http";
40const char *revision = "$Revision$";
41const char *copyright = "1999-2008"; 37const char *copyright = "1999-2008";
42const char *email = "nagiosplug-devel@lists.sourceforge.net"; 38const char *email = "nagiosplug-devel@lists.sourceforge.net";
43 39
@@ -144,8 +140,8 @@ main (int argc, char **argv)
144 /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */ 140 /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */
145 server_url = strdup(HTTP_URL); 141 server_url = strdup(HTTP_URL);
146 server_url_length = strlen(server_url); 142 server_url_length = strlen(server_url);
147 asprintf (&user_agent, "User-Agent: check_http/%s (nagios-plugins %s)", 143 asprintf (&user_agent, "User-Agent: check_http/v%s (nagios-plugins %s)",
148 clean_revstring (revision), VERSION); 144 NP_VERSION, VERSION);
149 145
150 /* Parse extra opts if any */ 146 /* Parse extra opts if any */
151 argv=np_extra_opts (&argc, argv, progname); 147 argv=np_extra_opts (&argc, argv, progname);
@@ -242,7 +238,7 @@ process_arguments (int argc, char **argv)
242 exit (STATE_OK); 238 exit (STATE_OK);
243 break; 239 break;
244 case 'V': /* version */ 240 case 'V': /* version */
245 print_revision (progname, revision); 241 print_revision (progname, NP_VERSION);
246 exit (STATE_OK); 242 exit (STATE_OK);
247 break; 243 break;
248 case 't': /* timeout period */ 244 case 't': /* timeout period */
@@ -1271,7 +1267,7 @@ char *perfd_size (int page_len)
1271void 1267void
1272print_help (void) 1268print_help (void)
1273{ 1269{
1274 print_revision (progname, revision); 1270 print_revision (progname, NP_VERSION);
1275 1271
1276 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 1272 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
1277 printf (COPYRIGHT, copyright, email); 1273 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index b0a7ef6..b0b0189 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -9,8 +9,6 @@
9* Copyright (c) 2000 Robert Dale <rdale@digital-mission.com> 9* Copyright (c) 2000 Robert Dale <rdale@digital-mission.com>
10* Copyright (c) 2000-2007 Nagios Plugins Development Team 10* Copyright (c) 2000-2007 Nagios Plugins Development Team
11* 11*
12* Last Modified: $Date$
13*
14* Description: 12* Description:
15* 13*
16* This file contains the check_ide_smart plugin 14* This file contains the check_ide_smart plugin
@@ -32,12 +30,10 @@
32* You should have received a copy of the GNU General Public License 30* You should have received a copy of the GNU General Public License
33* along with this program. If not, see <http://www.gnu.org/licenses/>. 31* along with this program. If not, see <http://www.gnu.org/licenses/>.
34* 32*
35* $Id$
36* 33*
37*****************************************************************************/ 34*****************************************************************************/
38 35
39const char *progname = "check_ide_smart"; 36const char *progname = "check_ide_smart";
40const char *revision = "$Revision$";
41const char *copyright = "1998-2007"; 37const char *copyright = "1998-2007";
42const char *email = "nagiosplug-devel@lists.sourceforge.net"; 38const char *email = "nagiosplug-devel@lists.sourceforge.net";
43 39
@@ -211,7 +207,7 @@ main (int argc, char *argv[])
211 print_help (); 207 print_help ();
212 return STATE_OK; 208 return STATE_OK;
213 case 'V': 209 case 'V':
214 print_revision (progname, revision); 210 print_revision (progname, NP_VERSION);
215 return STATE_OK; 211 return STATE_OK;
216 default: 212 default:
217 usage5 (); 213 usage5 ();
@@ -481,7 +477,7 @@ smart_read_thresholds (int fd, thresholds_t * thresholds)
481void 477void
482print_help (void) 478print_help (void)
483{ 479{
484 print_revision (progname, revision); 480 print_revision (progname, NP_VERSION);
485 481
486 printf ("Nagios feature - 1999 Robert Dale <rdale@digital-mission.com>\n"); 482 printf ("Nagios feature - 1999 Robert Dale <rdale@digital-mission.com>\n");
487 printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n"); 483 printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n");
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index d0134a0..7ef4509 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2008 Nagios Plugins Development Team 6* Copyright (c) 2000-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_ldap plugin 10* This file contains the check_ldap plugin
@@ -25,13 +23,11 @@
25* You should have received a copy of the GNU General Public License 23* You should have received a copy of the GNU General Public License
26* along with this program. If not, see <http://www.gnu.org/licenses/>. 24* along with this program. If not, see <http://www.gnu.org/licenses/>.
27* 25*
28* $Id$
29* 26*
30*****************************************************************************/ 27*****************************************************************************/
31 28
32/* progname may be check_ldaps */ 29/* progname may be check_ldaps */
33char *progname = "check_ldap"; 30char *progname = "check_ldap";
34const char *revision = "$Revision$";
35const char *copyright = "2000-2008"; 31const char *copyright = "2000-2008";
36const char *email = "nagiosplug-devel@lists.sourceforge.net"; 32const char *email = "nagiosplug-devel@lists.sourceforge.net";
37 33
@@ -289,7 +285,7 @@ process_arguments (int argc, char **argv)
289 print_help (); 285 print_help ();
290 exit (STATE_OK); 286 exit (STATE_OK);
291 case 'V': /* version */ 287 case 'V': /* version */
292 print_revision (progname, revision); 288 print_revision (progname, NP_VERSION);
293 exit (STATE_OK); 289 exit (STATE_OK);
294 case 't': /* timeout period */ 290 case 't': /* timeout period */
295 if (!is_intnonneg (optarg)) 291 if (!is_intnonneg (optarg))
@@ -390,7 +386,7 @@ print_help (void)
390 char *myport; 386 char *myport;
391 asprintf (&myport, "%d", DEFAULT_PORT); 387 asprintf (&myport, "%d", DEFAULT_PORT);
392 388
393 print_revision (progname, revision); 389 print_revision (progname, NP_VERSION);
394 390
395 printf ("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n"); 391 printf ("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n");
396 printf (COPYRIGHT, copyright, email); 392 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 5ff9a8c..940d37e 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_load plugin 10* This file contains the check_load plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_load"; 31const char *progname = "check_load";
35const char *revision = "$Revision$";
36const char *copyright = "1999-2007"; 32const char *copyright = "1999-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -245,7 +241,7 @@ process_arguments (int argc, char **argv)
245 take_into_account_cpus = 1; 241 take_into_account_cpus = 1;
246 break; 242 break;
247 case 'V': /* version */ 243 case 'V': /* version */
248 print_revision (progname, revision); 244 print_revision (progname, NP_VERSION);
249 exit (STATE_OK); 245 exit (STATE_OK);
250 case 'h': /* help */ 246 case 'h': /* help */
251 print_help (); 247 print_help ();
@@ -298,7 +294,7 @@ validate_arguments (void)
298void 294void
299print_help (void) 295print_help (void)
300{ 296{
301 print_revision (progname, revision); 297 print_revision (progname, NP_VERSION);
302 298
303 printf ("Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>\n"); 299 printf ("Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>\n");
304 printf (COPYRIGHT, copyright, email); 300 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index a0bdbeb..550326b 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_mrtg plugin 10* This file contains the check_mrtg plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_mrtg"; 32const char *progname = "check_mrtg";
36const char *revision = "$Revision$";
37const char *copyright = "1999-2007"; 33const char *copyright = "1999-2007";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -237,7 +233,7 @@ process_arguments (int argc, char **argv)
237 units = optarg; 233 units = optarg;
238 break; 234 break;
239 case 'V': /* version */ 235 case 'V': /* version */
240 print_revision (progname, revision); 236 print_revision (progname, NP_VERSION);
241 exit (STATE_OK); 237 exit (STATE_OK);
242 case 'h': /* help */ 238 case 'h': /* help */
243 print_help (); 239 print_help ();
@@ -317,7 +313,7 @@ validate_arguments (void)
317void 313void
318print_help (void) 314print_help (void)
319{ 315{
320 print_revision (progname, revision); 316 print_revision (progname, NP_VERSION);
321 317
322 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 318 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
323 printf (COPYRIGHT, copyright, email); 319 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index 1911d56..3232f1e 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_mtrgtraf plugin 10* This file contains the check_mtrgtraf plugin
@@ -28,7 +26,6 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
@@ -36,7 +33,6 @@
36#include "utils.h" 33#include "utils.h"
37 34
38const char *progname = "check_mrtgtraf"; 35const char *progname = "check_mrtgtraf";
39const char *revision = "$Revision$";
40const char *copyright = "1999-2007"; 36const char *copyright = "1999-2007";
41const char *email = "nagiosplug-devel@lists.sourceforge.net"; 37const char *email = "nagiosplug-devel@lists.sourceforge.net";
42 38
@@ -273,7 +269,7 @@ process_arguments (int argc, char **argv)
273 &outgoing_warning_threshold); 269 &outgoing_warning_threshold);
274 break; 270 break;
275 case 'V': /* version */ 271 case 'V': /* version */
276 print_revision (progname, revision); 272 print_revision (progname, NP_VERSION);
277 exit (STATE_OK); 273 exit (STATE_OK);
278 case 'h': /* help */ 274 case 'h': /* help */
279 print_help (); 275 print_help ();
@@ -331,7 +327,7 @@ validate_arguments (void)
331void 327void
332print_help (void) 328print_help (void)
333{ 329{
334 print_revision (progname, revision); 330 print_revision (progname, NP_VERSION);
335 331
336 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 332 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
337 printf (COPYRIGHT, copyright, email); 333 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 77f3b89..a1a6376 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -7,8 +7,6 @@
7* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) 7* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
8* Copyright (c) 1999-2007 Nagios Plugins Development Team 8* Copyright (c) 1999-2007 Nagios Plugins Development Team
9* 9*
10* Last Modified: $Date$
11*
12* Description: 10* Description:
13* 11*
14* This file contains the check_mysql plugin 12* This file contains the check_mysql plugin
@@ -29,12 +27,10 @@
29* You should have received a copy of the GNU General Public License 27* You should have received a copy of the GNU General Public License
30* along with this program. If not, see <http://www.gnu.org/licenses/>. 28* along with this program. If not, see <http://www.gnu.org/licenses/>.
31* 29*
32* $Id$
33* 30*
34*****************************************************************************/ 31*****************************************************************************/
35 32
36const char *progname = "check_mysql"; 33const char *progname = "check_mysql";
37const char *revision = "$Revision$";
38const char *copyright = "1999-2007"; 34const char *copyright = "1999-2007";
39const char *email = "nagiosplug-devel@lists.sourceforge.net"; 35const char *email = "nagiosplug-devel@lists.sourceforge.net";
40 36
@@ -310,7 +306,7 @@ process_arguments (int argc, char **argv)
310 critical = optarg; 306 critical = optarg;
311 break; 307 break;
312 case 'V': /* version */ 308 case 'V': /* version */
313 print_revision (progname, revision); 309 print_revision (progname, NP_VERSION);
314 exit (STATE_OK); 310 exit (STATE_OK);
315 case 'h': /* help */ 311 case 'h': /* help */
316 print_help (); 312 print_help ();
@@ -377,7 +373,7 @@ print_help (void)
377 char *myport; 373 char *myport;
378 asprintf (&myport, "%d", MYSQL_PORT); 374 asprintf (&myport, "%d", MYSQL_PORT);
379 375
380 print_revision (progname, revision); 376 print_revision (progname, NP_VERSION);
381 377
382 printf (_(COPYRIGHT), copyright, email); 378 printf (_(COPYRIGHT), copyright, email);
383 379
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index a92b857..802e345 100644
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -6,8 +6,6 @@
6* Copyright (c) 2006-2007 Nagios Plugins Development Team 6* Copyright (c) 2006-2007 Nagios Plugins Development Team
7* Original code from check_mysql, copyright 1999 Didi Rieder 7* Original code from check_mysql, copyright 1999 Didi Rieder
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains the check_mysql_query plugin 11* This file contains the check_mysql_query plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_mysql_query"; 32const char *progname = "check_mysql_query";
36const char *revision = "$Revision$";
37const char *copyright = "1999-2007"; 33const char *copyright = "1999-2007";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -231,7 +227,7 @@ process_arguments (int argc, char **argv)
231 verbose++; 227 verbose++;
232 break; 228 break;
233 case 'V': /* version */ 229 case 'V': /* version */
234 print_revision (progname, revision); 230 print_revision (progname, NP_VERSION);
235 exit (STATE_OK); 231 exit (STATE_OK);
236 case 'h': /* help */ 232 case 'h': /* help */
237 print_help (); 233 print_help ();
@@ -286,7 +282,7 @@ print_help (void)
286 char *myport; 282 char *myport;
287 asprintf (&myport, "%d", MYSQL_PORT); 283 asprintf (&myport, "%d", MYSQL_PORT);
288 284
289 print_revision (progname, revision); 285 print_revision (progname, NP_VERSION);
290 286
291 printf (_(COPYRIGHT), copyright, email); 287 printf (_(COPYRIGHT), copyright, email);
292 288
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index a2debe2..954ff71 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_nagios plugin 10* This file contains the check_nagios plugin
@@ -31,12 +29,10 @@
31* You should have received a copy of the GNU General Public License 29* You should have received a copy of the GNU General Public License
32* along with this program. If not, see <http://www.gnu.org/licenses/>. 30* along with this program. If not, see <http://www.gnu.org/licenses/>.
33* 31*
34* $Id$
35* 32*
36*****************************************************************************/ 33*****************************************************************************/
37 34
38const char *progname = "check_nagios"; 35const char *progname = "check_nagios";
39const char *revision = "$Revision$";
40const char *copyright = "1999-2007"; 36const char *copyright = "1999-2007";
41const char *email = "nagiosplug-devel@lists.sourceforge.net"; 37const char *email = "nagiosplug-devel@lists.sourceforge.net";
42 38
@@ -240,7 +236,7 @@ process_arguments (int argc, char **argv)
240 print_help (); 236 print_help ();
241 exit (STATE_OK); 237 exit (STATE_OK);
242 case 'V': /* version */ 238 case 'V': /* version */
243 print_revision (progname, revision); 239 print_revision (progname, NP_VERSION);
244 exit (STATE_OK); 240 exit (STATE_OK);
245 case 'F': /* status log */ 241 case 'F': /* status log */
246 status_log = optarg; 242 status_log = optarg;
@@ -278,7 +274,7 @@ process_arguments (int argc, char **argv)
278void 274void
279print_help (void) 275print_help (void)
280{ 276{
281 print_revision (progname, revision); 277 print_revision (progname, NP_VERSION);
282 278
283 printf (_(COPYRIGHT), copyright, email); 279 printf (_(COPYRIGHT), copyright, email);
284 280
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index a0e5c11..4d9157a 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -6,8 +6,6 @@
6* Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com) 6* Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com)
7* Copyright (c) 2003-2007 Nagios Plugins Development Team 7* Copyright (c) 2003-2007 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains the check_nt plugin 11* This file contains the check_nt plugin
@@ -31,12 +29,10 @@
31* You should have received a copy of the GNU General Public License 29* You should have received a copy of the GNU General Public License
32* along with this program. If not, see <http://www.gnu.org/licenses/>. 30* along with this program. If not, see <http://www.gnu.org/licenses/>.
33* 31*
34* $Id$
35* 32*
36*****************************************************************************/ 33*****************************************************************************/
37 34
38const char *progname = "check_nt"; 35const char *progname = "check_nt";
39const char *revision = "$Revision$";
40const char *copyright = "2000-2007"; 36const char *copyright = "2000-2007";
41const char *email = "nagiosplug-devel@lists.sourceforge.net"; 37const char *email = "nagiosplug-devel@lists.sourceforge.net";
42 38
@@ -517,7 +513,7 @@ int process_arguments(int argc, char **argv){
517 print_help(); 513 print_help();
518 exit(STATE_OK); 514 exit(STATE_OK);
519 case 'V': /* version */ 515 case 'V': /* version */
520 print_revision(progname,revision); 516 print_revision(progname, NP_VERSION);
521 exit(STATE_OK); 517 exit(STATE_OK);
522 case 'H': /* hostname */ 518 case 'H': /* hostname */
523 if (server_address) free(server_address); 519 if (server_address) free(server_address);
@@ -637,7 +633,7 @@ void preparelist(char *string) {
637 633
638void print_help(void) 634void print_help(void)
639{ 635{
640 print_revision(progname,revision); 636 print_revision(progname, NP_VERSION);
641 637
642 printf ("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n"); 638 printf ("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n");
643 printf (COPYRIGHT, copyright, email); 639 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 20ecf64..ada7f0c 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -6,8 +6,6 @@
6* Copyright (c) 2006 Sean Finney <seanius@seanius.net> 6* Copyright (c) 2006 Sean Finney <seanius@seanius.net>
7* Copyright (c) 2006-2008 Nagios Plugins Development Team 7* Copyright (c) 2006-2008 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains the check_ntp plugin 11* This file contains the check_ntp plugin
@@ -29,12 +27,10 @@
29* You should have received a copy of the GNU General Public License 27* You should have received a copy of the GNU General Public License
30* along with this program. If not, see <http://www.gnu.org/licenses/>. 28* along with this program. If not, see <http://www.gnu.org/licenses/>.
31* 29*
32* $Id$
33* 30*
34*****************************************************************************/ 31*****************************************************************************/
35 32
36const char *progname = "check_ntp"; 33const char *progname = "check_ntp";
37const char *revision = "$Revision$";
38const char *copyright = "2006-2008"; 34const char *copyright = "2006-2008";
39const char *email = "nagiosplug-devel@lists.sourceforge.net"; 35const char *email = "nagiosplug-devel@lists.sourceforge.net";
40 36
@@ -682,7 +678,7 @@ int process_arguments(int argc, char **argv){
682 exit(STATE_OK); 678 exit(STATE_OK);
683 break; 679 break;
684 case 'V': 680 case 'V':
685 print_revision(progname, revision); 681 print_revision(progname, NP_VERSION);
686 exit(STATE_OK); 682 exit(STATE_OK);
687 break; 683 break;
688 case 'v': 684 case 'v':
@@ -836,7 +832,7 @@ int main(int argc, char *argv[]){
836 832
837 833
838void print_help(void){ 834void print_help(void){
839 print_revision(progname, revision); 835 print_revision(progname, NP_VERSION);
840 836
841 printf ("Copyright (c) 2006 Sean Finney\n"); 837 printf ("Copyright (c) 2006 Sean Finney\n");
842 printf (COPYRIGHT, copyright, email); 838 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 17876dd..acca17b 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -6,8 +6,6 @@
6* Copyright (c) 2006 Sean Finney <seanius@seanius.net> 6* Copyright (c) 2006 Sean Finney <seanius@seanius.net>
7* Copyright (c) 2006-2008 Nagios Plugins Development Team 7* Copyright (c) 2006-2008 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains the check_ntp_peer plugin 11* This file contains the check_ntp_peer plugin
@@ -34,12 +32,10 @@
34* You should have received a copy of the GNU General Public License 32* You should have received a copy of the GNU General Public License
35* along with this program. If not, see <http://www.gnu.org/licenses/>. 33* along with this program. If not, see <http://www.gnu.org/licenses/>.
36* 34*
37* $Id$
38* 35*
39*****************************************************************************/ 36*****************************************************************************/
40 37
41const char *progname = "check_ntp_peer"; 38const char *progname = "check_ntp_peer";
42const char *revision = "$Revision$";
43const char *copyright = "2006-2008"; 39const char *copyright = "2006-2008";
44const char *email = "nagiosplug-devel@lists.sourceforge.net"; 40const char *email = "nagiosplug-devel@lists.sourceforge.net";
45 41
@@ -492,7 +488,7 @@ int process_arguments(int argc, char **argv){
492 exit(STATE_OK); 488 exit(STATE_OK);
493 break; 489 break;
494 case 'V': 490 case 'V':
495 print_revision(progname, revision); 491 print_revision(progname, NP_VERSION);
496 exit(STATE_OK); 492 exit(STATE_OK);
497 break; 493 break;
498 case 'v': 494 case 'v':
@@ -671,7 +667,7 @@ int main(int argc, char *argv[]){
671 667
672 668
673void print_help(void){ 669void print_help(void){
674 print_revision(progname, revision); 670 print_revision(progname, NP_VERSION);
675 671
676 printf ("Copyright (c) 2006 Sean Finney\n"); 672 printf ("Copyright (c) 2006 Sean Finney\n");
677 printf (COPYRIGHT, copyright, email); 673 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index a5b122f..c7c7a75 100644
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -6,8 +6,6 @@
6* Copyright (c) 2006 Sean Finney <seanius@seanius.net> 6* Copyright (c) 2006 Sean Finney <seanius@seanius.net>
7* Copyright (c) 2006-2008 Nagios Plugins Development Team 7* Copyright (c) 2006-2008 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains the check_ntp_time plugin 11* This file contains the check_ntp_time plugin
@@ -33,12 +31,10 @@
33* You should have received a copy of the GNU General Public License 31* You should have received a copy of the GNU General Public License
34* along with this program. If not, see <http://www.gnu.org/licenses/>. 32* along with this program. If not, see <http://www.gnu.org/licenses/>.
35* 33*
36* $Id$
37* 34*
38*****************************************************************************/ 35*****************************************************************************/
39 36
40const char *progname = "check_ntp_time"; 37const char *progname = "check_ntp_time";
41const char *revision = "$Revision$";
42const char *copyright = "2006-2008"; 38const char *copyright = "2006-2008";
43const char *email = "nagiosplug-devel@lists.sourceforge.net"; 39const char *email = "nagiosplug-devel@lists.sourceforge.net";
44 40
@@ -476,7 +472,7 @@ int process_arguments(int argc, char **argv){
476 exit(STATE_OK); 472 exit(STATE_OK);
477 break; 473 break;
478 case 'V': 474 case 'V':
479 print_revision(progname, revision); 475 print_revision(progname, NP_VERSION);
480 exit(STATE_OK); 476 exit(STATE_OK);
481 break; 477 break;
482 case 'v': 478 case 'v':
@@ -594,7 +590,7 @@ int main(int argc, char *argv[]){
594} 590}
595 591
596void print_help(void){ 592void print_help(void){
597 print_revision(progname, revision); 593 print_revision(progname, NP_VERSION);
598 594
599 printf ("Copyright (c) 2006 Sean Finney\n"); 595 printf ("Copyright (c) 2006 Sean Finney\n");
600 printf (COPYRIGHT, copyright, email); 596 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index c0e5ece..72a47b1 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_nwstat plugin 10* This file contains the check_nwstat plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_nwstat"; 32const char *progname = "check_nwstat";
36const char *revision = "$Revision$";
37const char *copyright = "2000-2007"; 33const char *copyright = "2000-2007";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -1360,7 +1356,7 @@ int process_arguments(int argc, char **argv) {
1360 print_help(); 1356 print_help();
1361 exit(STATE_OK); 1357 exit(STATE_OK);
1362 case 'V': /* version */ 1358 case 'V': /* version */
1363 print_revision(progname, revision); 1359 print_revision(progname, NP_VERSION);
1364 exit(STATE_OK); 1360 exit(STATE_OK);
1365 case 'H': /* hostname */ 1361 case 'H': /* hostname */
1366 server_address=optarg; 1362 server_address=optarg;
@@ -1597,7 +1593,7 @@ void print_help(void)
1597 char *myport; 1593 char *myport;
1598 asprintf (&myport, "%d", PORT); 1594 asprintf (&myport, "%d", PORT);
1599 1595
1600 print_revision (progname, revision); 1596 print_revision (progname, NP_VERSION);
1601 1597
1602 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 1598 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
1603 printf (COPYRIGHT, copyright, email); 1599 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index af04d3b..1d9ec8c 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_overcr plugin 10* This file contains the check_overcr plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_overcr"; 32const char *progname = "check_overcr";
36const char *revision = "$Revision$";
37const char *copyright = "2000-2007"; 33const char *copyright = "2000-2007";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -346,7 +342,7 @@ process_arguments (int argc, char **argv)
346 print_help (); 342 print_help ();
347 exit (STATE_OK); 343 exit (STATE_OK);
348 case 'V': /* version */ 344 case 'V': /* version */
349 print_revision (progname, revision); 345 print_revision (progname, NP_VERSION);
350 exit (STATE_OK); 346 exit (STATE_OK);
351 case 'H': /* hostname */ 347 case 'H': /* hostname */
352 server_address = optarg; 348 server_address = optarg;
@@ -415,7 +411,7 @@ print_help (void)
415 char *myport; 411 char *myport;
416 asprintf (&myport, "%d", PORT); 412 asprintf (&myport, "%d", PORT);
417 413
418 print_revision (progname, revision); 414 print_revision (progname, NP_VERSION);
419 415
420 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 416 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
421 printf (COPYRIGHT, copyright, email); 417 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 869ef67..abe721b 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_pgsql plugin 10* This file contains the check_pgsql plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_pgsql"; 31const char *progname = "check_pgsql";
35const char *revision = "$Revision$";
36const char *copyright = "1999-2007"; 32const char *copyright = "1999-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -231,7 +227,7 @@ process_arguments (int argc, char **argv)
231 print_help (); 227 print_help ();
232 exit (STATE_OK); 228 exit (STATE_OK);
233 case 'V': /* version */ 229 case 'V': /* version */
234 print_revision (progname, revision); 230 print_revision (progname, NP_VERSION);
235 exit (STATE_OK); 231 exit (STATE_OK);
236 case 't': /* timeout period */ 232 case 't': /* timeout period */
237 if (!is_integer (optarg)) 233 if (!is_integer (optarg))
@@ -404,7 +400,7 @@ print_help (void)
404 400
405 asprintf (&myport, "%d", DEFAULT_PORT); 401 asprintf (&myport, "%d", DEFAULT_PORT);
406 402
407 print_revision (progname, revision); 403 print_revision (progname, NP_VERSION);
408 404
409 printf (COPYRIGHT, copyright, email); 405 printf (COPYRIGHT, copyright, email);
410 406
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index c457ad6..8c4c0e6 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_ping plugin 10* This file contains the check_ping plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_ping"; 31const char *progname = "check_ping";
35const char *revision = "$Revision$";
36const char *copyright = "2000-2007"; 32const char *copyright = "2000-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -231,7 +227,7 @@ process_arguments (int argc, char **argv)
231 exit (STATE_OK); 227 exit (STATE_OK);
232 break; 228 break;
233 case 'V': /* version */ 229 case 'V': /* version */
234 print_revision (progname, revision); 230 print_revision (progname, NP_VERSION);
235 exit (STATE_OK); 231 exit (STATE_OK);
236 break; 232 break;
237 case 't': /* timeout period */ 233 case 't': /* timeout period */
@@ -555,7 +551,7 @@ error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)
555void 551void
556print_help (void) 552print_help (void)
557{ 553{
558 print_revision (progname, revision); 554 print_revision (progname, NP_VERSION);
559 555
560 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 556 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
561 printf (COPYRIGHT, copyright, email); 557 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 4aaeddb..4c72950 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2008 Nagios Plugins Development Team 6* Copyright (c) 2000-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_procs plugin 10* This file contains the check_procs plugin
@@ -30,13 +28,11 @@
30* You should have received a copy of the GNU General Public License 28* You should have received a copy of the GNU General Public License
31* along with this program. If not, see <http://www.gnu.org/licenses/>. 29* along with this program. If not, see <http://www.gnu.org/licenses/>.
32* 30*
33* $Id$
34* 31*
35*****************************************************************************/ 32*****************************************************************************/
36 33
37const char *progname = "check_procs"; 34const char *progname = "check_procs";
38const char *program_name = "check_procs"; /* Required for coreutils libs */ 35const char *program_name = "check_procs"; /* Required for coreutils libs */
39const char *revision = "$Revision$";
40const char *copyright = "2000-2008"; 36const char *copyright = "2000-2008";
41const char *email = "nagiosplug-devel@lists.sourceforge.net"; 37const char *email = "nagiosplug-devel@lists.sourceforge.net";
42 38
@@ -361,7 +357,7 @@ process_arguments (int argc, char **argv)
361 print_help (); 357 print_help ();
362 exit (STATE_OK); 358 exit (STATE_OK);
363 case 'V': /* version */ 359 case 'V': /* version */
364 print_revision (progname, revision); 360 print_revision (progname, NP_VERSION);
365 exit (STATE_OK); 361 exit (STATE_OK);
366 case 't': /* timeout period */ 362 case 't': /* timeout period */
367 if (!is_integer (optarg)) 363 if (!is_integer (optarg))
@@ -674,7 +670,7 @@ convert_to_seconds(char *etime) {
674void 670void
675print_help (void) 671print_help (void)
676{ 672{
677 print_revision (progname, revision); 673 print_revision (progname, NP_VERSION);
678 674
679 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 675 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
680 printf (COPYRIGHT, copyright, email); 676 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index e0b0e2c..98f6bf9 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2008 Nagios Plugins Development Team 6* Copyright (c) 1999-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_radius plugin 10* This file contains the check_radius plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_radius"; 31const char *progname = "check_radius";
35const char *revision = "$Revision$";
36const char *copyright = "2000-2008"; 32const char *copyright = "2000-2008";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -239,7 +235,7 @@ process_arguments (int argc, char **argv)
239 print_help (); 235 print_help ();
240 exit (OK); 236 exit (OK);
241 case 'V': /* version */ 237 case 'V': /* version */
242 print_revision (progname, revision); 238 print_revision (progname, NP_VERSION);
243 exit (OK); 239 exit (OK);
244 case 'v': /* verbose mode */ 240 case 'v': /* verbose mode */
245 verbose = TRUE; 241 verbose = TRUE;
@@ -312,7 +308,7 @@ print_help (void)
312 char *myport; 308 char *myport;
313 asprintf (&myport, "%d", PW_AUTH_UDP_PORT); 309 asprintf (&myport, "%d", PW_AUTH_UDP_PORT);
314 310
315 print_revision (progname, revision); 311 print_revision (progname, NP_VERSION);
316 312
317 printf ("Copyright (c) 1999 Robert August Vincent II\n"); 313 printf ("Copyright (c) 1999 Robert August Vincent II\n");
318 printf (COPYRIGHT, copyright, email); 314 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_real.c b/plugins/check_real.c
index d333c2a..cbc3103 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_real plugin 10* This file contains the check_real plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_real"; 31const char *progname = "check_real";
35const char *revision = "$Revision$";
36const char *copyright = "2000-2007"; 32const char *copyright = "2000-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -361,7 +357,7 @@ process_arguments (int argc, char **argv)
361 } 357 }
362 break; 358 break;
363 case 'V': /* version */ 359 case 'V': /* version */
364 print_revision (progname, revision); 360 print_revision (progname, NP_VERSION);
365 exit (STATE_OK); 361 exit (STATE_OK);
366 case 'h': /* help */ 362 case 'h': /* help */
367 print_help (); 363 print_help ();
@@ -409,7 +405,7 @@ print_help (void)
409 char *myport; 405 char *myport;
410 asprintf (&myport, "%d", PORT); 406 asprintf (&myport, "%d", PORT);
411 407
412 print_revision (progname, revision); 408 print_revision (progname, NP_VERSION);
413 409
414 printf ("Copyright (c) 1999 Pedro Leite <leite@cic.ua.pt>\n"); 410 printf ("Copyright (c) 1999 Pedro Leite <leite@cic.ua.pt>\n");
415 printf (COPYRIGHT, copyright, email); 411 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 4986fe6..6040aa1 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_smtp plugin 10* This file contains the check_smtp plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_smtp"; 31const char *progname = "check_smtp";
35const char *revision = "$Revision$";
36const char *copyright = "2000-2007"; 32const char *copyright = "2000-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -620,7 +616,7 @@ process_arguments (int argc, char **argv)
620#endif 616#endif
621 break; 617 break;
622 case 'V': /* version */ 618 case 'V': /* version */
623 print_revision (progname, revision); 619 print_revision (progname, NP_VERSION);
624 exit (STATE_OK); 620 exit (STATE_OK);
625 case 'h': /* help */ 621 case 'h': /* help */
626 print_help (); 622 print_help ();
@@ -762,7 +758,7 @@ print_help (void)
762 char *myport; 758 char *myport;
763 asprintf (&myport, "%d", SMTP_PORT); 759 asprintf (&myport, "%d", SMTP_PORT);
764 760
765 print_revision (progname, revision); 761 print_revision (progname, NP_VERSION);
766 762
767 printf ("Copyright (c) 1999-2001 Ethan Galstad <nagios@nagios.org>\n"); 763 printf ("Copyright (c) 1999-2001 Ethan Galstad <nagios@nagios.org>\n");
768 printf (COPYRIGHT, copyright, email); 764 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 0aafd95..1c92534 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_snmp plugin 10* This file contains the check_snmp plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_snmp"; 31const char *progname = "check_snmp";
35const char *revision = "$Revision$";
36const char *copyright = "1999-2007"; 32const char *copyright = "1999-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -475,7 +471,7 @@ process_arguments (int argc, char **argv)
475 print_help (); 471 print_help ();
476 exit (STATE_OK); 472 exit (STATE_OK);
477 case 'V': /* version */ 473 case 'V': /* version */
478 print_revision (progname, revision); 474 print_revision (progname, NP_VERSION);
479 exit (STATE_OK); 475 exit (STATE_OK);
480 case 'v': /* verbose */ 476 case 'v': /* verbose */
481 verbose = TRUE; 477 verbose = TRUE;
@@ -928,7 +924,7 @@ nextarg (char *str)
928void 924void
929print_help (void) 925print_help (void)
930{ 926{
931 print_revision (progname, revision); 927 print_revision (progname, NP_VERSION);
932 928
933 printf (COPYRIGHT, copyright, email); 929 printf (COPYRIGHT, copyright, email);
934 930
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 2e16e65..04cc4d9 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_ssh plugin 10* This file contains the check_ssh plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_ssh"; 31const char *progname = "check_ssh";
35const char *revision = "$Revision$";
36const char *copyright = "2000-2007"; 32const char *copyright = "2000-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -129,7 +125,7 @@ process_arguments (int argc, char **argv)
129 case '?': /* help */ 125 case '?': /* help */
130 usage5 (); 126 usage5 ();
131 case 'V': /* version */ 127 case 'V': /* version */
132 print_revision (progname, revision); 128 print_revision (progname, NP_VERSION);
133 exit (STATE_OK); 129 exit (STATE_OK);
134 case 'h': /* help */ 130 case 'h': /* help */
135 print_help (); 131 print_help ();
@@ -218,9 +214,7 @@ ssh_connect (char *haddr, int hport, char *remote_version)
218 char *buffer = NULL; 214 char *buffer = NULL;
219 char *ssh_proto = NULL; 215 char *ssh_proto = NULL;
220 char *ssh_server = NULL; 216 char *ssh_server = NULL;
221 char rev_no[20]; 217 static char *rev_no = VERSION;
222
223 sscanf ("$Revision$", "$Revision: %[0123456789.]", rev_no);
224 218
225 result = my_tcp_connect (haddr, hport, &sd); 219 result = my_tcp_connect (haddr, hport, &sd);
226 220
@@ -272,7 +266,7 @@ print_help (void)
272 char *myport; 266 char *myport;
273 asprintf (&myport, "%d", SSH_DFL_PORT); 267 asprintf (&myport, "%d", SSH_DFL_PORT);
274 268
275 print_revision (progname, revision); 269 print_revision (progname, NP_VERSION);
276 270
277 printf ("Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n"); 271 printf ("Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n");
278 printf (COPYRIGHT, copyright, email); 272 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index f026963..be20ca3 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -6,8 +6,6 @@
6* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) 6* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
7* Copyright (c) 2000-2007 Nagios Plugins Development Team 7* Copyright (c) 2000-2007 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains the check_disk plugin 11* This file contains the check_disk plugin
@@ -26,12 +24,10 @@
26* You should have received a copy of the GNU General Public License 24* You should have received a copy of the GNU General Public License
27* along with this program. If not, see <http://www.gnu.org/licenses/>. 25* along with this program. If not, see <http://www.gnu.org/licenses/>.
28* 26*
29* $Id$
30* 27*
31*****************************************************************************/ 28*****************************************************************************/
32 29
33const char *progname = "check_swap"; 30const char *progname = "check_swap";
34const char *revision = "$Revision$";
35const char *copyright = "2000-2007"; 31const char *copyright = "2000-2007";
36const char *email = "nagiosplug-devel@lists.sourceforge.net"; 32const char *email = "nagiosplug-devel@lists.sourceforge.net";
37 33
@@ -463,7 +459,7 @@ process_arguments (int argc, char **argv)
463 verbose++; 459 verbose++;
464 break; 460 break;
465 case 'V': /* version */ 461 case 'V': /* version */
466 print_revision (progname, revision); 462 print_revision (progname, NP_VERSION);
467 exit (STATE_OK); 463 exit (STATE_OK);
468 case 'h': /* help */ 464 case 'h': /* help */
469 print_help (); 465 print_help ();
@@ -522,7 +518,7 @@ validate_arguments (void)
522void 518void
523print_help (void) 519print_help (void)
524{ 520{
525 print_revision (progname, revision); 521 print_revision (progname, NP_VERSION);
526 522
527 printf (_(COPYRIGHT), copyright, email); 523 printf (_(COPYRIGHT), copyright, email);
528 524
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 0d81497..31659f1 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2008 Nagios Plugins Development Team 6* Copyright (c) 1999-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_tcp plugin 10* This file contains the check_tcp plugin
@@ -31,7 +29,6 @@
31 29
32/* progname "check_tcp" changes depending on symlink called */ 30/* progname "check_tcp" changes depending on symlink called */
33char *progname; 31char *progname;
34const char *revision = "$Revision$";
35const char *copyright = "1999-2008"; 32const char *copyright = "1999-2008";
36const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
37 34
@@ -451,7 +448,7 @@ process_arguments (int argc, char **argv)
451 print_help (); 448 print_help ();
452 exit (STATE_OK); 449 exit (STATE_OK);
453 case 'V': /* version */ 450 case 'V': /* version */
454 print_revision (progname, revision); 451 print_revision (progname, NP_VERSION);
455 exit (STATE_OK); 452 exit (STATE_OK);
456 case 'v': /* verbose mode */ 453 case 'v': /* verbose mode */
457 flags |= FLAG_VERBOSE; 454 flags |= FLAG_VERBOSE;
@@ -592,7 +589,7 @@ process_arguments (int argc, char **argv)
592void 589void
593print_help (void) 590print_help (void)
594{ 591{
595 print_revision (progname, revision); 592 print_revision (progname, NP_VERSION);
596 593
597 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 594 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
598 printf (COPYRIGHT, copyright, email); 595 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_time.c b/plugins/check_time.c
index f9a292c..ee93816 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_time plugin 10* This file contains the check_time plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_time"; 31const char *progname = "check_time";
35const char *revision = "$Revision$";
36const char *copyright = "1999-2007"; 32const char *copyright = "1999-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -237,7 +233,7 @@ process_arguments (int argc, char **argv)
237 print_help (); 233 print_help ();
238 exit (STATE_OK); 234 exit (STATE_OK);
239 case 'V': /* version */ 235 case 'V': /* version */
240 print_revision (progname, revision); 236 print_revision (progname, NP_VERSION);
241 exit (STATE_OK); 237 exit (STATE_OK);
242 case 'H': /* hostname */ 238 case 'H': /* hostname */
243 if (is_host (optarg) == FALSE) 239 if (is_host (optarg) == FALSE)
@@ -335,7 +331,7 @@ print_help (void)
335 char *myport; 331 char *myport;
336 asprintf (&myport, "%d", TIME_PORT); 332 asprintf (&myport, "%d", TIME_PORT);
337 333
338 print_revision (progname, revision); 334 print_revision (progname, NP_VERSION);
339 335
340 printf ("Copyright (c) 1999 Ethan Galstad\n"); 336 printf ("Copyright (c) 1999 Ethan Galstad\n");
341 printf (COPYRIGHT, copyright, email); 337 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index a498d20..7311ca2 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -8,8 +8,6 @@
8* 2004 Arnaud Quette <arnaud.quette@mgeups.com> 8* 2004 Arnaud Quette <arnaud.quette@mgeups.com>
9* Copyright (c) 2002-2007 Nagios Plugins Development Team 9* Copyright (c) 2002-2007 Nagios Plugins Development Team
10* 10*
11* Last Modified: $Date$
12*
13* Description: 11* Description:
14* 12*
15* This file contains Network UPS Tools plugin for Nagios 13* This file contains Network UPS Tools plugin for Nagios
@@ -31,12 +29,10 @@
31* You should have received a copy of the GNU General Public License 29* You should have received a copy of the GNU General Public License
32* along with this program. If not, see <http://www.gnu.org/licenses/>. 30* along with this program. If not, see <http://www.gnu.org/licenses/>.
33* 31*
34* $Id$
35* 32*
36*****************************************************************************/ 33*****************************************************************************/
37 34
38const char *progname = "check_ups"; 35const char *progname = "check_ups";
39const char *revision = "$Revision$";
40const char *copyright = "2000-2007"; 36const char *copyright = "2000-2007";
41const char *email = "nagiosplug-devel@lists.sourceforge.net"; 37const char *email = "nagiosplug-devel@lists.sourceforge.net";
42 38
@@ -561,7 +557,7 @@ process_arguments (int argc, char **argv)
561 } 557 }
562 break; 558 break;
563 case 'V': /* version */ 559 case 'V': /* version */
564 print_revision (progname, revision); 560 print_revision (progname, NP_VERSION);
565 exit (STATE_OK); 561 exit (STATE_OK);
566 case 'h': /* help */ 562 case 'h': /* help */
567 print_help (); 563 print_help ();
@@ -601,7 +597,7 @@ print_help (void)
601 char *myport; 597 char *myport;
602 asprintf (&myport, "%d", PORT); 598 asprintf (&myport, "%d", PORT);
603 599
604 print_revision (progname, revision); 600 print_revision (progname, NP_VERSION);
605 601
606 printf ("Copyright (c) 2000 Tom Shields\n"); 602 printf ("Copyright (c) 2000 Tom Shields\n");
607 printf ("Copyright (c) 2004 Alain Richard <alain.richard@equation.fr>\n"); 603 printf ("Copyright (c) 2004 Alain Richard <alain.richard@equation.fr>\n");
diff --git a/plugins/check_users.c b/plugins/check_users.c
index 4e7e9a2..1bd2c8b 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_users plugin 10* This file contains the check_users plugin
@@ -29,12 +27,10 @@
29* You should have received a copy of the GNU General Public License 27* You should have received a copy of the GNU General Public License
30* along with this program. If not, see <http://www.gnu.org/licenses/>. 28* along with this program. If not, see <http://www.gnu.org/licenses/>.
31* 29*
32* $Id$
33* 30*
34*****************************************************************************/ 31*****************************************************************************/
35 32
36const char *progname = "check_users"; 33const char *progname = "check_users";
37const char *revision = "$Revision$";
38const char *copyright = "2000-2007"; 34const char *copyright = "2000-2007";
39const char *email = "nagiosplug-devel@lists.sourceforge.net"; 35const char *email = "nagiosplug-devel@lists.sourceforge.net";
40 36
@@ -163,7 +159,7 @@ process_arguments (int argc, char **argv)
163 print_help (); 159 print_help ();
164 exit (STATE_OK); 160 exit (STATE_OK);
165 case 'V': /* version */ 161 case 'V': /* version */
166 print_revision (progname, revision); 162 print_revision (progname, NP_VERSION);
167 exit (STATE_OK); 163 exit (STATE_OK);
168 case 'c': /* critical */ 164 case 'c': /* critical */
169 if (!is_intnonneg (optarg)) 165 if (!is_intnonneg (optarg))
@@ -203,7 +199,7 @@ process_arguments (int argc, char **argv)
203void 199void
204print_help (void) 200print_help (void)
205{ 201{
206 print_revision (progname, revision); 202 print_revision (progname, NP_VERSION);
207 203
208 printf ("Copyright (c) 1999 Ethan Galstad\n"); 204 printf ("Copyright (c) 1999 Ethan Galstad\n");
209 printf (COPYRIGHT, copyright, email); 205 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/common.h b/plugins/common.h
index 0711dbf..dfc0941 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -6,8 +6,6 @@
6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) 6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
7* Copyright (c) 2003-2007 Nagios Plugins Development Team 7* Copyright (c) 2003-2007 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains common include files and defines used in many of 11* This file contains common include files and defines used in many of
@@ -27,7 +25,6 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
diff --git a/plugins/negate.c b/plugins/negate.c
index 40ff191..0808b68 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2002-2008 Nagios Plugins Development Team 6* Copyright (c) 2002-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the negate plugin 10* This file contains the negate plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "negate"; 32const char *progname = "negate";
36const char *revision = "$Revision$";
37const char *copyright = "2002-2008"; 33const char *copyright = "2002-2008";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -155,7 +151,7 @@ process_arguments (int argc, char **argv)
155 exit (EXIT_SUCCESS); 151 exit (EXIT_SUCCESS);
156 break; 152 break;
157 case 'V': /* version */ 153 case 'V': /* version */
158 print_revision (progname, revision); 154 print_revision (progname, NP_VERSION);
159 exit (EXIT_SUCCESS); 155 exit (EXIT_SUCCESS);
160 case 't': /* timeout period */ 156 case 't': /* timeout period */
161 if (!is_integer (optarg)) 157 if (!is_integer (optarg))
@@ -233,7 +229,7 @@ translate_state (char *state_text)
233void 229void
234print_help (void) 230print_help (void)
235{ 231{
236 print_revision (progname, revision); 232 print_revision (progname, NP_VERSION);
237 233
238 printf (COPYRIGHT, copyright, email); 234 printf (COPYRIGHT, copyright, email);
239 235
diff --git a/plugins/netutils.c b/plugins/netutils.c
index 1a5547e..6082cae 100644
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -6,8 +6,6 @@
6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) 6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
7* Copyright (c) 2003-2008 Nagios Plugins Development Team 7* Copyright (c) 2003-2008 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains commons functions used in many of the plugins. 11* This file contains commons functions used in many of the plugins.
@@ -26,7 +24,6 @@
26* You should have received a copy of the GNU General Public License 24* You should have received a copy of the GNU General Public License
27* along with this program. If not, see <http://www.gnu.org/licenses/>. 25* along with this program. If not, see <http://www.gnu.org/licenses/>.
28* 26*
29* $Id$
30* 27*
31*****************************************************************************/ 28*****************************************************************************/
32 29
diff --git a/plugins/netutils.h b/plugins/netutils.h
index 4c0a563..85c92fc 100644
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -6,8 +6,6 @@
6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) 6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
7* Copyright (c) 2003-2007 Nagios Plugins Development Team 7* Copyright (c) 2003-2007 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains common include files and function definitions 11* This file contains common include files and function definitions
@@ -27,7 +25,6 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
diff --git a/plugins/popen.c b/plugins/popen.c
index a27aecc..716bd52 100644
--- a/plugins/popen.c
+++ b/plugins/popen.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2005-2007 Nagios Plugins Development Team 6* Copyright (c) 2005-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* A safe alternative to popen 10* A safe alternative to popen
@@ -37,7 +35,6 @@
37* You should have received a copy of the GNU General Public License 35* You should have received a copy of the GNU General Public License
38* along with this program. If not, see <http://www.gnu.org/licenses/>. 36* along with this program. If not, see <http://www.gnu.org/licenses/>.
39* 37*
40* $Id$
41* 38*
42*****************************************************************************/ 39*****************************************************************************/
43 40
diff --git a/plugins/popen.h b/plugins/popen.h
index 8b09edd..fc7e78e 100644
--- a/plugins/popen.h
+++ b/plugins/popen.h
@@ -1,6 +1,5 @@
1/****************************************************************************** 1/******************************************************************************
2* 2*
3* $Id$
4* 3*
5*****************************************************************************/ 4*****************************************************************************/
6 5
diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index 8c52b5c..7574b12 100644
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2005-2006 Nagios Plugins Development Team 6* Copyright (c) 2005-2006 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description : 8* Description :
11* 9*
12* A simple interface to executing programs from other programs, using an 10* A simple interface to executing programs from other programs, using an
@@ -35,7 +33,6 @@
35* You should have received a copy of the GNU General Public License 33* You should have received a copy of the GNU General Public License
36* along with this program. If not, see <http://www.gnu.org/licenses/>. 34* along with this program. If not, see <http://www.gnu.org/licenses/>.
37* 35*
38* $Id$
39* 36*
40*****************************************************************************/ 37*****************************************************************************/
41 38
diff --git a/plugins/runcmd.h b/plugins/runcmd.h
index a048def..211dee2 100644
--- a/plugins/runcmd.h
+++ b/plugins/runcmd.h
@@ -18,7 +18,6 @@
18* You should have received a copy of the GNU General Public License 18* You should have received a copy of the GNU General Public License
19* along with this program. If not, see <http://www.gnu.org/licenses/>. 19* along with this program. If not, see <http://www.gnu.org/licenses/>.
20* 20*
21* $Id$
22* 21*
23*****************************************************************************/ 22*****************************************************************************/
24 23
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 3d4f901..f5035e2 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2005-2007 Nagios Plugins Development Team 6* Copyright (c) 2005-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains common functions for plugins that require SSL. 10* This file contains common functions for plugins that require SSL.
@@ -25,7 +23,6 @@
25* You should have received a copy of the GNU General Public License 23* You should have received a copy of the GNU General Public License
26* along with this program. If not, see <http://www.gnu.org/licenses/>. 24* along with this program. If not, see <http://www.gnu.org/licenses/>.
27* 25*
28* $Id$
29* 26*
30*****************************************************************************/ 27*****************************************************************************/
31 28
diff --git a/plugins/t/check_by_ssh.t b/plugins/t/check_by_ssh.t
index b421d33..5f2c534 100644
--- a/plugins/t/check_by_ssh.t
+++ b/plugins/t/check_by_ssh.t
@@ -2,7 +2,6 @@
2# 2#
3# check_by_ssh tests 3# check_by_ssh tests
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_cluster.t b/plugins/t/check_cluster.t
index f3e78b8..4736f06 100644
--- a/plugins/t/check_cluster.t
+++ b/plugins/t/check_cluster.t
@@ -2,7 +2,6 @@
2# 2#
3# check_cluster tests 3# check_cluster tests
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_dig.t b/plugins/t/check_dig.t
index 937eec3..323859e 100644
--- a/plugins/t/check_dig.t
+++ b/plugins/t/check_dig.t
@@ -2,7 +2,6 @@
2# 2#
3# Domain Name Server (DNS) Tests via check_dig 3# Domain Name Server (DNS) Tests via check_dig
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t
index 99c434a..45c6a61 100644
--- a/plugins/t/check_disk.t
+++ b/plugins/t/check_disk.t
@@ -2,7 +2,6 @@
2# 2#
3# Disk Space Tests via check_disk 3# Disk Space Tests via check_disk
4# 4#
5# $Id$
6# 5#
7 6
8# TODO: Add in tests for perf data. Need to beef up Nagios::Plugin::Performance to cater for max, min, etc 7# TODO: Add in tests for perf data. Need to beef up Nagios::Plugin::Performance to cater for max, min, etc
diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t
index fc89e6e..64aaf0c 100644
--- a/plugins/t/check_dns.t
+++ b/plugins/t/check_dns.t
@@ -2,7 +2,6 @@
2# 2#
3# Domain Name Server (DNS) Tests via check_dns 3# Domain Name Server (DNS) Tests via check_dns
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_dummy.t b/plugins/t/check_dummy.t
index aaa7a41..15fc157 100644
--- a/plugins/t/check_dummy.t
+++ b/plugins/t/check_dummy.t
@@ -2,7 +2,6 @@
2# 2#
3# check_dummy tests 3# check_dummy tests
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_fping.t b/plugins/t/check_fping.t
index c59d59e..45a9be8 100644
--- a/plugins/t/check_fping.t
+++ b/plugins/t/check_fping.t
@@ -2,7 +2,6 @@
2# 2#
3# FPing Tests via check_fping 3# FPing Tests via check_fping
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_ftp.t b/plugins/t/check_ftp.t
index 47a73e1..de6831b 100644
--- a/plugins/t/check_ftp.t
+++ b/plugins/t/check_ftp.t
@@ -2,7 +2,6 @@
2# 2#
3# File Transfer Protocol (FTP) Test via check_ftp 3# File Transfer Protocol (FTP) Test via check_ftp
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_hpjd.t b/plugins/t/check_hpjd.t
index 2fe5600..10ded54 100644
--- a/plugins/t/check_hpjd.t
+++ b/plugins/t/check_hpjd.t
@@ -2,7 +2,6 @@
2# 2#
3# HP JetDirect Test via check_hpjd 3# HP JetDirect Test via check_hpjd
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t
index c98b4ac..c43a64a 100644
--- a/plugins/t/check_http.t
+++ b/plugins/t/check_http.t
@@ -2,7 +2,6 @@
2# 2#
3# HyperText Transfer Protocol (HTTP) Test via check_http 3# HyperText Transfer Protocol (HTTP) Test via check_http
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_imap.t b/plugins/t/check_imap.t
index fa957d1..9c6eae1 100644
--- a/plugins/t/check_imap.t
+++ b/plugins/t/check_imap.t
@@ -2,7 +2,6 @@
2# 2#
3# Internet Mail Access Protocol (IMAP) Server Tests via check_imap 3# Internet Mail Access Protocol (IMAP) Server Tests via check_imap
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_jabber.t b/plugins/t/check_jabber.t
index 6a3d4ef..1aaf812 100644
--- a/plugins/t/check_jabber.t
+++ b/plugins/t/check_jabber.t
@@ -2,7 +2,6 @@
2# 2#
3# Jabber Server Tests via check_jabber 3# Jabber Server Tests via check_jabber
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_load.t b/plugins/t/check_load.t
index 8987b84..55f6f75 100644
--- a/plugins/t/check_load.t
+++ b/plugins/t/check_load.t
@@ -2,7 +2,6 @@
2# 2#
3# Load Average Tests via check_load 3# Load Average Tests via check_load
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_mysql.t b/plugins/t/check_mysql.t
index e8bccf1..d971645 100644
--- a/plugins/t/check_mysql.t
+++ b/plugins/t/check_mysql.t
@@ -2,7 +2,6 @@
2# 2#
3# MySQL Database Server Tests via check_mysql 3# MySQL Database Server Tests via check_mysql
4# 4#
5# $Id$
6# 5#
7# 6#
8# These are the database permissions required for this test: 7# These are the database permissions required for this test:
diff --git a/plugins/t/check_mysql_query.t b/plugins/t/check_mysql_query.t
index f78f07b..407af88 100644
--- a/plugins/t/check_mysql_query.t
+++ b/plugins/t/check_mysql_query.t
@@ -2,7 +2,6 @@
2# 2#
3# MySQL Database Server Tests via check_mysql 3# MySQL Database Server Tests via check_mysql
4# 4#
5# $Id$
6# 5#
7# 6#
8# These are the database permissions required for this test: 7# These are the database permissions required for this test:
diff --git a/plugins/t/check_nagios.t b/plugins/t/check_nagios.t
index d5d4846..81fc24d 100644
--- a/plugins/t/check_nagios.t
+++ b/plugins/t/check_nagios.t
@@ -2,7 +2,6 @@
2# 2#
3# check_nagios tests 3# check_nagios tests
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_ntp.t b/plugins/t/check_ntp.t
index 4f86ab9..b71c863 100644
--- a/plugins/t/check_ntp.t
+++ b/plugins/t/check_ntp.t
@@ -2,7 +2,6 @@
2# 2#
3# Testing NTP 3# Testing NTP
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_ping.t b/plugins/t/check_ping.t
index c9a0904..e1c119e 100644
--- a/plugins/t/check_ping.t
+++ b/plugins/t/check_ping.t
@@ -2,7 +2,6 @@
2# 2#
3# Ping Response Tests via check_ping 3# Ping Response Tests via check_ping
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_pop.t b/plugins/t/check_pop.t
index b78291d..62352fd 100644
--- a/plugins/t/check_pop.t
+++ b/plugins/t/check_pop.t
@@ -2,7 +2,6 @@
2# 2#
3# Post Office Protocol (POP) Server Tests via check_pop 3# Post Office Protocol (POP) Server Tests via check_pop
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_procs.t b/plugins/t/check_procs.t
index 2a41ac5..fc32952 100644
--- a/plugins/t/check_procs.t
+++ b/plugins/t/check_procs.t
@@ -2,7 +2,6 @@
2# 2#
3# Process Tests via check_procs 3# Process Tests via check_procs
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_smtp.t b/plugins/t/check_smtp.t
index ff58bc0..aa6dae4 100644
--- a/plugins/t/check_smtp.t
+++ b/plugins/t/check_smtp.t
@@ -2,7 +2,6 @@
2# 2#
3# Simple Mail Transfer Protocol (SMTP) Test via check_smtp 3# Simple Mail Transfer Protocol (SMTP) Test via check_smtp
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_snmp.t b/plugins/t/check_snmp.t
index 4e83139..369314e 100644
--- a/plugins/t/check_snmp.t
+++ b/plugins/t/check_snmp.t
@@ -2,7 +2,6 @@
2# 2#
3# Simple Network Management Protocol (SNMP) Test via check_snmp 3# Simple Network Management Protocol (SNMP) Test via check_snmp
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_swap.t b/plugins/t/check_swap.t
index 435730f..e44adc9 100644
--- a/plugins/t/check_swap.t
+++ b/plugins/t/check_swap.t
@@ -2,7 +2,6 @@
2# 2#
3# Swap Space Tests via check_swap 3# Swap Space Tests via check_swap
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_tcp.t b/plugins/t/check_tcp.t
index 2914350..fd2b5dd 100644
--- a/plugins/t/check_tcp.t
+++ b/plugins/t/check_tcp.t
@@ -2,7 +2,6 @@
2# 2#
3# TCP Connection Based Tests via check_tcp 3# TCP Connection Based Tests via check_tcp
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_time.t b/plugins/t/check_time.t
index f7fcf95..961f56e 100644
--- a/plugins/t/check_time.t
+++ b/plugins/t/check_time.t
@@ -2,7 +2,6 @@
2# 2#
3# System Time Tests via check_time 3# System Time Tests via check_time
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_udp.t b/plugins/t/check_udp.t
index e8a1e39..6d24675 100644
--- a/plugins/t/check_udp.t
+++ b/plugins/t/check_udp.t
@@ -2,7 +2,6 @@
2# 2#
3# UDP Connection Based Tests via check_udp 3# UDP Connection Based Tests via check_udp
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_users.t b/plugins/t/check_users.t
index 4b313d3..cf7fac9 100644
--- a/plugins/t/check_users.t
+++ b/plugins/t/check_users.t
@@ -2,7 +2,6 @@
2# 2#
3# Logged in Users Tests via check_users 3# Logged in Users Tests via check_users
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/negate.t b/plugins/t/negate.t
index 3a894f5..989bf01 100644
--- a/plugins/t/negate.t
+++ b/plugins/t/negate.t
@@ -3,8 +3,6 @@
3# negate checks 3# negate checks
4# Need check_dummy to work for testing 4# Need check_dummy to work for testing
5# 5#
6# $Id: negate.pl 1717 2007-05-24 08:53:50Z tonvoon $
7#
8 6
9use strict; 7use strict;
10use Test::More; 8use Test::More;
diff --git a/plugins/urlize.c b/plugins/urlize.c
index aeabafd..a362008 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the urlize plugin 10* This file contains the urlize plugin
@@ -29,12 +27,10 @@
29* You should have received a copy of the GNU General Public License 27* You should have received a copy of the GNU General Public License
30* along with this program. If not, see <http://www.gnu.org/licenses/>. 28* along with this program. If not, see <http://www.gnu.org/licenses/>.
31* 29*
32* $Id$
33* 30*
34*****************************************************************************/ 31*****************************************************************************/
35 32
36const char *progname = "urlize"; 33const char *progname = "urlize";
37const char *revision = "$Revision$";
38const char *copyright = "2000-2006"; 34const char *copyright = "2000-2006";
39const char *email = "nagiosplug-devel@lists.sourceforge.net"; 35const char *email = "nagiosplug-devel@lists.sourceforge.net";
40 36
@@ -89,7 +85,7 @@ main (int argc, char **argv)
89 exit (EXIT_SUCCESS); 85 exit (EXIT_SUCCESS);
90 break; 86 break;
91 case 'V': /* version */ 87 case 'V': /* version */
92 print_revision (progname, revision); 88 print_revision (progname, NP_VERSION);
93 exit (EXIT_SUCCESS); 89 exit (EXIT_SUCCESS);
94 break; 90 break;
95 case 'u': 91 case 'u':
@@ -165,7 +161,7 @@ main (int argc, char **argv)
165void 161void
166print_help (void) 162print_help (void)
167{ 163{
168 print_revision (progname, revision); 164 print_revision (progname, NP_VERSION);
169 165
170 printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"); 166 printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
171 printf (COPYRIGHT, copyright, email); 167 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/utils.c b/plugins/utils.c
index c8f3a00..1900ef8 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -6,9 +6,6 @@
6* Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net) 6* Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net)
7* Copyright (c) 2002-2007 Nagios Plugin Development Team 7* Copyright (c) 2002-2007 Nagios Plugin Development Team
8* 8*
9* Last Modified: $Date$
10*
11*
12* This program is free software: you can redistribute it and/or modify 9* This program is free software: you can redistribute it and/or modify
13* it under the terms of the GNU General Public License as published by 10* it under the terms of the GNU General Public License as published by
14* the Free Software Foundation, either version 3 of the License, or 11* the Free Software Foundation, either version 3 of the License, or
@@ -22,7 +19,6 @@
22* You should have received a copy of the GNU General Public License 19* You should have received a copy of the GNU General Public License
23* along with this program. If not, see <http://www.gnu.org/licenses/>. 20* along with this program. If not, see <http://www.gnu.org/licenses/>.
24* 21*
25* $Id$
26* 22*
27*****************************************************************************/ 23*****************************************************************************/
28 24
@@ -142,24 +138,13 @@ usage5 (void)
142 exit (STATE_UNKNOWN); 138 exit (STATE_UNKNOWN);
143} 139}
144 140
145char *
146clean_revstring (const char *revstring)
147{
148 char plugin_revision[STRLEN];
149 plugin_revision[0] = 'v';
150 if (sscanf (revstring,"$Revision: %[0-9.]", plugin_revision + 1) == 1)
151 return strscpy (NULL, plugin_revision);
152 else
153 return strscpy (NULL, "N/A");
154}
155
156void 141void
157print_revision (const char *command_name, const char *revision_string) 142print_revision (const char *command_name, const char *revision)
158{ 143{
159 char plugin_revision[STRLEN]; 144 char plugin_revision[STRLEN];
160 145
161 printf ("%s %s (%s %s)\n", 146 printf ("%s v%s (%s %s)\n",
162 command_name, clean_revstring(revision_string), PACKAGE, VERSION); 147 command_name, revision, PACKAGE, VERSION);
163} 148}
164 149
165const char * 150const char *
diff --git a/plugins/utils.h b/plugins/utils.h
index 67e099d..65e06eb 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -26,10 +26,7 @@ suite of plugins. */
26 26
27/* Standardize version information, termination */ 27/* Standardize version information, termination */
28 28
29/* $Id$ */
30
31void support (void); 29void support (void);
32char *clean_revstring (const char *);
33void print_revision (const char *, const char *); 30void print_revision (const char *, const char *);
34 31
35/* Handle timeouts */ 32/* Handle timeouts */
diff --git a/test.pl.in b/test.pl.in
index 22d0576..a022818 100755
--- a/test.pl.in
+++ b/test.pl.in
@@ -2,8 +2,6 @@
2# 2#
3# Wrapper for running the test harnesses 3# Wrapper for running the test harnesses
4# 4#
5# $Id$
6#
7 5
8use strict; 6use strict;
9 7
diff --git a/tools/README b/tools/README
index 21d5846..98c243b 100644
--- a/tools/README
+++ b/tools/README
@@ -1,4 +1,3 @@
1$Id$
2The tools subdirectory contains anciliary files that can be used to configure 1The tools subdirectory contains anciliary files that can be used to configure
3or test the plugins. 2or test the plugins.
4 3
diff --git a/tools/git2svn.pl b/tools/git2svn.pl
new file mode 100755
index 0000000..c90ea96
--- /dev/null
+++ b/tools/git2svn.pl
@@ -0,0 +1,129 @@
1#!/usr/bin/perl
2#
3# This script pulls the current branch, then walks the first parents and
4# commit each of them into subversion.
5#
6# Copyright (C) 2008 Thomas Guyot-Sionnest <dermoth@aei.ca>
7#
8# The subversion repository must not be taking any external commit or this
9# script will erase them. This script cannot run off a bare repository.
10#
11# *** INITIAL SETUP ***
12#
13# 1. Run this command line to get the repository up and ready for this script:
14#
15# $ cd /path/to/repo/; git log -1 --pretty=format:%H >.git/git2svn.last_commit_hash
16#
17# 2. Configure the lines below... $ENV{'GIT_DIR'} must point to the .git
18# directory of the git-svn repo.
19#
20# *** INITIAL SETUP ***
21#
22# This program is free software: you can redistribute it and/or modify
23# it under the terms of the GNU General Public License as published by
24# the Free Software Foundation, either version 3 of the License, or
25# (at your option) any later version.
26#
27# This program is distributed in the hope that it will be useful,
28# but WITHOUT ANY WARRANTY; without even the implied warranty of
29# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
30# GNU General Public License for more details.
31#
32# You should have received a copy of the GNU General Public License
33# along with this program. If not, see <http://www.gnu.org/licenses/>.
34
35use strict;
36use warnings;
37
38# This is the git working tree. Must be tied to a SVN repository
39$ENV{'GIT_DIR'} = '/path/to/nagiosplug/.git';
40
41# For some strange reasons this is needed:
42$ENV{'GIT_SVN_ID'} = 'trunk';
43
44# Path to git binary
45my $git = '/usr/bin/git';
46
47# Force commits from the hash stored in git2svn.last_commit_hash regardless
48# of the state of the current repository. Use this if the repository was
49# updated manually or if you need to set that hash to a specific value.
50# NB: Re-committing old hashes will revert then roll again changes to SVN.
51my $FORCE = 0;
52
53# Print debug output. Useful if you want to see what's being committed.
54my $DEBUG = 0;
55
56for (@ARGV) {
57 $FORCE = 1 if (m/force/);
58 $DEBUG = 1 if (m/debug/);
59 if (m/help/ || m/--help/ || m/-h/) {
60 print "Usage: $0 [ debug ] [ force ] [ help ]\n";
61 exit 0;
62 }
63}
64
65# 1st get the current commit hash - we'll start committing to SVN from this one
66print "Reading saved hash from $ENV{'GIT_DIR'}/git2svn.last_commit_hash\n" if ($DEBUG);
67open(SAVHASH, "<$ENV{'GIT_DIR'}/git2svn.last_commit_hash")
68 or die("Can't open $ENV{'GIT_DIR'}/git2svn.last_commit_hash: $!");
69my $saved_commit_hash = <SAVHASH>;
70chomp $saved_commit_hash;
71print "Saved commit hash: $saved_commit_hash\n" if ($DEBUG);
72close(SAVHASH);
73
74my $last_commit_hash;
75if ($FORCE) {
76 $last_commit_hash = $saved_commit_hash;
77 print "Forcing last commit hash to $last_commit_hash\n" if ($DEBUG);
78} else {
79 print "Running: $git log -1 --pretty=format:%H\n" if ($DEBUG);
80 $last_commit_hash = `$git log -1 --pretty=format:%H`;
81 die("Failed to retrieve last commit hash") if ($?);
82 chomp $last_commit_hash;
83 print "Last commit hash: $last_commit_hash\n" if ($DEBUG);
84
85 # Sanity check
86 die("Last commit hash and saved commit hash don't match, aborting")
87 if ($last_commit_hash ne $saved_commit_hash);
88}
89
90# 2nd pull the remote tree
91print "Running: $git pull\n" if ($DEBUG);
92`$git pull`;
93die("Failed to pull") if ($?);
94
95# Then list all first parents since the last one and insert them into an array
96my @commits;
97print "Running: $git rev-list --first-parent $last_commit_hash..HEAD\n" if ($DEBUG);
98open(REVLIST, "$git rev-list --first-parent $last_commit_hash..HEAD|")
99 or die("Failed to retrieve revision list: $!");
100
101while (<REVLIST>) {
102 chomp;
103 unshift @commits, $_;
104 print "Prepending the list with $_\n" if ($DEBUG);
105}
106
107close(REVLIST);
108
109if (@commits == 0) {
110 print "Nothing to do.\n";
111 exit 0;
112}
113
114# Finally, commit every revision found into SVN
115foreach my $commit (@commits) {
116 print "Commiting $commit to Subversion\n";
117 print "Running: $git svn set-tree $commit\n" if ($DEBUG);
118 `$git svn set-tree $commit`;
119 die("Failed to commit hash $commit") if ($?);
120}
121
122# Once done, update the last commit hash
123$last_commit_hash = pop @commits;
124print "Writing last commit hash to $ENV{'GIT_DIR'}/git2svn.last_commit_hash\n" if ($DEBUG);
125open(SAVHASH, ">$ENV{'GIT_DIR'}/git2svn.last_commit_hash")
126 or die("Can't open $ENV{'GIT_DIR'}/git2svn.last_commit_hash for writing: $!");
127print SAVHASH $last_commit_hash;
128close(SAVHASH);
129
diff --git a/tools/mini_epn.c b/tools/mini_epn.c
index cd67538..6f3c5d0 100644
--- a/tools/mini_epn.c
+++ b/tools/mini_epn.c
@@ -5,8 +5,6 @@
5 * Modified by Douglas Warner 5 * Modified by Douglas Warner
6 * Last Modified: 05/02/2002 6 * Last Modified: 05/02/2002
7 * 7 *
8 * $Id$
9 *
10 * This is a sample mini embedded Perl interpreter (hacked out checks.c and 8 * This is a sample mini embedded Perl interpreter (hacked out checks.c and
11 * perlembed) for use in testing Perl plugins. 9 * perlembed) for use in testing Perl plugins.
12 * 10 *
diff --git a/tools/setup b/tools/setup
index 6db4c6c..cdaa9c9 100755
--- a/tools/setup
+++ b/tools/setup
@@ -1,7 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# autogen.sh glue from CMU Cyrus IMAP 3# autogen.sh glue from CMU Cyrus IMAP
4# $Id$
5# 4#
6# Requires: automake, autoconf, dpkg-dev 5# Requires: automake, autoconf, dpkg-dev
7# set -e 6# set -e
diff --git a/tools/tinderbox_build b/tools/tinderbox_build
index c1d40c6..ab4234a 100755
--- a/tools/tinderbox_build
+++ b/tools/tinderbox_build
@@ -14,7 +14,7 @@ use Sys::Hostname;
14use Cwd; 14use Cwd;
15use Time::Local; 15use Time::Local;
16 16
17my $Version = '$Revision$'; 17my $Version = `git describe --abbrev=4 HEAD`;
18 18
19my $myhost = hostname; 19my $myhost = hostname;
20chomp($myhost); 20chomp($myhost);