![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 56cf151)
raw | patch | inline | side by side (parent: 56cf151)
| author | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | |
| Sun, 23 Nov 2008 05:38:47 +0000 (05:38 +0000) | ||
| committer | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | |
| Sun, 23 Nov 2008 05:38:47 +0000 (05:38 +0000) |
For contrib/, full tags have been imported from subversion
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2091 f882894a-f735-0410-b71e-b25c423dba1c
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2091 f882894a-f735-0410-b71e-b25c423dba1c
172 files changed:
diff --git a/BRANCHES b/BRANCHES
--- a/BRANCHES
+++ /dev/null
@@ -1,9 +0,0 @@
-# $Id$
-#
-# This file describes the current branches in CVS for nagiosplug
-# Used by sfsnapshot to generate the snapshots
-#
-# Format:
-# cvs_branch_name:description
-HEAD:Stable - 1.4.x releases
-r1_4-patches:Testing multiple branches
diff --git a/Makefile.am b/Makefile.am
index 0452133ffc3e67625f889d0829e74a3e153336e4..3cd939aca62d6d7b46b6dfaf81881c5c64b98f48 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
# Have to list TAP_DIR manually to get in distribution
EXTRA_DIST = config.rpath \
ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \
- REQUIREMENTS SUPPORT THANKS \
+ NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \
NPTest.pm contrib pkg nagios-plugins.spec \
config_test/Makefile config_test/run_tests config_test/child_test.c \
perlmods tools/build_perl_modules \
dist-hook:
make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
- rm -rf `find $(distdir) -name .svn`
+ echo ${VERSION} >$(distdir)/version
install-root:
cd plugins-root && $(MAKE) $@
pkgclean:
rm -rf $(BUILDDIR) $(PACKDIR)
+
diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN
--- /dev/null
+++ b/NP-VERSION-GEN
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# This is from the Git repository (GIT-VERSION-GEN with modifications)
+#
+
+SRC_ROOT=`dirname $0`
+
+NPVF=NP-VERSION-FILE
+DEF_VER=1.4.13.git
+
+LF='
+'
+
+# First see if there is a version file (included in release tarballs),
+# then try git-describe, then default.
+if test -f $SRC_ROOT/version
+then
+ VN=`cat $SRC_ROOT/version` || VN="$DEF_VER"
+elif test -d $SRC_ROOT/.git -o -f $SRC_ROOT/.git &&
+ VN=`cd $SRC_ROOT; git describe --abbrev=4 HEAD 2>/dev/null` &&
+ case "$VN" in
+ *$LF*) (exit 1) ;;
+ release-[0-9]*)
+ git update-index -q --refresh
+ test -z "`git diff-index --name-only HEAD --`" ||
+ VN="$VN-dirty" ;;
+ esac
+then
+ VN=`echo "$VN" | sed -e 's/^release-//' | sed -e 's/-/./g'`;
+else
+ VN="$DEF_VER"
+fi
+
+VN=`expr "$VN" : v*'\(.*\)'`
+
+if test -r $NPVF
+then
+ VC=`sed -e 's/^NP_VERSION = //' <$NPVF`
+else
+ VC=unset
+fi
+test "$VN" = "$VC" || {
+ echo >&2 "NP_VERSION = $VN"
+ echo "NP_VERSION = $VN" >$NPVF
+}
+
diff --git a/NPTest.pm b/NPTest.pm
index d4542ddc2cc5348c4b41a1b13b3e879b6e53be30..1cd89db75b425ddfdaf3076f240cf828065f3f72 100644 (file)
--- a/NPTest.pm
+++ b/NPTest.pm
use Test;
use vars qw($VERSION);
-$VERSION = do { my @r = (q$Revision$ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
+$VERSION = "1556."; # must be all one line, for MakeMaker
=head1 NAME
diff --git a/acinclude.m4 b/acinclude.m4
index 7de6555013d5b22350115e5f51dc96210b1370f3..acee3e17c3df6f714894b9b7866ae48c06b224a4 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
dnl e.g. 5 arguments (solaris)
dnl e.g. 3 arguments (osf/1)
dnl
-dnl @version $Id$
dnl @author Brian Stafford <brian@stafford.uklinux.net>
dnl
dnl based on version by Caolan McNamara <caolan@skynet.ie>
diff --git a/autogen.sh b/autogen.sh
index 3bc484b5ce851b31f426d1d4105e9b58850b2f0f..c584309fff8a8ab9ea6d8f0c668d9f2a5f1178ab 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
#!/bin/sh
#
-# $Id$
-#
# Requires: automake, autoconf, dpkg-dev
# set -e
diff --git a/command.cfg.in b/command.cfg.in
index 65b5f4ee25b52e8a4e33a08ca5fcd11145d0a854..aff33d29ccdcbb92b6fcfcb2f1f8b2b261ee45d5 100644 (file)
--- a/command.cfg.in
+++ b/command.cfg.in
###############################################################################
# COMMAND CONFIGURATION
#
-# $Id$
-#
# SYNTAX:
# command[<command_name>]=<command_line>
#
diff --git a/configure.in b/configure.in
index 7687ae6ef9715dfa8165054ce45e932257696edd..203166e424703eb4b719d29de7f4ace6c7f911d7 100644 (file)
--- a/configure.in
+++ b/configure.in
dnl Process this file with autoconf to produce a configure script.
-AC_REVISION ($Revision$)
AC_PREREQ(2.59)
AC_INIT(nagios-plugins,1.4.13)
AC_CONFIG_SRCDIR(NPTest.pm)
index d7f8d0c3d2dc86db46420e9319923ef1ff3f1d2d..e3c47bee8144fdbc0a628b2e23de1edb8de9152a 100644 (file)
PROGNAME=`basename $0`
PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 302 $' | sed -e 's/[^0-9.]//g'`
. $PROGPATH/utils.sh
index 2b6990f7a2ec20d1991aa04c3293a29c3d66a15a..6bf176625ef6453e786a7924e89027e877295437 100644 (file)
--- a/contrib/check_apc_ups.pl
+++ b/contrib/check_apc_ups.pl
"H=s" => \$opt_H, "hostname=s" => \$opt_H);
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'$Revision: 1771 $');
exit $ERRORS{'OK'};
}
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'$Revision: 1771 $');
print "Copyright (c) 2001 Gerald Combs/Jeffrey Blank/Karl DeBisschop
This plugin reports the status of an APC UPS equipped with an SNMP management
index 6df4c7a1d0708b7dff9ef1cfd79857fe1849bdf0..9277686c0924ecf12308b0ba5cafb746dcb3fcb5 100644 (file)
# using "aecho"
#
# initial version: 23 October 2002 by Stefan Beck, IT Software Solutions
-# current status: $Revision$
+# current status: $Revision: 1771 $
#
# Copyright Notice: GPL
#
}
sub print_help() {
- print_revision( $PROGNAME, '$Revision$ ' );
+ print_revision( $PROGNAME, '$Revision: 1771 $ ' );
print "Copyright (c) 2002 Stefan Beck\n";
print "\n";
print "Check if an atalkhost responds to an atalk echo using\n";
}
sub version () {
- print_revision( $PROGNAME, '$Revision$ ' );
+ print_revision( $PROGNAME, '$Revision: 1771 $ ' );
exit $ERRORS{'OK'};
}
index b78ec68fa92d3cff6a457daa9035ede9748133a8..c41c4a8a632dcb51b2e535b2a9b08e783f31a7d4 100644 (file)
--- a/contrib/check_arping.pl
+++ b/contrib/check_arping.pl
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 1112 $ ');
exit $ERRORS{'OK'};
}
print " -t (--timeout) Timeout in seconds.\n";
print " -V (--version) Plugin version\n";
print " -h (--help) usage help \n\n";
- print_revision($PROGNAME, '$Revision$');
+ print_revision($PROGNAME, '$Revision: 1112 $');
}
index fb418ee3cd3806145e71ffecf98ea376a910e654..1b02ea3cd58115565e32ba00fd0a1a3b89d053cc 100644 (file)
#!/usr/bin/perl -w
#
-# $Id$
+# $Id: check_email_loop.pl 1290 2005-11-29 23:21:06Z harpermann $
#
# (c)2000 Benjamin Schmid, blueshift@gmx.net (emergency use only ;-)
# Copyleft by GNU GPL
index 476a0c362e19c7ecbe11d11c09ef875c483f2c37..0bd139095dbe6d2bcfbc5138f173e0e790354bf5 100644 (file)
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$\n ');
+ print_revision($PROGNAME,'$Revision: 1113 $\n ');
print "Copyright (c) 2003 Rainer Duffner\n ";
print_usage();
print "\n";
}
sub version () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 1113 $ ');
exit $ERRORS{'OK'};
}
index 5bddb87cb81dcaaa582106bc8873e38709e0c827..19f8e7f015af54a47a7d240a7dff8e2735a072c9 100644 (file)
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$\n ');
+ print_revision($PROGNAME,'$Revision: 1113 $\n ');
print "Copyright (c) 2003 Rainer Duffner\n ";
print_usage();
print "\n";
}
sub version () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 1113 $ ');
exit $ERRORS{'OK'};
}
index ee958d304b39f4e5d0e243e3f2354dd21cd850c3..21c5267bddf7e0c1ce04b559f62fe8c18e2fdda3 100644 (file)
--- a/contrib/check_frontpage
+++ b/contrib/check_frontpage
#! /usr/bin/perl -w
#
-# $Id$
+# $Id: check_frontpage 1112 2005-01-27 04:46:08Z stanleyhopcroft $
#
# Check that FrontPage extensions appear to be working on a specified host.
# Currently only checks that the hit counter is not returning an error.
"H=s" => \$opt_H, "hostname=s" => \$opt_H);
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$'); #'
+ print_revision($PROGNAME,'$Revision: 1112 $'); #'
exit $ERRORS{'OK'};
}
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'$Revision: 1112 $');
print "Copyright (c) 2003 Kev Green\n";
print "\n";
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 157d028a723491e73614189b4407858a182545a3..60e148128d248859ded31ba14b580d0d25bfef2c 100644 (file)
*****************************************************************************/
const char *progname = "check_http";
-#define REVISION "$Revision$"
+#define REVISION "$Revision: 1117 $"
#define CVSREVISION "1.24"
#define COPYRIGHT "2003"
#define AUTHORS "Fabian Pehla"
diff --git a/contrib/check_hw.sh b/contrib/check_hw.sh
index f03398eab130f0b45042ca34398cd8c2a72ca9d2..9d3b5743305daed48faaa81d12515e8511b5c042 100644 (file)
--- a/contrib/check_hw.sh
+++ b/contrib/check_hw.sh
PROGNAME=`basename $0`
PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 939 $' | sed -e 's/[^0-9.]//g'`
. $PROGPATH/utils.sh
index 1bbab60bdd36463da1db22b74431e0da54375258..922e71879d5663a7d4d1c49c2ce9a5bafe4a0d0f 100755 (executable)
#!/usr/bin/perl -w
-# $Id$
+# $Id: check_ica_master_browser.pl 1099 2005-01-25 09:09:33Z stanleyhopcroft $
-# $Log$
# Revision 1.1 2005/01/25 09:09:33 stanleyhopcroft
# New plugin - checks that ICA master browser is what it should be (important for firewalled dialup)
#
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 1099 $ ');
print "Copyright (c) 2002 Ed Rolison/Tom De Blende/S Hopcroft
Perl 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
}
sub version () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 1099 $ ');
exit $ERRORS{'OK'};
}
index cc1325ba0f9bf52ac6f7b7629622073533abaf75..0edbdcafab49ceff3011dbe0ae930b0240449529 100755 (executable)
#!/usr/bin/perl -w
-# $Id$
+# $Id: check_ica_metaframe_pub_apps.pl 1098 2005-01-25 09:07:39Z stanleyhopcroft $
-# $Log$
# Revision 1.1 2005/01/25 09:07:39 stanleyhopcroft
# Replacement (structured name mainly) for check_citrix: check of ICA browse service
#
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 1098 $ ');
print "Copyright (c) 2002 Ed Rolison/Tom De Blende/S Hopcroft
Perl Check Citrix plugin for Nagios.
}
sub version () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 1098 $ ');
exit $ERRORS{'OK'};
}
index f29c0d1da6f4ae291b7e7628d83d2e0be614e453..1f0fb4555eaffb89113ff1fe1e210aa2ac336255 100755 (executable)
#!/usr/bin/perl -w
-# $Id$
+# $Id: check_ica_program_neigbourhood.pl 1097 2005-01-25 09:05:53Z stanleyhopcroft $
-# $Log$
# Revision 1.1 2005/01/25 09:05:53 stanleyhopcroft
# New plugin to check Citrix Metaframe XP "Program Neighbourhood"
#
# 1 2 3 4 5 6 7 8
#12345678901234567890123456789012345678901234567890123456789012345678901234567890
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 1097 $ ');
my $help = <<EOHELP ;
Copyright (c) 2004 Karl DeBisschop/S Hopcroft
}
sub version () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 1097 $ ');
exit $ERRORS{'OK'};
}
index 6dc837546df8db3b705c51e2695d5aa666e9d9f6..d66e5e3f97c0f338e8cda83babced80cb3cea434 100644 (file)
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 72 $ ');
exit $ERRORS{'OK'};
}
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'$Revision: 72 $');
print "Copyright (c) 2002 Andrew Ryder\n";
print "\n";
print_usage();
index a9b52bc9ef027d7c3687fa8343ddbc0205859ed0..b68764efa65f7220841c59e99ee2ef74c8af1e7b 100644 (file)
}
sub revision() {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 211 $ ');
}
sub version () {
diff --git a/contrib/check_joy.sh b/contrib/check_joy.sh
index cd076db905764d532f1a192cec4746cd5d36dcd0..8783a59fca1af9abf6203f5f88389cf7221aa155 100755 (executable)
--- a/contrib/check_joy.sh
+++ b/contrib/check_joy.sh
PROGNAME=`basename $0`
PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 2 $' | sed -e 's/[^0-9.]//g'`
STATUS=""
. $PROGPATH/utils.sh
diff --git a/contrib/check_log2.pl b/contrib/check_log2.pl
index 61a11708fd5035d96af3b29c5ff8555a793ac8d0..f1533a0c7d155607506973cdb5fdf3ca95cc7253 100644 (file)
--- a/contrib/check_log2.pl
+++ b/contrib/check_log2.pl
#!/usr/bin/perl -w
#
-# $Id$
+# $Id: check_log2.pl 1300 2005-12-16 18:41:45Z harpermann $
#
# Log file regular expression detector for Nagios.
# Written by Aaron Bostick (abostick@mydoconline.com)
$neg_re_pattern = '';
$pattern_count = 0;
$pattern_line = '';
- $plugin_revision = '$Revision$ ';
+ $plugin_revision = '$Revision: 1300 $ ';
# Grab options from command line
GetOptions
diff --git a/contrib/check_lotus.pl b/contrib/check_lotus.pl
index c94e6c2d03e79b03761ddf80d4fa86af2459bec7..8bedced86b87a8ce249e32362a7d00cfd1aacd76 100755 (executable)
--- a/contrib/check_lotus.pl
+++ b/contrib/check_lotus.pl
#!/usr/bin/perl -w
-# $Id$
+# $Id: check_lotus.pl 1096 2005-01-25 09:04:26Z stanleyhopcroft $
-# $Log$
# Revision 1.1 2005/01/25 09:04:26 stanleyhopcroft
# New plugin to check responsiveness of Louts Notes (v5 at least) servers
#
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 1096 $ ');
print "Copyright (c) 2004 Ed Rolison/S Hopcroft
Perl Check Lotus Notes plugin for Nagios.
}
sub version () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 1096 $ ');
exit $ERRORS{'OK'};
}
diff --git a/contrib/check_mem.pl b/contrib/check_mem.pl
index f0c821293aef4d95c80e9f187895993116b40471..3227ce249bef5145b80d577e244f07c59474be92 100644 (file)
--- a/contrib/check_mem.pl
+++ b/contrib/check_mem.pl
#!/usr/bin/perl -w
-# $Id$
+# $Id: check_mem.pl 2 2002-02-28 06:42:51Z egalstad $
# check_mem.pl Copyright (C) 2000 Dan Larsson <dl@tyfon.net>
#
index cf2464af92adbe40306b43cb21ae8843245cf4b8..3a80a76a8c705d94085fed28b6fc685e6d3b20c2 100755 (executable)
#!/usr/bin/perl -w
-# $Id$
+# $Id: check_ms_spooler.pl 64 2002-07-16 00:04:42Z stanleyhopcroft $
-# $Log$
# Revision 1.1 2002/07/16 00:04:42 stanleyhopcroft
# Primitive and in need of refinement test of MS spooler (with smbclient)
#
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 64 $ ');
print "Copyright (c) 2001 Karl DeBisschop/S Hopcroft
Perl Check MS Spooler plugin for NetSaint. Display a subset of the queues on an SMB (Samba or MS) print spooler.
}
sub version () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 64 $ ');
exit $ERRORS{'OK'};
}
index 24497b245befaf54dd7c9a5221719ce4f34728f8..7ce90c8f320c0aaf3bf939ca4344860f5e96afb0 100644 (file)
# Written by: Erwan Arzur (erwan@netvalue.com)
# License: GPL
#
-# Last Modified: $Date$
-# Revisiin: $Revision$
+# Last Modified: $Date: 2002-02-28 01:42:51 -0500 (Thu, 28 Feb 2002) $
+# Revisiin: $Revision: 2 $
#
# "check_ora_table_space.pl" plugin to check the state of Oracle
# table spaces. Scarce documentation.
index 1175c1ed1aff10e321d56bb3346cdffd4f26d951..3ba8d57a73b0ef7e2bfdf21e2b2d666dd0c63e0b 100644 (file)
#!/usr/bin/perl
-# $Id$
+# $Id: check_oracle_instance.pl 10 2002-04-03 02:58:47Z sghosh $
# Copyright (c) 2002 Sven Dolderer
# some pieces of Code adopted from Adam vonNieda's oracletool.pl
use 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);
-'$Revision$' =~ /^.*(\d+.\d+) \$$/; # Use The Revision from RCS/CVS
+'$Revision: 10 $' =~ /^.*(\d+.\d+) \$$/; # Use The Revision from RCS/CVS
$VERSION = $1;
$0 =~ m!^.*/([^/]+)$!;
$PROGNAME = $1;
index 0efdd1e8b23a37d176210b9b2d237e9b383956bb..8281a4e2551b75c0e9d0d2d9fd8c634b4422faa4 100644 (file)
--- a/contrib/check_oracle_tbs
+++ b/contrib/check_oracle_tbs
my $state = $ERRORS{'UNKNOWN'};
my $answer = undef;
-my ($MAJOR_VERSION, $MINOR_VERSION) = q$Revision$ =~ /(\d+)\.(\d+)/;
+my ($MAJOR_VERSION, $MINOR_VERSION) = q$Revision: 1134 $ =~ /(\d+)\.(\d+)/;
my $VERSION = sprintf("%d.%02d", $MAJOR_VERSION - 1, $MINOR_VERSION);
my $opt_debug; # -d|--debug
diff --git a/contrib/check_pfstate b/contrib/check_pfstate
index 6fe0d9b00e24eb69c8267a07756c32055424bfe6..57dde3f612b9c13a2ba0a926de65ff6903e3756b 100644 (file)
--- a/contrib/check_pfstate
+++ b/contrib/check_pfstate
"c=s" => \$opt_c, "critical=s" => \$opt_c);
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'$Revision: 1112 $');
exit $ERRORS{'OK'};
}
if ($opt_h) {
sub print_help {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'$Revision: 1112 $');
print "Copyright (c) 2002 Jason Dixon\n\nThis plugin checks the number of state table entries on a PF-enabled OpenBSD system.\n\n";
print "Usage:\t-H, --hostname=<HOST> [-w, --warning=<WARNING>] [-c, --critical=<CRITICAL>]\n\n\tDefault warning is 50000 and critical is 60000.\n\n";
support();
diff --git a/contrib/check_rbl.c b/contrib/check_rbl.c
index 6831b657b0184cf74f0a343e3423807dde1c27de..eec84ad876a827717bdad8656cb5516015fac946 100644 (file)
--- a/contrib/check_rbl.c
+++ b/contrib/check_rbl.c
* * License: GPL
* * Copyright (c) 2000
* *
-* * $Id$
+* * $Id: check_rbl.c 970 2004-12-02 00:30:32Z opensides $
*
*****************************************************************************/
#include "string.h"
const char progname = "check_rbl";
-const char *revision = "$Revision$";
+const char *revision = "$Revision: 970 $";
//const char *copyright = "2000-2003";
//const char *email = "nagiosplug-devel@lists.sourceforge.net";
}
break;
case 'V': /* version */
- print_revision(progname,"$Revision$");
+ print_revision(progname,"$Revision: 970 $");
exit(STATE_OK);
case 'h': /* help */
print_help();
void print_help(void)
{
- print_revision(progname,"$Revision$");
+ print_revision(progname,"$Revision: 970 $");
printf
("Copyright (c) 2000 Karl DeBisschop\n\n"
"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 728535a1e44ffba3a24e238720e70310743fc11d..9d0da7265e98de48aefdb430e2a09c297af3729b 100644 (file)
--- a/contrib/check_smb.sh
+++ b/contrib/check_smb.sh
#
PROGNAME=`basename $0`
PROGPATH=`echo $0 | /bin/sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 71 $' | sed -e 's/[^0-9.]//g'`
. $PROGPATH/utils.sh
index 7a70f71a2ac664e7d22ec164747989c44c7fb0ca..9a2edaae55644df85ccbfd9e14a1b39686cb0c1b 100644 (file)
}
sub local_print_revision {
- print_revision( $PROGNAME, '$Revision$ ' )
+ print_revision( $PROGNAME, '$Revision: 82 $ ' )
}
sub print_usage {
index 9fc5fedda448f4d355fe6863c9eb2e7d9b0743de..cc7943bf6f372e66561ffc1ef6a141c7eea36e3f 100755 (executable)
$PROGNAME = "check_snmp_printer";
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'$Revision: 795 $');
exit $ERRORS{'OK'};
}
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'$Revision: 795 $');
print "Copyright (c) 2002 Subhendu Ghosh/Ethan Galstad.
This plugin reports the status of an network printer with an SNMP management
index c98ee7dc69ed9b5b3de5c3bf983d7252f5510b52..0f4459706f484d462d35ecd14038496a9a2f10ea 100644 (file)
}
sub local_print_revision {
- print_revision( $PROGNAME, '$Revision$ ' )
+ print_revision( $PROGNAME, '$Revision: 84 $ ' )
}
sub print_usage {
index 991fc715b4ed83e1ead86b0671e0c321a2f5e9ea..4d19ff17154765b724c335af43b569ab71111f9f 100644 (file)
}
if ($opt_version) {
- print_revision($PROGNAME, "\$Revision$REVISION \$");
+ print_revision($PROGNAME, "\$Revision: 1771 $REVISION \$");
exit $ERRORS{'OK'};
}
#
sub print_help {
- print_revision($PROGNAME, "\$Revision$REVISION \$");
+ print_revision($PROGNAME, "\$Revision: 1771 $REVISION \$");
print "Copyright (c) 2003 David Alden
Check if processes are running on a host via snmp
diff --git a/contrib/check_temp_cpq b/contrib/check_temp_cpq
index 14b06a2b63c514f4e3db0930fd1609e55c89a0ec..6edae6ef74ad406d7b01086c3faf4eeacc2bc66e 100644 (file)
--- a/contrib/check_temp_cpq
+++ b/contrib/check_temp_cpq
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$\n ');
+ print_revision($PROGNAME,'$Revision: 1113 $\n ');
print "Copyright (c) 2003 Rainer Duffner\n ";
print_usage();
print "\n";
}
sub version () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 1113 $ ');
exit $ERRORS{'OK'};
}
diff --git a/contrib/check_temp_fsc b/contrib/check_temp_fsc
index 6cae859ce6852f356d2644d58322a26c08ede428..33470ea144c9bacdd213f95fd3c80de8c57c8f53 100644 (file)
--- a/contrib/check_temp_fsc
+++ b/contrib/check_temp_fsc
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$\n ');
+ print_revision($PROGNAME,'$Revision: 1113 $\n ');
print "Copyright (c) 2003 Rainer Duffner\n ";
print_usage();
print "\n";
}
sub version () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 1113 $ ');
exit $ERRORS{'OK'};
}
index c8d497b066fc6e5a4baaba1be0bcb003e5016120..569dc5324fca209259f1f2ccf59df62b007c033a 100755 (executable)
#!/usr/bin/perl
-# $Id$
+# $Id: check_traceroute.pl 1115 2005-01-27 10:34:16Z stanleyhopcroft $
-# $Log$
# Revision 1.1 2005/01/27 10:34:16 stanleyhopcroft
# Jon Meek's check_traceroute for Mon hacked by YT for Nagios. Prob pretty weak
#
do { print_help ; exit $ERRORS{OK}; }
if $opt_h ;
-do { print_revision($PROGNAME, '$Revision$'); exit $ERRORS{OK}; }
+do { print_revision($PROGNAME, '$Revision: 1115 $'); exit $ERRORS{OK}; }
if $opt_V ;
do { print_help; exit $ERRORS{OK}; }
}
sub print_help () {
- print_revision($PROGNAME, '$Revision$') ;
+ print_revision($PROGNAME, '$Revision: 1115 $') ;
print "Copyright (c) 2004 J Meek/Karl DeBisschop
This 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 fe98123788840c213ea6fdbc2cdb55a49e3e3f5d..7afeb23280099467d0a2ccfbcdc63a3798365895 100644 (file)
--- a/contrib/check_uptime.c
+++ b/contrib/check_uptime.c
* Based on CHECK_LOAD.C
* Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>
*
- * Last Modified: $Date$
+ * Last Modified: $Date: 2002-02-28 21:42:56 -0500 (Thu, 28 Feb 2002) $
*
* Command line: CHECK_UPTIME <host_address>
*
if(argc != 2){
printf("Incorrect number of arguments supplied\n");
printf("\n");
- print_revision(argv[0],"$Revision$");
+ print_revision(argv[0],"$Revision: 6 $");
printf("Copyright (c) 2000 Teresa Ramanan (tlr@redowl.org)\n");
printf("\n");
printf("Usage: %s <host_address>\n",argv[0]);
diff --git a/contrib/check_vcs.pl b/contrib/check_vcs.pl
index 7ee00728393f4e2f6e9f5e268496bcee13a45826..38afdae2b5a8e8b9396578cf93f4927fc8b349d7 100644 (file)
--- a/contrib/check_vcs.pl
+++ b/contrib/check_vcs.pl
$vcs_negate = '';
$vcs_result = '';
$vcs_expected_result = 'ONLINE';
- $plugin_revision = '$Revision$ ';
+ $plugin_revision = '$Revision: 33 $ ';
# Grab options from command line
GetOptions
diff --git a/contrib/check_wins.pl b/contrib/check_wins.pl
index 0d11737f3054efdd9d03c74a98530760d18538ca..f11f86456fa83cc168aa74ea12970e79868d7fb4 100755 (executable)
--- a/contrib/check_wins.pl
+++ b/contrib/check_wins.pl
#!/usr/bin/perl -w
-# $Id$
+# $Id: check_wins.pl 940 2004-11-25 04:46:16Z stanleyhopcroft $
-# $Log$
# Revision 1.3 2004/11/25 04:46:16 stanleyhopcroft
# Non functional tidy ups to check_wins
#
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 940 $ ');
print "Copyright (c) 2001 Karl DeBisschop/S Hopcroft
Perl Check WINS plugin for NetSaint.
}
sub version () {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'$Revision: 940 $ ');
exit $ERRORS{'OK'};
}
index cd1e830ba00bbf84fe0c1395c8578f43cd76ce18..783b3333beb6f5f75befc017fe1fe631fb2b8cad 100755 (executable)
--- a/contrib/packet_utils.pm
+++ b/contrib/packet_utils.pm
package packet_utils;
-# $Id$
+# $Id: packet_utils.pm 1100 2005-01-25 09:12:47Z stanleyhopcroft $
-# $Log$
# Revision 1.1 2005/01/25 09:12:47 stanleyhopcroft
# packet creation and dumping hacks used by check_ica* and check_lotus
#
diff --git a/contrib/utils.py b/contrib/utils.py
index 73d795c93382d95aebdef07935d1dc346af5bb46..db0f1c90319c2f18a22fce6c85261a7c3213fb49 100644 (file)
--- a/contrib/utils.py
+++ b/contrib/utils.py
#==========================================================================
#
-# Version: = '$Id$'
+# Version: = '$Id: utils.py 2 2002-02-28 06:42:51Z egalstad $'
#
# (C) Rob W.W. Hooft, Nonius BV, 1998
#
diff --git a/doc/BRANCHING b/doc/BRANCHING
--- a/doc/BRANCHING
+++ /dev/null
@@ -1,10 +0,0 @@
-NOTES ON BRANCHING NAGIOSPLUG
-
-Questions:
-Is this necessary?
-
-Branch format: b1_4_1
-
-cvs tab -b r1_4-patches
-
-Consider the SF snapshot branches - should you remove any other branches?
index 121549fc54ade854de7e4d899f391fe9a37644cb..ed7e422692f7c821063be0e372c3ef42b8583db7 100644 (file)
<revhistory>
<revision>
- <revnumber>$Revision$</revnumber>
- <date>$Date$</date>
+ <revnumber>1796</revnumber>
+ <date>2007-09-24 14:51:07 -0400 (Mon, 24 Sep 2007)</date>
</revision>
</revhistory>
diff --git a/lib/extra_opts.c b/lib/extra_opts.c
index 7e50c178e02cdfce1a8651f4e8de180743234c87..2939c7a14e1ad80364c8a822664f4ae41b8b4ee3 100644 (file)
--- a/lib/extra_opts.c
+++ b/lib/extra_opts.c
* License: GPL
* Copyright (c) 2007 Nagios Plugins Development Team
*
-* Last Modified: $Date: 2008-03-15 18:42:01 -0400 (Sat, 15 Mar 2008) $
-*
-*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id: parse_ini.c 1950 2008-03-15 22:42:01Z dermoth $
-*
*****************************************************************************/
#include "common.h"
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index c19952dbb6343dd3efaa6191bd04a8b9c5b5373a..1d64a5062512e098dcec5efc97b4b33e8afe99e6 100644 (file)
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
* License: GPL
* Copyright (c) 2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
-*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
index 12b926862c0436e4f3bcf2277adad42fa09bf8f3..5103d10df64f871c824261df323acba6bb8f1c3e 100644 (file)
--- a/lib/tests/test_base64.c
+++ b/lib/tests/test_base64.c
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/lib/tests/test_cmd.c b/lib/tests/test_cmd.c
index 961da644b3122b0a46b70df5b44aabf9957ccbcf..29ca42acaf8b3b4c06a215a38cd8d0e10394a7a9 100644 (file)
--- a/lib/tests/test_cmd.c
+++ b/lib/tests/test_cmd.c
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/lib/tests/test_disk.c b/lib/tests/test_disk.c
index 06c9baa932b10c6584696324b6f1f288be868e6c..d6042222e749eb9b1c38404ddd9ca2a3917466f3 100644 (file)
--- a/lib/tests/test_disk.c
+++ b/lib/tests/test_disk.c
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/lib/tests/test_ini.c b/lib/tests/test_ini.c
index 76a948b4dea8108e9afe6e59914b9090e222eca9..c0853d7c5c40f4bfa2d9f6e9b4012472577ca3e3 100644 (file)
--- a/lib/tests/test_ini.c
+++ b/lib/tests/test_ini.c
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/lib/tests/test_opts.c b/lib/tests/test_opts.c
index 6d6167ebf2061540c6dc1497e0a9d466f0fe4f4f..ad9a85485c0ad10a86c7c469c5f2b2a3ef4598c6 100644 (file)
--- a/lib/tests/test_opts.c
+++ b/lib/tests/test_opts.c
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id: test_ini.c 1951 2008-03-16 18:10:47Z dermoth $
-*
*****************************************************************************/
#include "common.h"
diff --git a/lib/tests/test_tcp.c b/lib/tests/test_tcp.c
index 96947076f60fd2d7188e8caf3b394fc6914aac25..6cf9394613ba1839b1fb3c0fa29c9c5022caeda1 100644 (file)
--- a/lib/tests/test_tcp.c
+++ b/lib/tests/test_tcp.c
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index b2a9e69c8a87673a63c3ca4b0a16c7165c7c3e78..64efca23d9748dc415520b1b1fcd8994bbd473bc 100644 (file)
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/lib/utils_base.c b/lib/utils_base.c
index 68f456756b6f01e60521086fa5b26f64129b87c2..d6437fc8b0b85adb13e7f025c26d8fdbab5cfa76 100644 (file)
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
* License: GPL
* Copyright (c) 2006 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Library of useful functions for plugins
*
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index 5ba2f55e56a2300fabe4941899e1ea6e1f46ec9c..e10ab918845d3a125bbf0e4563ffddbf2a1d705a 100644 (file)
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
* License: GPL
* Copyright (c) 2005-2006 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description :
*
* A simple interface to executing programs from other programs, using an
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
index ba2b21d7a27d408f37a68f76922a0f1d6a8a1454..3d20f4d4125c075e9dbc5762d79758564a4985d8 100644 (file)
--- a/lib/utils_disk.c
+++ b/lib/utils_disk.c
* License: GPL
* Copyright (c) 1999-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains utilities for check_disk. These are tested by libtap
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/lib/utils_tcp.c b/lib/utils_tcp.c
index 58d50b6a7379c5a1abc2fa941f6cbc7b811095d0..8589ce6711c8239bf0345045823e437245b31e85 100644 (file)
--- a/lib/utils_tcp.c
+++ b/lib/utils_tcp.c
* License: GPL
* Copyright (c) 1999-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains utilities for check_tcp. These are tested by libtap
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
index 107d9933d2e828418d8744c17eb231b2daa6b66e..de8813ffe052531327c454023e5c2896cbf4dd06 100644 (file)
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
## Process this file with automake to produce Makefile.in
+NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
+ @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
+-include NP-VERSION-FILE
+
+AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
+
VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t $(srcdir)
INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@
check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS)
check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS)
+
+all-local: .FORCE-NP-VERSION-FILE
+
+clean-local:
+ rm -f NP-VERSION-FILE
+
+.PHONY: .FORCE-NP-VERSION-FILE
index 35874a93b61455ff53c012d6628911b018316fa7..bdd348f20dc50c54a3e0872ba0d1e6cfdf21c6b2 100644 (file)
* Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)
* Copyright (c) 2001-2007 Nagios Plugin Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_dhcp plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_dhcp";
-const char *revision = "$Revision$";
const char *copyright = "2001-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
break;
case 'V': /* version */
- print_revision(progname,revision);
+ print_revision(progname, NP_VERSION);
exit(STATE_OK);
case 'h': /* help */
/* print usage help */
void print_help(void){
- print_revision(progname,revision);
+ print_revision(progname, NP_VERSION);
printf("Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)\n");
printf (COPYRIGHT, copyright, email);
index cc3f3d593dffe7ae27b814011ce2f24b89fc12a2..bbdfae75a1c81cb44a6a29a53566370252d1963d 100644 (file)
* Copyright (c) 2005-2008 Nagios Plugins Development Team
* Original Author : Andreas Ericsson <ae@op5.se>
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_icmp plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
/* progname may change */
/* char *progname = "check_icmp"; */
char *progname;
-const char *revision = "$Revision$";
const char *copyright = "2005-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
set_source_ip(optarg);
break;
case 'V': /* version */
- /*print_revision (progname, revision);*/ /* FIXME: Why? */
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
print_help(void)
{
- /*print_revision (progname, revision);*/ /* FIXME: Why? */
+ /*print_revision (progname);*/ /* FIXME: Why? */
printf ("Copyright (c) 2005 Andreas Ericsson <ae@op5.se>\n");
printf (COPYRIGHT, copyright, email);
index 11535ea6c21e4b93d3e6e757efc6340dcbfd88f8..78bfd638f628590cdac0f5b4bb845bcec40aba16 100644 (file)
#
# Ping Response Tests via check_icmp
#
-# $Id$
-#
use strict;
use Test::More;
index 01fca20d2eb95d49cc9db67eb71b4573d3743dc6..c9e3e40e0e96d0197508494b3042380634b85b17 100644 (file)
## Process this file with automake to produce Makefile.in
+NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
+ @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
+-include NP-VERSION-FILE
+
+export NP_VERSION:= $(NP_VERSION)
+
SUFFIXES = .pl .sh
VPATH=$(top_srcdir) $(top_srcdir)/plugins-scripts $(top_srcdir)/plugins-scripts/t
TESTS = @SCRIPT_TEST@
+all-local: NP-VERSION-FILE
+
test:
perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
perl -I $(top_builddir) -I $(top_srcdir) ../test.pl t/utils.t # utils.t is excluded from above, so manually ask to test
.sh :
$(AWK) -f ./subst $< > $@
chmod +x $@
+
+clean-local:
+ rm -f NP-VERSION-FILE
+
+.PHONY: .FORCE-NP-VERSION-FILE
index 0e9cffb88f60f3061202984f026a3162daef5f33..a4e8542cbe8ca3c4986b8653e636c28262c3570e 100755 (executable)
"C=s" => \$opt_C, "community=s" => \$opt_C);
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'@NP_VERSION@');
exit $ERRORS{'OK'};
}
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'@NP_VERSION@');
print "Copyright (c) 2000 Jeffrey Blank/Karl DeBisschop
This plugin reports the signal strength of a Breezecom wireless equipment
index 4f8a9a73ab7925ea69571fd6b1d7a09e8b53d6f6..3f531ac75c71a10320d8f09a0812bcc4b7226a46 100755 (executable)
# drives is a pain in the butt
# 2-May-2002 - SGhosh fix for embedded perl
#
-# $Id$
#
require 5.004;
"H=s" => \$opt_H, "hostname=s" => \$opt_H);
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$'); #'
+ print_revision($PROGNAME,'@NP_VERSION@'); #'
exit $ERRORS{'OK'};
}
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'@NP_VERSION@');
print "Copyright (c) 2000 Michael Anthon/Karl DeBisschop
Perl Check SMB Disk plugin for Nagios
index ca8883e5456384ee172b52f08a69f919f206a9fd..dcd5efab8305983cda8c529be2f25b52cbf0d1bd 100755 (executable)
#!/bin/perl -w
-# $Id$
# check_file_age.pl Copyright (C) 2003 Steven Grimm <koreth-nagios@midwinter.com>
#
"C=f" => \$opt_C, "critical-size=f" => \$opt_C);
if ($opt_V) {
- print_revision($PROGNAME, '$Revision$');
+ print_revision($PROGNAME, '@NP_VERSION@');
exit $ERRORS{'OK'};
}
}
sub print_help () {
- print_revision($PROGNAME, '$Revision$');
+ print_revision($PROGNAME, '@NP_VERSION@');
print "Copyright (c) 2003 Steven Grimm\n\n";
print_usage();
print "\n";
index ade5843c306efa7102ecadf1ca74251eb9663d26..54d933c723ffbd313d42e192c72fa5736883ffcb 100755 (executable)
# initial version: 9-10-99 Ernst-Dieter Martin edmt@infineon.com
#
# License: GPL
-# $Id$
#
# lmstat output patches from Steve Rigler/Cliff Rice 13-Apr-2002
# srigler@marathonoil.com,cerice@marathonoil.com
"t=i" => \$opt_t, "timeout=i" => \$opt_t);
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'@NP_VERSION@');
exit $ERRORS{'OK'};
}
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'@NP_VERSION@');
print "Copyright (c) 2000 Ernst-Dieter Martin/Karl DeBisschop
Check available flexlm license managers
# Report bugs to: nagiosplug-help@lists.sourceforge.net
#
# 11.01.2000 Version 1.0
-# $Id$
#
# Patches from Guy Van Den Bergh to warn on ifadminstatus down interfaces
# instead of critical.
printf "intensive. Use it sparingly or not at all. -n is used to match against\n";
printf "a much more descriptive ifName value in the IfXTable to verify that the\n";
printf "snmpkey has not changed to some other network interface after a reboot.\n\n";
- print_revision($PROGNAME, '$Revision$');
+ print_revision($PROGNAME, '@NP_VERSION@');
}
}
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'@NP_VERSION@');
exit $ERRORS{'OK'};
}
index 1a168bf013961a4b3ff56062ad37aaf30889e8a3..bae3ffa71af67ed9d322ce82083a962e7f40b49e 100755 (executable)
#
# 11.01.2000 Version 1.0
#
-# $Id$
use POSIX;
use strict;
printf " -t (--timeout) seconds before the plugin times out (default=$TIMEOUT)\n";
printf " -V (--version) Plugin version\n";
printf " -h (--help) usage help \n\n";
- print_revision($PROGNAME, '$Revision$');
+ print_revision($PROGNAME, '@NP_VERSION@');
}
exit $ERRORS{'OK'};
}
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'@NP_VERSION@');
exit $ERRORS{'OK'};
}
index 7a90a96b5184163568b847798b0854661f8835d5..cc730cff3d46e1089899cfff750ca825ae0f2033 100755 (executable)
#
# Date: 1999/09/20
#
-# $Id$
#
# Description: This script will check to see if an IRCD is running
# about how many users it has
sub print_help ()
{
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'@NP_VERSION@');
print "Copyright (c) 2000 Richard Mayhew/Karl DeBisschop
Perl Check IRCD plugin for Nagios
"H=s" => \$opt_H, "hostname=s" => \$opt_H);
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'@NP_VERSION@');
exit $ERRORS{'OK'};
}
index 6f6e68c21994c8c26fcaf51860bd0c71070ad5cf..a1bfb486c7afa021f5d374de30d8e5cf8bcf4b23 100755 (executable)
PROGNAME=`/bin/basename $0`
PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'`
+REVISION="@NP_VERSION@"
. $PROGPATH/utils.sh
index c676e41a1ac6a3b78d2447d90a1ad427dcf02dbf..95ef2ce10514094a84be9145168123ae17465037 100755 (executable)
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
-# $Id$
#
############################################################################
);
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'@NP_VERSION@');
exit $ERRORS{'OK'};
}
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'@NP_VERSION@');
print "Copyright (c) 2002 Subhendu Ghosh/Carlos Canau/Benjamin Schmid\n";
print "\n";
print_usage();
index fa15476b754babae1d507f072d5d32fe060fc1d3..9a8fc5117195457ffca41e5534e8b9e02a96f9c5 100755 (executable)
#
# Report bugs to: nagiosplug-help@lists.sourceforge.net
#
-# $Id$
#
"V" => \$opt_V, "version" => \$opt_V);
if (defined $opt_V) {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'@NP_VERSION@');
exit $ERRORS{'OK'};
}
index 6872b9320a813215f1d541b9bf3d0c94652a616f..ecdbdb1a39f752677d22540eff925084becd9f9d 100755 (executable)
#
# Copyright 2000, virCIO, LLP
#
-# $Log$
# Revision 1.3 2002/05/07 05:35:49 sghosh
# 2nd fix for ePN
#
index d4175f64da8a5361f44d388034ecf0e6feefa8fe..5c87e0a66e66ba003b9d3b6597c0d0fd086a9993 100755 (executable)
# be installed on the system, however since it's part of the ntp suite, you
# should already have it installed.
#
-# $Id$
#
# Nothing clever done in this program - its a very simple bare basics hack to
# get the job done.
"H=s" => \$opt_H, "hostname=s" => \$opt_H);
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'@NP_VERSION@');
exit $ERRORS{'OK'};
}
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'@NP_VERSION@');
print "Copyright (c) 2003 Bo Kersey/Karl DeBisschop\n";
print "\n";
print_usage();
index 0a8f1521ad604354d67144a765c553881286bf88..664795eb29932526047f3408467ffd3aefdb7600 100755 (executable)
PROGNAME=`basename $0`
PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'`
+REVISION="@NP_VERSION@"
. $PROGPATH/utils.sh
index 20c204dee7de93960a72d083bf7bdec6bc429e6f..d2701e95075db6c2af19f676614b34b1148a10b5 100755 (executable)
#
# initial version: 3 May 2000 by Truongchinh Nguyen and Karl DeBisschop
# Modified May 2002 Subhendu Ghosh - support for ePN and patches
-# current status: $Revision$
#
# Copyright Notice: GPL
-# $Id$
#
use strict;
sub print_usage ();
sub in ($$);
-$ENV{'BASH_ENV'}='';
+$ENV{'BASH_ENV'}='';
$ENV{'ENV'}='';
$ENV{'PATH'}='';
$ENV{'LC_ALL'}='C';
#Initialise protocol for each progname number
-# 'u' for UDP, 't' for TCP
+# 'u' for UDP, 't' for TCP
$proto[10003]='u';
$proto[10004]='u';
$proto[10007]='u';
if ($opt_h) { print_help(); exit $ERRORS{'OK'}; }
# -V means display version number
-if ($opt_V) {
- print_revision($PROGNAME,'$Revision$ ');
- exit $ERRORS{'OK'};
+if ($opt_V) {
+ print_revision($PROGNAME,'@NP_VERSION@');
+ exit $ERRORS{'OK'};
}
# Hash containing all RPC program names and numbers
}else{
print "Version $vers is not an integer\n" if $verbose;
}
-
+
}
}else{
get_rpcinfo();
while ( $line = <CMD> ) {
printf "$line " if $verbose;
chomp $line;
-
+
if ( $line =~ /program $prognum version ([0-9]*) ready and waiting/ ) {
$response .= " version $1";
$state = 'OK' unless $state ne 'UNKNOWN';
sub print_help() {
- print_revision($PROGNAME,'$Revision$ ');
+ print_revision($PROGNAME,'@NP_VERSION@');
print "Copyright (c) 2002 Karl DeBisschop/Truongchinh Nguyen/Subhendu Ghosh\n";
print "\n";
print "Check if a rpc service is registered and running using\n";
index 7e1d3333b7d2fe3187075b2644a0d115612aeadc..ae80fc44165d2f48edcf428489879c938315010d 100755 (executable)
PROGNAME=`basename $0`
PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision$' | sed -e 's/[^0-9.]//g'`
+REVISION="@NP_VERSION@"
. $PROGPATH/utils.sh
index fe2170179164ecac68458ce49c273ae9fc8afd83..2671112a0d392c24ffbc698741757ae46352c329 100755 (executable)
#!/usr/bin/perl -wT
#
-# $Id$
use strict;
"H=s" => \$opt_H, "hostname=s" => \$opt_H);
if ($opt_V) {
- print_revision($PROGNAME,'$Revision$'); #'
+ print_revision($PROGNAME,'@NP_VERSION@'); #'
exit $ERRORS{'OK'};
}
}
sub print_help () {
- print_revision($PROGNAME,'$Revision$');
+ print_revision($PROGNAME,'@NP_VERSION@');
print "Copyright (c) 2000 Jeffery Blank/Karl DeBisschop\n";
print "\n";
print_usage();
index 8986868439a095e2034e85e997c5e04bc1e8129c..80b93d9d3c5d8cbf4b82a96eb2f10eab2eeab879 100644 (file)
--- a/plugins-scripts/subst.in
+++ b/plugins-scripts/subst.in
}
+# Plugin revision
+/@NP_VERSION@/ {sub(/@NP_VERSION@/,ENVIRON["NP_VERSION"]);}
+
# scripting language (first line)
/^#! ?\/.*\/python/ {sub(/^#! ?\/.*\/python/,"#! @PYTHON@");}
index 372b9f2ecaa26fb3c11228ba1464c3018de40585..384c276bf577384fbd8a318bd3af13fc428b55e4 100644 (file)
#
# check_file_age tests
#
-# $Id$
#
use strict;
index 9fff0ee991d17b7ea561fc228504fbba5ba9380a..be8ae2f77c9e8f012c4d818dd8ddb27a43514ea6 100644 (file)
#
# Remote Procedure Call (RPC) Tests via check_rpc
#
-# $Id$
#
use strict;
index f37f567fb011c154e9ce56d938d580fc876ea618..9c2c56956e1978276e94b3e073fae6892f6016d3 100644 (file)
#
# utils.pm tests
#
-# $Id$
#
# Run with perl t/utils.t
index 08776f181ea33108a39076f7a117d1534651b7aa..37cd62c3b8210f3476f0f3964491eb3a35e3caf3 100644 (file)
# Utility drawer for Nagios plugins.
-# $Id$
#
# This will be deprecated soon. Please use Nagios::Plugin from CPAN
# for new plugins
sub print_revision ($$) {
my $commandName = shift;
my $pluginRevision = shift;
- $pluginRevision =~ s/^\$Revision: //;
- $pluginRevision =~ s/ \$\s*$//;
print "$commandName v$pluginRevision (@PACKAGE@ @VERSION@)\n";
print "@WARRANTY@";
}
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 85e4a5dd2d0997b0658220489acb9d8badbcae4b..59876902a92b7bfa003ba5b1e230f203966e5603 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
## Process this file with automake to produce Makefile.in
+NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
+ @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
+-include NP-VERSION-FILE
+
+AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
+
VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
check_load_LDADD = $(BASEOBJS) popen.o
check_mrtg_LDADD = $(BASEOBJS)
check_mrtgtraf_LDADD = $(BASEOBJS)
-check_mysql_CFLAGS = $(MYSQLCFLAGS)
+check_mysql_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"'
check_mysql_CPPFLAGS = $(MYSQLINCLUDE)
check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS)
-check_mysql_query_CFLAGS = $(MYSQLCFLAGS)
+check_mysql_query_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"'
check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE)
check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS)
check_nagios_LDADD = $(BASEOBJS) runcmd.o
gethostbyname.o: gethostbyname.h $(PLUGINHDRS)
-all-local: $(check_tcp_programs)
+all-local: $(check_tcp_programs) NP-VERSION-FILE
$(check_tcp_programs): check_tcp
rm -f $@
clean-local:
rm -f $(check_tcp_programs)
+ rm -f NP-VERSION-FILE
uninstall-local:
cd $(DESTDIR)$(libexecdir) && rm -f $(check_tcp_programs)
+
+.PHONY: .FORCE-NP-VERSION-FILE
+
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index 49a7c4f7235ebaa1e75002bf127d17110e266542..3da54bcfcd03c7623cb4bf67f9ddbe673330dcb0 100644 (file)
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
*
* Original author: Sean Finney
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_apt plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
-*
*****************************************************************************/
const char *progname = "check_apt";
-const char *revision = "$Revision$";
const char *copyright = "2006-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help();
exit(STATE_OK);
case 'V':
- print_revision(progname, revision);
+ print_revision(progname, NP_VERSION);
exit(STATE_OK);
case 'v':
verbose++;
void
print_help (void)
{
- print_revision(progname, revision);
+ print_revision(progname, NP_VERSION);
printf(_(COPYRIGHT), copyright, email);
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index ce62ebafb3816fed1fbd45f28177bedb23fe570f..d0dbf34a140e289342465d80dcf6f955568790a7 100644 (file)
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
* License: GPL
* Copyright (c) 2000-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_by_ssh plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_by_ssh";
-const char *revision = "$Revision$";
const char *copyright = "2000-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
switch (c) {
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
printf (COPYRIGHT, copyright, email);
index 04919e0de18cf2f505779a442d8de070ad10e71a..013858863f10d89b2925ea3183b3eaca1e0bcad9 100644 (file)
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
* Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)
* Copyright (c) 2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
-*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_cluster";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
break;
void
print_help(void)
{
- print_revision(progname, revision);
+ print_revision(progname, NP_VERSION);
printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n");
printf(COPYRIGHT, copyright, email);
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 34197ecc44836d7b200cd69f17e7c89f94e4c6ba..08be937361082a3bf4c291c031230ff75103209d 100644 (file)
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
* License: GPL
* Copyright (c) 2002-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_dig plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
* because on some architectures those strings are in non-writable memory */
const char *progname = "check_dig";
-const char *revision = "$Revision$";
const char *copyright = "2002-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'H': /* hostname */
host_or_die(optarg);
asprintf (&myport, "%d", DEFAULT_PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 12b77a8ab8b16d7d36d446f548fc2326d1a52403..98a061fbe614e63a93e5d28a12b41467cb8cda9a 100644 (file)
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
* License: GPL
* Copyright (c) 1999-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_disk plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_disk";
const char *program_name = "check_disk"; /* Required for coreutils libs */
-const char *revision = "$Revision$";
const char *copyright = "1999-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
group = NULL;
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
@@ -896,7 +892,7 @@ INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be greate
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 6bedfefc145c0fd33174d7f48b10099f00c2b1c8..bb206a05680ea4e5360902286f5ecc5e449cee65 100644 (file)
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
* License: GPL
* Copyright (c) 2000-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_dns plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_dns";
-const char *revision = "$Revision$";
const char *copyright = "2000-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'v': /* version */
verbose = TRUE;
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index ff600a7956b9a78fbc1defbafa7672bf413d4406..8c3f53540267d352723c92fe21ba55bb700f31dd 100644 (file)
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
* License: GPL
* Copyright (c) 1999-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_dummy plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_dummy";
-const char *revision = "$Revision$";
const char *copyright = "1999-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
if (argc < 2)
usage4 (_("Could not parse arguments"));
else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) {
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
}
else if (strcmp (argv[1], "-h") == 0 || strcmp (argv[1], "--help") == 0) {
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index aeb2f936169fd43427b30bfc6bd893b11cfc29b0..75c7860d681bdfc3e82935350c99796dd22697bf 100644 (file)
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
* License: GPL
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_disk plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_fping";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'v': /* verbose mode */
verbose = TRUE;
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Didi Rieder <adrieder@sbox.tu-graz.ac.at>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_game.c b/plugins/check_game.c
index 2a23b7426483c20778f2f358452ec7786a9d05c6..235be65ca6125b9ddb97ad93f9e53d81e35fc757 100644 (file)
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
* License: GPL
* Copyright (c) 2002-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_game plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_game";
-const char *revision = "$Revision$";
const char *copyright = "2002-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'v': /* version */
verbose = TRUE;
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index c815cc70467f48815c52738e7927b3b1d0376668..add9cc82db6fa536f8db8bd769362a328424a85d 100644 (file)
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
* License: GPL
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_hpjd plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_hpjd";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
community = strscpy (community, optarg);
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 0d499d9359db0a5b198cb428f1b02b030f647e41..f4a7e5e602187387f239107e4b13d7106c046566 100644 (file)
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
* License: GPL
* Copyright (c) 1999-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_http plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
/* splint -I. -I../../plugins -I../../lib/ -I/usr/kerberos/include/ ../../plugins/check_http.c */
const char *progname = "check_http";
-const char *revision = "$Revision$";
const char *copyright = "1999-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
/* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */
server_url = strdup(HTTP_URL);
server_url_length = strlen(server_url);
- asprintf (&user_agent, "User-Agent: check_http/%s (nagios-plugins %s)",
- clean_revstring (revision), VERSION);
+ asprintf (&user_agent, "User-Agent: check_http/v%s (nagios-plugins %s)",
+ NP_VERSION, VERSION);
/* Parse extra opts if any */
argv=np_extra_opts (&argc, argv, progname);
exit (STATE_OK);
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
break;
case 't': /* timeout period */
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
index b0a7ef6c3648867597219a62131c87407a1ffbdb..b0b0189051e4b642dbfadc1cac31b945fe267ed6 100644 (file)
* Copyright (c) 2000 Robert Dale <rdale@digital-mission.com>
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_ide_smart plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_ide_smart";
-const char *revision = "$Revision$";
const char *copyright = "1998-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
return STATE_OK;
case 'V':
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
return STATE_OK;
default:
usage5 ();
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Nagios feature - 1999 Robert Dale <rdale@digital-mission.com>\n");
printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n");
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index d0134a09293e698c20ea114192f77abb29a77b2b..7ef4509c0c2ffd39569bdf060c54d1ad61469dee 100644 (file)
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
* License: GPL
* Copyright (c) 2000-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_ldap plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
/* progname may be check_ldaps */
char *progname = "check_ldap";
-const char *revision = "$Revision$";
const char *copyright = "2000-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 't': /* timeout period */
if (!is_intnonneg (optarg))
char *myport;
asprintf (&myport, "%d", DEFAULT_PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 5ff9a8c0517d9d25a95d7ec2d686b6b298f7f3af..940d37ec9417cf54cc9b31c3acd6ceb93aef09ae 100644 (file)
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
* License: GPL
* Copyright (c) 1999-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_load plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_load";
-const char *revision = "$Revision$";
const char *copyright = "1999-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
take_into_account_cpus = 1;
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index a0bdbeba82e6d8f39b3b79415f29965f26e2bb82..550326b1405bce6829bd01d9c34738f5f2ee1616 100644 (file)
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
* License: GPL
* Copyright (c) 1999-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_mrtg plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_mrtg";
-const char *revision = "$Revision$";
const char *copyright = "1999-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
units = optarg;
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
index 1911d568abdae606a5c8b1f511c8c145724a7d82..3232f1e7a7681525afee1b76f58eb773f0a7aac8 100644 (file)
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
* License: GPL
* Copyright (c) 1999-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_mtrgtraf plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
#include "utils.h"
const char *progname = "check_mrtgtraf";
-const char *revision = "$Revision$";
const char *copyright = "1999-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
&outgoing_warning_threshold);
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 77f3b89b43c382e7e0b4e2be155d45d3c07f3a2d..a1a63769f2386c46a0fc7a232466a75a17e09e71 100644 (file)
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
* Copyright (c) 1999-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_mysql plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_mysql";
-const char *revision = "$Revision$";
const char *copyright = "1999-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
critical = optarg;
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
char *myport;
asprintf (&myport, "%d", MYSQL_PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf (_(COPYRIGHT), copyright, email);
index a92b85701a56fc879c0ad3b76907ce77c8f43d6d..802e345611114be73825d39f7b411d56f03fdf2a 100644 (file)
* Copyright (c) 2006-2007 Nagios Plugins Development Team
* Original code from check_mysql, copyright 1999 Didi Rieder
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_mysql_query plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_mysql_query";
-const char *revision = "$Revision$";
const char *copyright = "1999-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
verbose++;
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
char *myport;
asprintf (&myport, "%d", MYSQL_PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf (_(COPYRIGHT), copyright, email);
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index a2debe217d5c0a6c08b0bb168acb55a5765e8589..954ff711707dfc4402283d1cd7a197fe51af66e1 100644 (file)
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
* License: GPL
* Copyright (c) 1999-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_nagios plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_nagios";
-const char *revision = "$Revision$";
const char *copyright = "1999-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'F': /* status log */
status_log = optarg;
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf (_(COPYRIGHT), copyright, email);
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index a0e5c11927b40c22c90b8bdf073dc7578083a355..4d9157a6e4d3665967a4ca1b3fec0793da9edc89 100644 (file)
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
* Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com)
* Copyright (c) 2003-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_nt plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_nt";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help();
exit(STATE_OK);
case 'V': /* version */
- print_revision(progname,revision);
+ print_revision(progname, NP_VERSION);
exit(STATE_OK);
case 'H': /* hostname */
if (server_address) free(server_address);
void print_help(void)
{
- print_revision(progname,revision);
+ print_revision(progname, NP_VERSION);
printf ("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 20ecf64fecadd44789f52a9a63adec270f43f0c4..ada7f0c375ea90617109ec7123b0f9d098516356 100644 (file)
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
* Copyright (c) 2006 Sean Finney <seanius@seanius.net>
* Copyright (c) 2006-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_ntp plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_ntp";
-const char *revision = "$Revision$";
const char *copyright = "2006-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
exit(STATE_OK);
break;
case 'V':
- print_revision(progname, revision);
+ print_revision(progname, NP_VERSION);
exit(STATE_OK);
break;
case 'v':
void print_help(void){
- print_revision(progname, revision);
+ print_revision(progname, NP_VERSION);
printf ("Copyright (c) 2006 Sean Finney\n");
printf (COPYRIGHT, copyright, email);
index 17876dd86f99d74cf44539ba55a1afb3aadba18b..acca17b5b98ca4749ea062069c6cf675519a5681 100644 (file)
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
* Copyright (c) 2006 Sean Finney <seanius@seanius.net>
* Copyright (c) 2006-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_ntp_peer plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_ntp_peer";
-const char *revision = "$Revision$";
const char *copyright = "2006-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
exit(STATE_OK);
break;
case 'V':
- print_revision(progname, revision);
+ print_revision(progname, NP_VERSION);
exit(STATE_OK);
break;
case 'v':
void print_help(void){
- print_revision(progname, revision);
+ print_revision(progname, NP_VERSION);
printf ("Copyright (c) 2006 Sean Finney\n");
printf (COPYRIGHT, copyright, email);
index a5b122f39b94ce132d2665a70520174e33e8a6c6..c7c7a754ca3b82409eb0c25fde9c22d0295597b1 100644 (file)
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
* Copyright (c) 2006 Sean Finney <seanius@seanius.net>
* Copyright (c) 2006-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_ntp_time plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_ntp_time";
-const char *revision = "$Revision$";
const char *copyright = "2006-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
exit(STATE_OK);
break;
case 'V':
- print_revision(progname, revision);
+ print_revision(progname, NP_VERSION);
exit(STATE_OK);
break;
case 'v':
}
void print_help(void){
- print_revision(progname, revision);
+ print_revision(progname, NP_VERSION);
printf ("Copyright (c) 2006 Sean Finney\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index c0e5ece9f9c0e90f30dde8c213fa34f15cea4ae4..72a47b16e71b6c8b734f9d39ac59c2598c0e2974 100644 (file)
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
* License: GPL
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_nwstat plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_nwstat";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help();
exit(STATE_OK);
case 'V': /* version */
- print_revision(progname, revision);
+ print_revision(progname, NP_VERSION);
exit(STATE_OK);
case 'H': /* hostname */
server_address=optarg;
char *myport;
asprintf (&myport, "%d", PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index af04d3b4c02f8f2442c3102222792944265bd5fe..1d9ec8cf0a5ba4a52768b86f1af3ae761590afe7 100644 (file)
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
* License: GPL
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_overcr plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_overcr";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'H': /* hostname */
server_address = optarg;
char *myport;
asprintf (&myport, "%d", PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 869ef673401574c582a105959b77e96bbf7fe49f..abe721bf696a5802d60e4922c7e7fd6896733f4c 100644 (file)
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
* License: GPL
* Copyright (c) 1999-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_pgsql plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_pgsql";
-const char *revision = "$Revision$";
const char *copyright = "1999-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 't': /* timeout period */
if (!is_integer (optarg))
asprintf (&myport, "%d", DEFAULT_PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index c457ad644a3a865b89b5974461bb268de715b69a..8c4c0e64f4f2584b9ddf3ecfa34d3bf375537918 100644 (file)
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
* License: GPL
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_ping plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_ping";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
exit (STATE_OK);
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
break;
case 't': /* timeout period */
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 4aaeddb240bd89f8cb172cdaa18b1405a57dd228..4c72950167f9c56c2df56a57e847bdab452e00d0 100644 (file)
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
* License: GPL
* Copyright (c) 2000-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_procs plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_procs";
const char *program_name = "check_procs"; /* Required for coreutils libs */
-const char *revision = "$Revision$";
const char *copyright = "2000-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 't': /* timeout period */
if (!is_integer (optarg))
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index e0b0e2c26b13ec781e929d09463ce22a75626274..98f6bf98e6b551f6e1c6a3e9b17957b0e9a7c886 100644 (file)
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
* License: GPL
* Copyright (c) 1999-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_radius plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_radius";
-const char *revision = "$Revision$";
const char *copyright = "2000-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
exit (OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (OK);
case 'v': /* verbose mode */
verbose = TRUE;
char *myport;
asprintf (&myport, "%d", PW_AUTH_UDP_PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Robert August Vincent II\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_real.c b/plugins/check_real.c
index d333c2a3c8509172b25dde74f37c07f5f0eff207..cbc3103c41b05756c7e64eb7ebe5b6b265512ed5 100644 (file)
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
* License: GPL
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_real plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_real";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
}
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
char *myport;
asprintf (&myport, "%d", PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Pedro Leite <leite@cic.ua.pt>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 4986fe657156dd34e1697f0718a02891fa8db832..6040aa121236a2f595a6b749ab8611d296940d6c 100644 (file)
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
* License: GPL
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_smtp plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_smtp";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
#endif
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
char *myport;
asprintf (&myport, "%d", SMTP_PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999-2001 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 0aafd95190bbf9faeaa90d4d9e9402efb312437f..1c92534c284e52df0ef3f4a4f24f3a4b148de22e 100644 (file)
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
* License: GPL
* Copyright (c) 1999-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_snmp plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_snmp";
-const char *revision = "$Revision$";
const char *copyright = "1999-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'v': /* verbose */
verbose = TRUE;
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 2e16e6510afcebad9832b2715e8b505fc58cc50e..04cc4d971f42c8caabd45179b0bbcc2f2ca33b6a 100644 (file)
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
* License: GPL
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_ssh plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_ssh";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
case '?': /* help */
usage5 ();
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
char *buffer = NULL;
char *ssh_proto = NULL;
char *ssh_server = NULL;
- char rev_no[20];
-
- sscanf ("$Revision$", "$Revision: %[0123456789.]", rev_no);
+ static char *rev_no = VERSION;
result = my_tcp_connect (haddr, hport, &sd);
char *myport;
asprintf (&myport, "%d", SSH_DFL_PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index f0269633480af35a9d957f58d888f81ced70050d..be20ca32ff1f86d8b11aa66cd5947cc8dcd69cb9 100644 (file)
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_disk plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_swap";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
verbose++;
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf (_(COPYRIGHT), copyright, email);
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 0d81497efab5b9a4a5ade6011ae241d105c06df4..31659f18815257b814b0f3b11830c30fec013964 100644 (file)
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
* License: GPL
* Copyright (c) 1999-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_tcp plugin
/* progname "check_tcp" changes depending on symlink called */
char *progname;
-const char *revision = "$Revision$";
const char *copyright = "1999-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'v': /* verbose mode */
flags |= FLAG_VERBOSE;
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_time.c b/plugins/check_time.c
index f9a292c01c778e3348d0449aad2f34e1de72b4fd..ee938168c5f2f95a11db534b8edd7b9b2740cf21 100644 (file)
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
* License: GPL
* Copyright (c) 1999-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_time plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_time";
-const char *revision = "$Revision$";
const char *copyright = "1999-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'H': /* hostname */
if (is_host (optarg) == FALSE)
char *myport;
asprintf (&myport, "%d", TIME_PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index a498d203ecc7d640ca3338c13e33b023c2db21fa..7311ca23c188806484e0d796526c0ab8136e8f38 100644 (file)
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
* 2004 Arnaud Quette <arnaud.quette@mgeups.com>
* Copyright (c) 2002-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains Network UPS Tools plugin for Nagios
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_ups";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
}
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
char *myport;
asprintf (&myport, "%d", PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 2000 Tom Shields\n");
printf ("Copyright (c) 2004 Alain Richard <alain.richard@equation.fr>\n");
diff --git a/plugins/check_users.c b/plugins/check_users.c
index 4e7e9a29af20aebcab41c7b7952c5d7e0b0e2a0f..1bd2c8b2ce99712299d6805351e08f7dfb28aa01 100644 (file)
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
* License: GPL
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_users plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_users";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'c': /* critical */
if (!is_intnonneg (optarg))
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Ethan Galstad\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/common.h b/plugins/common.h
index 0711dbf13939ae465a15620559dc2c55add10c4f..dfc09416453372792334ebb90e8ab9c8dbd8f7a6 100644 (file)
--- a/plugins/common.h
+++ b/plugins/common.h
* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
* Copyright (c) 2003-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains common include files and defines used in many of
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/plugins/negate.c b/plugins/negate.c
index 40ff1912c08ef2a76334c2a7a201d58f6c7d9ed8..0808b685481652b08dcdfb7f697aeba39a4e5f96 100644 (file)
--- a/plugins/negate.c
+++ b/plugins/negate.c
* License: GPL
* Copyright (c) 2002-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the negate plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "negate";
-const char *revision = "$Revision$";
const char *copyright = "2002-2008";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
exit (EXIT_SUCCESS);
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (EXIT_SUCCESS);
case 't': /* timeout period */
if (!is_integer (optarg))
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/netutils.c b/plugins/netutils.c
index 1a5547e971138a6b197e76a64d23f87aeadc9b44..6082cae098dc0dfec088af8ed6733b3513a476e5 100644 (file)
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
* Copyright (c) 2003-2008 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains commons functions used in many of the plugins.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/plugins/netutils.h b/plugins/netutils.h
index 4c0a563c390dc576a607bddcb83aa5b3298f51fe..85c92fc06e040549781ca1858243f4aaca8f6290 100644 (file)
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
* Copyright (c) 2003-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains common include files and function definitions
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/plugins/popen.c b/plugins/popen.c
index a27aecc9a8f444d92a4cc1fe01e7e966f5f9d0cd..716bd524042c54b99ed2f69034436a62340e28de 100644 (file)
--- a/plugins/popen.c
+++ b/plugins/popen.c
* License: GPL
* Copyright (c) 2005-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* A safe alternative to popen
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/plugins/popen.h b/plugins/popen.h
index 8b09edd9511200fada5534a93822596a96669b02..fc7e78e2d81075af5647d58b23e049f5b6c5b42a 100644 (file)
--- a/plugins/popen.h
+++ b/plugins/popen.h
/******************************************************************************
*
-* $Id$
*
*****************************************************************************/
diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index 8c52b5c9f31ec3ce5a4011ace792deedc94cfcea..7574b1213b7b10a31ce1f5a35409844caee29dd0 100644 (file)
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
* License: GPL
* Copyright (c) 2005-2006 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description :
*
* A simple interface to executing programs from other programs, using an
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/plugins/runcmd.h b/plugins/runcmd.h
index a048def390e6fc5dbcf6a6b87362fb962e10fde6..211dee2c8c8a7d7ced6a045c13011659ae1b814d 100644 (file)
--- a/plugins/runcmd.h
+++ b/plugins/runcmd.h
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 3d4f90166dd7d3cb1754dfa5516164e3337ff7eb..f5035e231e2c8ede5e410d111520696f74d392a4 100644 (file)
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
* License: GPL
* Copyright (c) 2005-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains common functions for plugins that require SSL.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
index b421d334ddc04b3b91f7d3c67eb52b8dbc561549..5f2c534de06cd9cb0710d92f46b0e8bac5ebdbe6 100644 (file)
--- a/plugins/t/check_by_ssh.t
+++ b/plugins/t/check_by_ssh.t
#
# check_by_ssh tests
#
-# $Id$
#
use strict;
index f3e78b83c95c047d92c9e1c36fbd098993c2eea6..4736f067513d17bcb1948230f6b252c903910f71 100644 (file)
#
# check_cluster tests
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_dig.t b/plugins/t/check_dig.t
index 937eec33f2702dd44476deb8358efc89fd270eb9..323859e8e09ba4523a8313ecb8e0c26bf1f74fcb 100644 (file)
--- a/plugins/t/check_dig.t
+++ b/plugins/t/check_dig.t
#
# Domain Name Server (DNS) Tests via check_dig
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t
index 99c434acb960e8b10d535ebd32e82b094f551db4..45c6a613aa5efee281ea65ae36a875b656ee76b8 100644 (file)
--- a/plugins/t/check_disk.t
+++ b/plugins/t/check_disk.t
#
# Disk Space Tests via check_disk
#
-# $Id$
#
# 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 fc89e6e551dea12aed69a46e998590ec9e07b161..64aaf0cee71bbe580b28e592a7877458b90c473d 100644 (file)
--- a/plugins/t/check_dns.t
+++ b/plugins/t/check_dns.t
#
# Domain Name Server (DNS) Tests via check_dns
#
-# $Id$
#
use strict;
index aaa7a410fe00b002d89fdb176953c9a25aff47ba..15fc1578d3f93c8e1fa80f7352e35746189befce 100644 (file)
--- a/plugins/t/check_dummy.t
+++ b/plugins/t/check_dummy.t
#
# check_dummy tests
#
-# $Id$
#
use strict;
index c59d59e07fc6fb89dbb4b8f3adefd0e5f682d36c..45a9be8a71ad0211f0ced33a7518c2ac1bb9f45f 100644 (file)
--- a/plugins/t/check_fping.t
+++ b/plugins/t/check_fping.t
#
# FPing Tests via check_fping
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_ftp.t b/plugins/t/check_ftp.t
index 47a73e136460e0e478095fce8ec8e6e26ad22988..de6831ba98e6a25b228181c453413a5d2d0afefb 100644 (file)
--- a/plugins/t/check_ftp.t
+++ b/plugins/t/check_ftp.t
#
# File Transfer Protocol (FTP) Test via check_ftp
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_hpjd.t b/plugins/t/check_hpjd.t
index 2fe5600055434d2b84b7a56daf11bfd0cc782723..10ded54ae0f3c84ac91b9046fb49e1b88f4b4e16 100644 (file)
--- a/plugins/t/check_hpjd.t
+++ b/plugins/t/check_hpjd.t
#
# HP JetDirect Test via check_hpjd
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t
index c98b4ac324acb129fb2c7a776aec8ca0f24c3860..c43a64a997fd9b1551a4aedd2a4ea83d04d664a4 100644 (file)
--- a/plugins/t/check_http.t
+++ b/plugins/t/check_http.t
#
# HyperText Transfer Protocol (HTTP) Test via check_http
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_imap.t b/plugins/t/check_imap.t
index fa957d1b8581df018c139e82b0248bc03ba07d45..9c6eae1f075ffff5fbd3a690ae1af3b5ac4b6c6c 100644 (file)
--- a/plugins/t/check_imap.t
+++ b/plugins/t/check_imap.t
#
# Internet Mail Access Protocol (IMAP) Server Tests via check_imap
#
-# $Id$
#
use strict;
index 6a3d4ef7676a03ae5a2bded1c6e84d9bad77338e..1aaf812526a1af87ece2c4fae823030f2d93a515 100644 (file)
--- a/plugins/t/check_jabber.t
+++ b/plugins/t/check_jabber.t
#
# Jabber Server Tests via check_jabber
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_load.t b/plugins/t/check_load.t
index 8987b84cc9efbf61fa32466bca995db47cccb78c..55f6f75207bc9de324f3264ddc270663c362efa8 100644 (file)
--- a/plugins/t/check_load.t
+++ b/plugins/t/check_load.t
#
# Load Average Tests via check_load
#
-# $Id$
#
use strict;
index e8bccf1c6534e4dc987b3597a93220516264f9c4..d9716458947891028c6488cf1372c126604d6059 100644 (file)
--- a/plugins/t/check_mysql.t
+++ b/plugins/t/check_mysql.t
#
# MySQL Database Server Tests via check_mysql
#
-# $Id$
#
#
# These are the database permissions required for this test:
index f78f07b85b575a3cf17f5113485cdba706330d03..407af881af4da9bf53f5d77b2befa36bfd166e4c 100644 (file)
#
# MySQL Database Server Tests via check_mysql
#
-# $Id$
#
#
# These are the database permissions required for this test:
index d5d48465e0bef979cb33b1008aa9c5be43aa74ef..81fc24d8e744e3812393aa21437c1a4c8d932382 100644 (file)
--- a/plugins/t/check_nagios.t
+++ b/plugins/t/check_nagios.t
#
# check_nagios tests
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_ntp.t b/plugins/t/check_ntp.t
index 4f86ab971a888aed372bfd5502d37d2115e6bf0f..b71c863190f74eb1e4cf470b9cb56e83574485cb 100644 (file)
--- a/plugins/t/check_ntp.t
+++ b/plugins/t/check_ntp.t
#
# Testing NTP
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_ping.t b/plugins/t/check_ping.t
index c9a09041f20c6f4bd7f23940991ff0c26d8fdc6f..e1c119e40609f8b26738f0f2cf23aa6d47987193 100644 (file)
--- a/plugins/t/check_ping.t
+++ b/plugins/t/check_ping.t
#
# Ping Response Tests via check_ping
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_pop.t b/plugins/t/check_pop.t
index b78291dafe781d71614b6a0907e4cc6073a3f821..62352fd109f19c822133c1f88cb88326fae2285e 100644 (file)
--- a/plugins/t/check_pop.t
+++ b/plugins/t/check_pop.t
#
# Post Office Protocol (POP) Server Tests via check_pop
#
-# $Id$
#
use strict;
index 2a41ac5cb3a5e349a186bb4141be3a7853cf1fb0..fc32952d50d002feba942ccbad4448ad6048af7a 100644 (file)
--- a/plugins/t/check_procs.t
+++ b/plugins/t/check_procs.t
#
# Process Tests via check_procs
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_smtp.t b/plugins/t/check_smtp.t
index ff58bc0bed283fea2ddb6f5f599b83de0e1ff0a0..aa6dae4559b3643c75a5a5c3bdb04faaac09446c 100644 (file)
--- a/plugins/t/check_smtp.t
+++ b/plugins/t/check_smtp.t
#
# Simple Mail Transfer Protocol (SMTP) Test via check_smtp
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_snmp.t b/plugins/t/check_snmp.t
index 4e831397e1a6f3830b6265f3b5a4638a655517ba..369314ec6e6265d01a7a19723956a86be993f6de 100644 (file)
--- a/plugins/t/check_snmp.t
+++ b/plugins/t/check_snmp.t
#
# Simple Network Management Protocol (SNMP) Test via check_snmp
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_swap.t b/plugins/t/check_swap.t
index 435730fcea2239038bd78ba9190e572e35ea1175..e44adc90be7109c923967363a09f73ba59b19ffa 100644 (file)
--- a/plugins/t/check_swap.t
+++ b/plugins/t/check_swap.t
#
# Swap Space Tests via check_swap
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_tcp.t b/plugins/t/check_tcp.t
index 2914350e6158f649e3682c2587a3ec31123647f0..fd2b5dd9ce7d8ce26f764341080169e11260abf5 100644 (file)
--- a/plugins/t/check_tcp.t
+++ b/plugins/t/check_tcp.t
#
# TCP Connection Based Tests via check_tcp
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_time.t b/plugins/t/check_time.t
index f7fcf959e25001333a449d1ee4da9e00a5a5569f..961f56e636a1f201733c2413f79a108b2b41038a 100644 (file)
--- a/plugins/t/check_time.t
+++ b/plugins/t/check_time.t
#
# System Time Tests via check_time
#
-# $Id$
#
use strict;
diff --git a/plugins/t/check_udp.t b/plugins/t/check_udp.t
index e8a1e39471dc824c2da82ec758fdf94b2f766e64..6d24675a30e915ba68deee7f04fb86041f4e119e 100644 (file)
--- a/plugins/t/check_udp.t
+++ b/plugins/t/check_udp.t
#
# UDP Connection Based Tests via check_udp
#
-# $Id$
#
use strict;
index 4b313d3061382e258f0ddda40beecba01afb6401..cf7fac92c7c0d07c0f3b6e2201c0d6103be33f8e 100644 (file)
--- a/plugins/t/check_users.t
+++ b/plugins/t/check_users.t
#
# Logged in Users Tests via check_users
#
-# $Id$
#
use strict;
diff --git a/plugins/t/negate.t b/plugins/t/negate.t
index 3a894f558568c29a017281129d59984bc1f8300d..989bf01ff35fdaf234fab47f8887ae582fc5e8c2 100644 (file)
--- a/plugins/t/negate.t
+++ b/plugins/t/negate.t
# negate checks
# Need check_dummy to work for testing
#
-# $Id: negate.pl 1717 2007-05-24 08:53:50Z tonvoon $
-#
use strict;
use Test::More;
diff --git a/plugins/urlize.c b/plugins/urlize.c
index aeabafd09a1b90d5b027800f7da8fd314071e350..a3620082f57b9e15fe1bfd1bff342277d0ff9a8d 100644 (file)
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
* License: GPL
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the urlize plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "urlize";
-const char *revision = "$Revision$";
const char *copyright = "2000-2006";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
exit (EXIT_SUCCESS);
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (EXIT_SUCCESS);
break;
case 'u':
void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
printf (COPYRIGHT, copyright, email);
diff --git a/plugins/utils.c b/plugins/utils.c
index c8f3a00dd4c8cd297cfed5fba4532f1cb3811c2e..1900ef8601574e9e61970fcf286f07a497c200c3 100644 (file)
--- a/plugins/utils.c
+++ b/plugins/utils.c
* Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net)
* Copyright (c) 2002-2007 Nagios Plugin Development Team
*
-* Last Modified: $Date$
-*
-*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
exit (STATE_UNKNOWN);
}
-char *
-clean_revstring (const char *revstring)
-{
- char plugin_revision[STRLEN];
- plugin_revision[0] = 'v';
- if (sscanf (revstring,"$Revision: %[0-9.]", plugin_revision + 1) == 1)
- return strscpy (NULL, plugin_revision);
- else
- return strscpy (NULL, "N/A");
-}
-
void
-print_revision (const char *command_name, const char *revision_string)
+print_revision (const char *command_name, const char *revision)
{
char plugin_revision[STRLEN];
- printf ("%s %s (%s %s)\n",
- command_name, clean_revstring(revision_string), PACKAGE, VERSION);
+ printf ("%s v%s (%s %s)\n",
+ command_name, revision, PACKAGE, VERSION);
}
const char *
diff --git a/plugins/utils.h b/plugins/utils.h
index 67e099d41ad787bff1e5a83ba719c645ede8b803..65e06ebd3793c567add534f5a61885c8090f2ec2 100644 (file)
--- a/plugins/utils.h
+++ b/plugins/utils.h
/* Standardize version information, termination */
-/* $Id$ */
-
void support (void);
-char *clean_revstring (const char *);
void print_revision (const char *, const char *);
/* Handle timeouts */
diff --git a/test.pl.in b/test.pl.in
index 22d0576d23594c084f06974c4df04c886ce553f0..a02281856c6db373e0183c0742e2d1919cc7f6de 100755 (executable)
--- a/test.pl.in
+++ b/test.pl.in
#
# Wrapper for running the test harnesses
#
-# $Id$
-#
use strict;
diff --git a/tools/README b/tools/README
index 21d58461308bfc42153691654ff3f7819520e4da..98c243b0a396634218b55b5ebe932a543d9e31cb 100644 (file)
--- a/tools/README
+++ b/tools/README
-$Id$
The tools subdirectory contains anciliary files that can be used to configure
or test the plugins.
diff --git a/tools/git2svn.pl b/tools/git2svn.pl
--- /dev/null
+++ b/tools/git2svn.pl
@@ -0,0 +1,129 @@
+#!/usr/bin/perl
+#
+# This script pulls the current branch, then walks the first parents and
+# commit each of them into subversion.
+#
+# Copyright (C) 2008 Thomas Guyot-Sionnest <dermoth@aei.ca>
+#
+# The subversion repository must not be taking any external commit or this
+# script will erase them. This script cannot run off a bare repository.
+#
+# *** INITIAL SETUP ***
+#
+# 1. Run this command line to get the repository up and ready for this script:
+#
+# $ cd /path/to/repo/; git log -1 --pretty=format:%H >.git/git2svn.last_commit_hash
+#
+# 2. Configure the lines below... $ENV{'GIT_DIR'} must point to the .git
+# directory of the git-svn repo.
+#
+# *** INITIAL SETUP ***
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+use strict;
+use warnings;
+
+# This is the git working tree. Must be tied to a SVN repository
+$ENV{'GIT_DIR'} = '/path/to/nagiosplug/.git';
+
+# For some strange reasons this is needed:
+$ENV{'GIT_SVN_ID'} = 'trunk';
+
+# Path to git binary
+my $git = '/usr/bin/git';
+
+# Force commits from the hash stored in git2svn.last_commit_hash regardless
+# of the state of the current repository. Use this if the repository was
+# updated manually or if you need to set that hash to a specific value.
+# NB: Re-committing old hashes will revert then roll again changes to SVN.
+my $FORCE = 0;
+
+# Print debug output. Useful if you want to see what's being committed.
+my $DEBUG = 0;
+
+for (@ARGV) {
+ $FORCE = 1 if (m/force/);
+ $DEBUG = 1 if (m/debug/);
+ if (m/help/ || m/--help/ || m/-h/) {
+ print "Usage: $0 [ debug ] [ force ] [ help ]\n";
+ exit 0;
+ }
+}
+
+# 1st get the current commit hash - we'll start committing to SVN from this one
+print "Reading saved hash from $ENV{'GIT_DIR'}/git2svn.last_commit_hash\n" if ($DEBUG);
+open(SAVHASH, "<$ENV{'GIT_DIR'}/git2svn.last_commit_hash")
+ or die("Can't open $ENV{'GIT_DIR'}/git2svn.last_commit_hash: $!");
+my $saved_commit_hash = <SAVHASH>;
+chomp $saved_commit_hash;
+print "Saved commit hash: $saved_commit_hash\n" if ($DEBUG);
+close(SAVHASH);
+
+my $last_commit_hash;
+if ($FORCE) {
+ $last_commit_hash = $saved_commit_hash;
+ print "Forcing last commit hash to $last_commit_hash\n" if ($DEBUG);
+} else {
+ print "Running: $git log -1 --pretty=format:%H\n" if ($DEBUG);
+ $last_commit_hash = `$git log -1 --pretty=format:%H`;
+ die("Failed to retrieve last commit hash") if ($?);
+ chomp $last_commit_hash;
+ print "Last commit hash: $last_commit_hash\n" if ($DEBUG);
+
+ # Sanity check
+ die("Last commit hash and saved commit hash don't match, aborting")
+ if ($last_commit_hash ne $saved_commit_hash);
+}
+
+# 2nd pull the remote tree
+print "Running: $git pull\n" if ($DEBUG);
+`$git pull`;
+die("Failed to pull") if ($?);
+
+# Then list all first parents since the last one and insert them into an array
+my @commits;
+print "Running: $git rev-list --first-parent $last_commit_hash..HEAD\n" if ($DEBUG);
+open(REVLIST, "$git rev-list --first-parent $last_commit_hash..HEAD|")
+ or die("Failed to retrieve revision list: $!");
+
+while (<REVLIST>) {
+ chomp;
+ unshift @commits, $_;
+ print "Prepending the list with $_\n" if ($DEBUG);
+}
+
+close(REVLIST);
+
+if (@commits == 0) {
+ print "Nothing to do.\n";
+ exit 0;
+}
+
+# Finally, commit every revision found into SVN
+foreach my $commit (@commits) {
+ print "Commiting $commit to Subversion\n";
+ print "Running: $git svn set-tree $commit\n" if ($DEBUG);
+ `$git svn set-tree $commit`;
+ die("Failed to commit hash $commit") if ($?);
+}
+
+# Once done, update the last commit hash
+$last_commit_hash = pop @commits;
+print "Writing last commit hash to $ENV{'GIT_DIR'}/git2svn.last_commit_hash\n" if ($DEBUG);
+open(SAVHASH, ">$ENV{'GIT_DIR'}/git2svn.last_commit_hash")
+ or die("Can't open $ENV{'GIT_DIR'}/git2svn.last_commit_hash for writing: $!");
+print SAVHASH $last_commit_hash;
+close(SAVHASH);
+
diff --git a/tools/mini_epn.c b/tools/mini_epn.c
index cd675389e6f367e3da5e39102158380920951028..6f3c5d029e3fe1e1d4191828d45128b042efec0e 100644 (file)
--- a/tools/mini_epn.c
+++ b/tools/mini_epn.c
* Modified by Douglas Warner
* Last Modified: 05/02/2002
*
- * $Id$
- *
* This is a sample mini embedded Perl interpreter (hacked out checks.c and
* perlembed) for use in testing Perl plugins.
*
diff --git a/tools/setup b/tools/setup
index 6db4c6c5d79e8f61de990b860af125fa33b71c2f..cdaa9c9254f0b7790252978733f43063766a3b3f 100755 (executable)
--- a/tools/setup
+++ b/tools/setup
#!/bin/sh
#
# autogen.sh glue from CMU Cyrus IMAP
-# $Id$
#
# Requires: automake, autoconf, dpkg-dev
# set -e
diff --git a/tools/tinderbox_build b/tools/tinderbox_build
index c1d40c6927f7d959ec72e74b435fbebc49b7fac6..ab4234aa87365a1fba1611447b7186ef12e5b0e1 100755 (executable)
--- a/tools/tinderbox_build
+++ b/tools/tinderbox_build
use Cwd;
use Time::Local;
-my $Version = '$Revision$';
+my $Version = `git describe --abbrev=4 HEAD`;
my $myhost = hostname;
chomp($myhost);