SF.net SVN: nagiosplug:[2091] nagiosplug/trunk

[email protected]
Newsgroups gmane.network.nagios.plugins.cvs
Message-ID <[email protected]>
Revision: 2091
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=2091&view=rev
Author:   dermoth
Date:     2008-11-23 05:38:47 +0000 (Sun, 23 Nov 2008)

Log Message:
-----------
Removing CVS/SVN tags and replacing with git-based versioning
For contrib/, full tags have been imported from subversion

Modified Paths:
--------------
    nagiosplug/trunk/Makefile.am
    nagiosplug/trunk/NPTest.pm
    nagiosplug/trunk/acinclude.m4
    nagiosplug/trunk/autogen.sh
    nagiosplug/trunk/command.cfg.in
    nagiosplug/trunk/configure.in
    nagiosplug/trunk/contrib/check_adptraid.sh
    nagiosplug/trunk/contrib/check_apc_ups.pl
    nagiosplug/trunk/contrib/check_appletalk.pl
    nagiosplug/trunk/contrib/check_arping.pl
    nagiosplug/trunk/contrib/check_email_loop.pl
    nagiosplug/trunk/contrib/check_fan_cpq_present
    nagiosplug/trunk/contrib/check_fan_fsc_present
    nagiosplug/trunk/contrib/check_frontpage
    nagiosplug/trunk/contrib/check_http-with-client-certificate.c
    nagiosplug/trunk/contrib/check_hw.sh
    nagiosplug/trunk/contrib/check_ica_master_browser.pl
    nagiosplug/trunk/contrib/check_ica_metaframe_pub_apps.pl
    nagiosplug/trunk/contrib/check_ica_program_neigbourhood.pl
    nagiosplug/trunk/contrib/check_inodes-freebsd.pl
    nagiosplug/trunk/contrib/check_javaproc.pl
    nagiosplug/trunk/contrib/check_joy.sh
    nagiosplug/trunk/contrib/check_log2.pl
    nagiosplug/trunk/contrib/check_lotus.pl
    nagiosplug/trunk/contrib/check_mem.pl
    nagiosplug/trunk/contrib/check_ms_spooler.pl
    nagiosplug/trunk/contrib/check_ora_table_space.pl
    nagiosplug/trunk/contrib/check_oracle_instance.pl
    nagiosplug/trunk/contrib/check_oracle_tbs
    nagiosplug/trunk/contrib/check_pfstate
    nagiosplug/trunk/contrib/check_rbl.c
    nagiosplug/trunk/contrib/check_smb.sh
    nagiosplug/trunk/contrib/check_snmp_disk_monitor.pl
    nagiosplug/trunk/contrib/check_snmp_printer.pl
    nagiosplug/trunk/contrib/check_snmp_process_monitor.pl
    nagiosplug/trunk/contrib/check_snmp_procs.pl
    nagiosplug/trunk/contrib/check_temp_cpq
    nagiosplug/trunk/contrib/check_temp_fsc
    nagiosplug/trunk/contrib/check_traceroute.pl
    nagiosplug/trunk/contrib/check_uptime.c
    nagiosplug/trunk/contrib/check_vcs.pl
    nagiosplug/trunk/contrib/check_wins.pl
    nagiosplug/trunk/contrib/packet_utils.pm
    nagiosplug/trunk/contrib/utils.py
    nagiosplug/trunk/doc/developer-guidelines.sgml
    nagiosplug/trunk/lib/extra_opts.c
    nagiosplug/trunk/lib/parse_ini.c
    nagiosplug/trunk/lib/tests/test_base64.c
    nagiosplug/trunk/lib/tests/test_cmd.c
    nagiosplug/trunk/lib/tests/test_disk.c
    nagiosplug/trunk/lib/tests/test_ini.c
    nagiosplug/trunk/lib/tests/test_opts.c
    nagiosplug/trunk/lib/tests/test_tcp.c
    nagiosplug/trunk/lib/tests/test_utils.c
    nagiosplug/trunk/lib/utils_base.c
    nagiosplug/trunk/lib/utils_cmd.c
    nagiosplug/trunk/lib/utils_disk.c
    nagiosplug/trunk/lib/utils_tcp.c
    nagiosplug/trunk/plugins/Makefile.am
    nagiosplug/trunk/plugins/check_apt.c
    nagiosplug/trunk/plugins/check_by_ssh.c
    nagiosplug/trunk/plugins/check_cluster.c
    nagiosplug/trunk/plugins/check_dig.c
    nagiosplug/trunk/plugins/check_disk.c
    nagiosplug/trunk/plugins/check_dns.c
    nagiosplug/trunk/plugins/check_dummy.c
    nagiosplug/trunk/plugins/check_fping.c
    nagiosplug/trunk/plugins/check_game.c
    nagiosplug/trunk/plugins/check_hpjd.c
    nagiosplug/trunk/plugins/check_http.c
    nagiosplug/trunk/plugins/check_ide_smart.c
    nagiosplug/trunk/plugins/check_ldap.c
    nagiosplug/trunk/plugins/check_load.c
    nagiosplug/trunk/plugins/check_mrtg.c
    nagiosplug/trunk/plugins/check_mrtgtraf.c
    nagiosplug/trunk/plugins/check_mysql.c
    nagiosplug/trunk/plugins/check_mysql_query.c
    nagiosplug/trunk/plugins/check_nagios.c
    nagiosplug/trunk/plugins/check_nt.c
    nagiosplug/trunk/plugins/check_ntp.c
    nagiosplug/trunk/plugins/check_ntp_peer.c
    nagiosplug/trunk/plugins/check_ntp_time.c
    nagiosplug/trunk/plugins/check_nwstat.c
    nagiosplug/trunk/plugins/check_overcr.c
    nagiosplug/trunk/plugins/check_pgsql.c
    nagiosplug/trunk/plugins/check_ping.c
    nagiosplug/trunk/plugins/check_procs.c
    nagiosplug/trunk/plugins/check_radius.c
    nagiosplug/trunk/plugins/check_real.c
    nagiosplug/trunk/plugins/check_smtp.c
    nagiosplug/trunk/plugins/check_snmp.c
    nagiosplug/trunk/plugins/check_ssh.c
    nagiosplug/trunk/plugins/check_swap.c
    nagiosplug/trunk/plugins/check_tcp.c
    nagiosplug/trunk/plugins/check_time.c
    nagiosplug/trunk/plugins/check_ups.c
    nagiosplug/trunk/plugins/check_users.c
    nagiosplug/trunk/plugins/common.h
    nagiosplug/trunk/plugins/negate.c
    nagiosplug/trunk/plugins/netutils.c
    nagiosplug/trunk/plugins/netutils.h
    nagiosplug/trunk/plugins/popen.c
    nagiosplug/trunk/plugins/popen.h
    nagiosplug/trunk/plugins/runcmd.c
    nagiosplug/trunk/plugins/runcmd.h
    nagiosplug/trunk/plugins/sslutils.c
    nagiosplug/trunk/plugins/t/check_by_ssh.t
    nagiosplug/trunk/plugins/t/check_cluster.t
    nagiosplug/trunk/plugins/t/check_dig.t
    nagiosplug/trunk/plugins/t/check_disk.t
    nagiosplug/trunk/plugins/t/check_dns.t
    nagiosplug/trunk/plugins/t/check_dummy.t
    nagiosplug/trunk/plugins/t/check_fping.t
    nagiosplug/trunk/plugins/t/check_ftp.t
    nagiosplug/trunk/plugins/t/check_hpjd.t
    nagiosplug/trunk/plugins/t/check_http.t
    nagiosplug/trunk/plugins/t/check_imap.t
    nagiosplug/trunk/plugins/t/check_jabber.t
    nagiosplug/trunk/plugins/t/check_load.t
    nagiosplug/trunk/plugins/t/check_mysql.t
    nagiosplug/trunk/plugins/t/check_mysql_query.t
    nagiosplug/trunk/plugins/t/check_nagios.t
    nagiosplug/trunk/plugins/t/check_ntp.t
    nagiosplug/trunk/plugins/t/check_ping.t
    nagiosplug/trunk/plugins/t/check_pop.t
    nagiosplug/trunk/plugins/t/check_procs.t
    nagiosplug/trunk/plugins/t/check_smtp.t
    nagiosplug/trunk/plugins/t/check_snmp.t
    nagiosplug/trunk/plugins/t/check_swap.t
    nagiosplug/trunk/plugins/t/check_tcp.t
    nagiosplug/trunk/plugins/t/check_time.t
    nagiosplug/trunk/plugins/t/check_udp.t
    nagiosplug/trunk/plugins/t/check_users.t
    nagiosplug/trunk/plugins/t/negate.t
    nagiosplug/trunk/plugins/urlize.c
    nagiosplug/trunk/plugins/utils.c
    nagiosplug/trunk/plugins/utils.h
    nagiosplug/trunk/plugins-root/Makefile.am
    nagiosplug/trunk/plugins-root/check_dhcp.c
    nagiosplug/trunk/plugins-root/check_icmp.c
    nagiosplug/trunk/plugins-root/t/check_icmp.t
    nagiosplug/trunk/plugins-scripts/Makefile.am
    nagiosplug/trunk/plugins-scripts/check_breeze.pl
    nagiosplug/trunk/plugins-scripts/check_disk_smb.pl
    nagiosplug/trunk/plugins-scripts/check_file_age.pl
    nagiosplug/trunk/plugins-scripts/check_flexlm.pl
    nagiosplug/trunk/plugins-scripts/check_ifoperstatus.pl
    nagiosplug/trunk/plugins-scripts/check_ifstatus.pl
    nagiosplug/trunk/plugins-scripts/check_ircd.pl
    nagiosplug/trunk/plugins-scripts/check_log.sh
    nagiosplug/trunk/plugins-scripts/check_mailq.pl
    nagiosplug/trunk/plugins-scripts/check_mssql.pl
    nagiosplug/trunk/plugins-scripts/check_netdns.pl
    nagiosplug/trunk/plugins-scripts/check_ntp.pl
    nagiosplug/trunk/plugins-scripts/check_oracle.sh
    nagiosplug/trunk/plugins-scripts/check_rpc.pl
    nagiosplug/trunk/plugins-scripts/check_sensors.sh
    nagiosplug/trunk/plugins-scripts/check_wave.pl
    nagiosplug/trunk/plugins-scripts/subst.in
    nagiosplug/trunk/plugins-scripts/t/check_file_age.t
    nagiosplug/trunk/plugins-scripts/t/check_rpc.t
    nagiosplug/trunk/plugins-scripts/t/utils.t
    nagiosplug/trunk/plugins-scripts/utils.pm.in
    nagiosplug/trunk/test.pl.in
    nagiosplug/trunk/tools/README
    nagiosplug/trunk/tools/mini_epn.c
    nagiosplug/trunk/tools/setup
    nagiosplug/trunk/tools/tinderbox_build

Added Paths:
-----------
    nagiosplug/trunk/NP-VERSION-GEN
    nagiosplug/trunk/tools/git2svn.pl

Removed Paths:
-------------
    nagiosplug/trunk/BRANCHES
    nagiosplug/trunk/doc/BRANCHING

Property Changed:
----------------
    nagiosplug/trunk/plugins-scripts/check_ifoperstatus.pl

Deleted: nagiosplug/trunk/BRANCHES
===================================================================
--- nagiosplug/trunk/BRANCHES	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/BRANCHES	2008-11-23 05:38:47 UTC (rev 2091)
@@ -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

Modified: nagiosplug/trunk/Makefile.am
===================================================================
--- nagiosplug/trunk/Makefile.am	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/Makefile.am	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,7 +5,7 @@
 # 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 \
@@ -19,7 +19,7 @@
 
 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) $@
@@ -62,3 +62,4 @@
 
 pkgclean:
 	rm -rf $(BUILDDIR) $(PACKDIR)
+

Added: nagiosplug/trunk/NP-VERSION-GEN
===================================================================
--- nagiosplug/trunk/NP-VERSION-GEN	                        (rev 0)
+++ nagiosplug/trunk/NP-VERSION-GEN	2008-11-23 05:38:47 UTC (rev 2091)
@@ -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
+}
+


Property changes on: nagiosplug/trunk/NP-VERSION-GEN
___________________________________________________________________
Added: svn:executable
   + *

Modified: nagiosplug/trunk/NPTest.pm
===================================================================
--- nagiosplug/trunk/NPTest.pm	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/NPTest.pm	2008-11-23 05:38:47 UTC (rev 2091)
@@ -21,7 +21,7 @@
 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
 

Modified: nagiosplug/trunk/acinclude.m4
===================================================================
--- nagiosplug/trunk/acinclude.m4	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/acinclude.m4	2008-11-23 05:38:47 UTC (rev 2091)
@@ -8,7 +8,6 @@
 dnl e.g. 5 arguments (solaris)
 dnl e.g. 3 arguments (osf/1)
 dnl
-dnl @version $Id$
 dnl @author Brian Stafford <[email protected]>
 dnl
 dnl based on version by Caolan McNamara <[email protected]>

Modified: nagiosplug/trunk/autogen.sh
===================================================================
--- nagiosplug/trunk/autogen.sh	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/autogen.sh	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# $Id$
-#
 # Requires: automake, autoconf, dpkg-dev
 # set -e
 

Modified: nagiosplug/trunk/command.cfg.in
===================================================================
--- nagiosplug/trunk/command.cfg.in	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/command.cfg.in	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,8 +1,6 @@
 ###############################################################################
 # COMMAND CONFIGURATION
 #
-# $Id$
-#
 # SYNTAX:
 # command[<command_name>]=<command_line>
 #

Modified: nagiosplug/trunk/configure.in
===================================================================
--- nagiosplug/trunk/configure.in	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/configure.in	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,5 +1,4 @@
 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)

Modified: nagiosplug/trunk/contrib/check_adptraid.sh
===================================================================
--- nagiosplug/trunk/contrib/check_adptraid.sh	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_adptraid.sh	2008-11-23 05:38:47 UTC (rev 2091)
@@ -13,7 +13,7 @@
 
 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
 

Modified: nagiosplug/trunk/contrib/check_apc_ups.pl
===================================================================
--- nagiosplug/trunk/contrib/check_apc_ups.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_apc_ups.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -38,7 +38,7 @@
 	 "H=s" => \$opt_H, "hostname=s"		=> \$opt_H);
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision$');
+	print_revision($PROGNAME,'$Revision: 1771 $');
 	exit $ERRORS{'OK'};
 }
 
@@ -252,7 +252,7 @@
 }
 
 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

Modified: nagiosplug/trunk/contrib/check_appletalk.pl
===================================================================
--- nagiosplug/trunk/contrib/check_appletalk.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_appletalk.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -9,7 +9,7 @@
 # using "aecho"
 #
 # initial version: 23 October 2002 by Stefan Beck, IT Software Solutions
-# current status: $Revision$
+# current status: $Revision: 1771 $
 #
 # Copyright Notice: GPL
 #
@@ -122,7 +122,7 @@
 }
 
 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";
@@ -159,7 +159,7 @@
 }
 
 sub version () {
-     print_revision( $PROGNAME, '$Revision$ ' );
+     print_revision( $PROGNAME, '$Revision: 1771 $ ' );
      exit $ERRORS{'OK'};
 }
 

Modified: nagiosplug/trunk/contrib/check_arping.pl
===================================================================
--- nagiosplug/trunk/contrib/check_arping.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_arping.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -55,7 +55,7 @@
 
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 1112 $ ');
 	exit $ERRORS{'OK'};
 }
 
@@ -115,6 +115,6 @@
 	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 $');
 	
 }

Modified: nagiosplug/trunk/contrib/check_email_loop.pl
===================================================================
--- nagiosplug/trunk/contrib/check_email_loop.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_email_loop.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id$
+# $Id: check_email_loop.pl 1290 2005-11-29 23:21:06Z harpermann $
 #
 # (c)2000 Benjamin Schmid, [email protected] (emergency use only ;-)
 # Copyleft by GNU GPL

Modified: nagiosplug/trunk/contrib/check_fan_cpq_present
===================================================================
--- nagiosplug/trunk/contrib/check_fan_cpq_present	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_fan_cpq_present	2008-11-23 05:38:47 UTC (rev 2091)
@@ -111,7 +111,7 @@
 	}
 
 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";
@@ -122,7 +122,7 @@
 	}
 
 sub version () {
-        print_revision($PROGNAME,'$Revision$ ');
+        print_revision($PROGNAME,'$Revision: 1113 $ ');
         exit $ERRORS{'OK'};
 }
 

Modified: nagiosplug/trunk/contrib/check_fan_fsc_present
===================================================================
--- nagiosplug/trunk/contrib/check_fan_fsc_present	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_fan_fsc_present	2008-11-23 05:38:47 UTC (rev 2091)
@@ -113,7 +113,7 @@
 	}
 
 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";
@@ -124,7 +124,7 @@
 	}
 
 sub version () {
-        print_revision($PROGNAME,'$Revision$ ');
+        print_revision($PROGNAME,'$Revision: 1113 $ ');
         exit $ERRORS{'OK'};
 }
 

Modified: nagiosplug/trunk/contrib/check_frontpage
===================================================================
--- nagiosplug/trunk/contrib/check_frontpage	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_frontpage	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,6 +1,6 @@
 #! /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.
@@ -42,7 +42,7 @@
 	 "H=s" => \$opt_H, "hostname=s" => \$opt_H);
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision$'); #'
+	print_revision($PROGNAME,'$Revision: 1112 $'); #'
 	exit $ERRORS{'OK'};
 }
 
@@ -139,7 +139,7 @@
 }
 
 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";

Modified: nagiosplug/trunk/contrib/check_http-with-client-certificate.c
===================================================================
--- nagiosplug/trunk/contrib/check_http-with-client-certificate.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_http-with-client-certificate.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -37,7 +37,7 @@
  *****************************************************************************/
 
 const char *progname = "check_http";
-#define REVISION "$Revision$"
+#define REVISION "$Revision: 1117 $"
 #define CVSREVISION "1.24"
 #define COPYRIGHT "2003"
 #define AUTHORS "Fabian Pehla"

Modified: nagiosplug/trunk/contrib/check_hw.sh
===================================================================
--- nagiosplug/trunk/contrib/check_hw.sh	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_hw.sh	2008-11-23 05:38:47 UTC (rev 2091)
@@ -16,7 +16,7 @@
 
 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
 

Modified: nagiosplug/trunk/contrib/check_ica_master_browser.pl
===================================================================
--- nagiosplug/trunk/contrib/check_ica_master_browser.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_ica_master_browser.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,8 +1,7 @@
 #!/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)
 #
@@ -170,7 +169,7 @@
 }
 
 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 @@
 }
 
 sub version () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 1099 $ ');
 	exit $ERRORS{'OK'};
 }
 

Modified: nagiosplug/trunk/contrib/check_ica_metaframe_pub_apps.pl
===================================================================
--- nagiosplug/trunk/contrib/check_ica_metaframe_pub_apps.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_ica_metaframe_pub_apps.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,8 +1,7 @@
 #!/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
 #
@@ -303,7 +302,7 @@
 }
 
 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.
@@ -350,7 +349,7 @@
 }
 
 sub version () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 1098 $ ');
 	exit $ERRORS{'OK'};
 }
 

Modified: nagiosplug/trunk/contrib/check_ica_program_neigbourhood.pl
===================================================================
--- nagiosplug/trunk/contrib/check_ica_program_neigbourhood.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_ica_program_neigbourhood.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,8 +1,7 @@
 #!/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"
 #
@@ -290,7 +289,7 @@
 #          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
@@ -345,7 +344,7 @@
 }
 
 sub version () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 1097 $ ');
 	exit $ERRORS{'OK'};
 }
 

Modified: nagiosplug/trunk/contrib/check_inodes-freebsd.pl
===================================================================
--- nagiosplug/trunk/contrib/check_inodes-freebsd.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_inodes-freebsd.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -41,7 +41,7 @@
 	
 
 if ($opt_V) {
-        print_revision($PROGNAME,'$Revision$ ');
+        print_revision($PROGNAME,'$Revision: 72 $ ');
         exit $ERRORS{'OK'};
 }
 
@@ -114,7 +114,7 @@
 }
                 
 sub print_help () {
-        print_revision($PROGNAME,'$Revision$');
+        print_revision($PROGNAME,'$Revision: 72 $');
         print "Copyright (c) 2002 Andrew Ryder\n";
         print "\n";
         print_usage();

Modified: nagiosplug/trunk/contrib/check_javaproc.pl
===================================================================
--- nagiosplug/trunk/contrib/check_javaproc.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_javaproc.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -170,7 +170,7 @@
 }
 
 sub revision() {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 211 $ ');
 }
 
 sub version () {

Modified: nagiosplug/trunk/contrib/check_joy.sh
===================================================================
--- nagiosplug/trunk/contrib/check_joy.sh	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_joy.sh	2008-11-23 05:38:47 UTC (rev 2091)
@@ -4,7 +4,7 @@
 
 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

Modified: nagiosplug/trunk/contrib/check_log2.pl
===================================================================
--- nagiosplug/trunk/contrib/check_log2.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_log2.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,6 +1,6 @@
 #!/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 ([email protected])
@@ -77,7 +77,7 @@
     $neg_re_pattern = '';
     $pattern_count = 0;
     $pattern_line = '';
-    $plugin_revision = '$Revision$ ';
+    $plugin_revision = '$Revision: 1300 $ ';
 
     # Grab options from command line
     GetOptions

Modified: nagiosplug/trunk/contrib/check_lotus.pl
===================================================================
--- nagiosplug/trunk/contrib/check_lotus.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_lotus.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,8 +1,7 @@
 #!/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
 #
@@ -219,7 +218,7 @@
 }
 
 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.
@@ -250,7 +249,7 @@
 }
 
 sub version () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 1096 $ ');
 	exit $ERRORS{'OK'};
 }
 

Modified: nagiosplug/trunk/contrib/check_mem.pl
===================================================================
--- nagiosplug/trunk/contrib/check_mem.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_mem.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,5 +1,5 @@
 #!/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 <[email protected]>
 #

Modified: nagiosplug/trunk/contrib/check_ms_spooler.pl
===================================================================
--- nagiosplug/trunk/contrib/check_ms_spooler.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_ms_spooler.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,8 +1,7 @@
 #!/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)
 #
@@ -268,7 +267,7 @@
 }
 
 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.
@@ -292,7 +291,7 @@
 }
 
 sub version () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 64 $ ');
 	exit $ERRORS{'OK'};
 }
 

Modified: nagiosplug/trunk/contrib/check_ora_table_space.pl
===================================================================
--- nagiosplug/trunk/contrib/check_ora_table_space.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_ora_table_space.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -4,8 +4,8 @@
 # Written by: Erwan Arzur ([email protected])
 # 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.

Modified: nagiosplug/trunk/contrib/check_oracle_instance.pl
===================================================================
--- nagiosplug/trunk/contrib/check_oracle_instance.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_oracle_instance.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,5 +1,5 @@
 #!/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
@@ -23,7 +23,7 @@
 
 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;

Modified: nagiosplug/trunk/contrib/check_oracle_tbs
===================================================================
--- nagiosplug/trunk/contrib/check_oracle_tbs	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_oracle_tbs	2008-11-23 05:38:47 UTC (rev 2091)
@@ -30,7 +30,7 @@
 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

Modified: nagiosplug/trunk/contrib/check_pfstate
===================================================================
--- nagiosplug/trunk/contrib/check_pfstate	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_pfstate	2008-11-23 05:38:47 UTC (rev 2091)
@@ -27,7 +27,7 @@
 	 "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) {
@@ -67,7 +67,7 @@
 
 
 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();

Modified: nagiosplug/trunk/contrib/check_rbl.c
===================================================================
--- nagiosplug/trunk/contrib/check_rbl.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_rbl.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -11,7 +11,7 @@
 * * License: GPL
 * * Copyright (c) 2000
 * * 
-* * $Id$
+* * $Id: check_rbl.c 970 2004-12-02 00:30:32Z opensides $
 *
 *****************************************************************************/
 
@@ -22,7 +22,7 @@
 #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 = "[email protected]";
 
@@ -263,7 +263,7 @@
 				}
 				break;
       case 'V': /* version */
-				print_revision(progname,"$Revision$");
+				print_revision(progname,"$Revision: 970 $");
 				exit(STATE_OK);
       case 'h': /* help */
 				print_help();
@@ -291,7 +291,7 @@
 
 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");

Modified: nagiosplug/trunk/contrib/check_smb.sh
===================================================================
--- nagiosplug/trunk/contrib/check_smb.sh	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_smb.sh	2008-11-23 05:38:47 UTC (rev 2091)
@@ -26,7 +26,7 @@
 #
 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

Modified: nagiosplug/trunk/contrib/check_snmp_disk_monitor.pl
===================================================================
--- nagiosplug/trunk/contrib/check_snmp_disk_monitor.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_snmp_disk_monitor.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -52,7 +52,7 @@
 }
 
 sub local_print_revision {
-        print_revision( $PROGNAME, '$Revision$ ' )
+        print_revision( $PROGNAME, '$Revision: 82 $ ' )
 }
 
 sub print_usage {

Modified: nagiosplug/trunk/contrib/check_snmp_printer.pl
===================================================================
--- nagiosplug/trunk/contrib/check_snmp_printer.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_snmp_printer.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -116,7 +116,7 @@
 $PROGNAME = "check_snmp_printer";
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision$');
+	print_revision($PROGNAME,'$Revision: 795 $');
 	exit $ERRORS{'OK'};
 }
 
@@ -572,7 +572,7 @@
 }
 
 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

Modified: nagiosplug/trunk/contrib/check_snmp_process_monitor.pl
===================================================================
--- nagiosplug/trunk/contrib/check_snmp_process_monitor.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_snmp_process_monitor.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -91,7 +91,7 @@
 }
 
 sub local_print_revision {
-        print_revision( $PROGNAME, '$Revision$ ' )
+        print_revision( $PROGNAME, '$Revision: 84 $ ' )
 }
 
 sub print_usage {

Modified: nagiosplug/trunk/contrib/check_snmp_procs.pl
===================================================================
--- nagiosplug/trunk/contrib/check_snmp_procs.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_snmp_procs.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -109,7 +109,7 @@
 }
 
 if ($opt_version) {
-	print_revision($PROGNAME, "\$Revision$REVISION \$");
+	print_revision($PROGNAME, "\$Revision: 1771 $REVISION \$");
 	exit $ERRORS{'OK'};
 }
 
@@ -529,7 +529,7 @@
 
 #
 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

Modified: nagiosplug/trunk/contrib/check_temp_cpq
===================================================================
--- nagiosplug/trunk/contrib/check_temp_cpq	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_temp_cpq	2008-11-23 05:38:47 UTC (rev 2091)
@@ -138,7 +138,7 @@
 	}
 
 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";
@@ -151,7 +151,7 @@
 	}
 
 sub version () {
-        print_revision($PROGNAME,'$Revision$ ');
+        print_revision($PROGNAME,'$Revision: 1113 $ ');
         exit $ERRORS{'OK'};
 }
 

Modified: nagiosplug/trunk/contrib/check_temp_fsc
===================================================================
--- nagiosplug/trunk/contrib/check_temp_fsc	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_temp_fsc	2008-11-23 05:38:47 UTC (rev 2091)
@@ -138,7 +138,7 @@
 	}
 
 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";
@@ -149,7 +149,7 @@
 	}
 
 sub version () {
-        print_revision($PROGNAME,'$Revision$ ');
+        print_revision($PROGNAME,'$Revision: 1113 $ ');
         exit $ERRORS{'OK'};
 }
 

Modified: nagiosplug/trunk/contrib/check_traceroute.pl
===================================================================
--- nagiosplug/trunk/contrib/check_traceroute.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_traceroute.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,8 +1,7 @@
 #!/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
 #
@@ -32,7 +31,7 @@
 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}; }
@@ -176,7 +175,7 @@
 }
 
 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

Modified: nagiosplug/trunk/contrib/check_uptime.c
===================================================================
--- nagiosplug/trunk/contrib/check_uptime.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_uptime.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -9,7 +9,7 @@
  * Based on CHECK_LOAD.C
  * Copyright (c) 1999 Felipe Gustavo de Almeida <[email protected]>
  *
- * Last Modified: $Date$
+ * Last Modified: $Date: 2002-02-28 21:42:56 -0500 (Thu, 28 Feb 2002) $
  *
  * Command line: CHECK_UPTIME <host_address>
  * 
@@ -44,7 +44,7 @@
   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 ([email protected])\n");
     printf("\n");
     printf("Usage: %s <host_address>\n",argv[0]);

Modified: nagiosplug/trunk/contrib/check_vcs.pl
===================================================================
--- nagiosplug/trunk/contrib/check_vcs.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_vcs.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -71,7 +71,7 @@
     $vcs_negate = '';
     $vcs_result = '';
     $vcs_expected_result = 'ONLINE';
-    $plugin_revision = '$Revision$ ';
+    $plugin_revision = '$Revision: 33 $ ';
 
     # Grab options from command line
     GetOptions

Modified: nagiosplug/trunk/contrib/check_wins.pl
===================================================================
--- nagiosplug/trunk/contrib/check_wins.pl	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/check_wins.pl	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,8 +1,7 @@
 #!/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
 #
@@ -190,7 +189,7 @@
 }
 
 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.
@@ -237,7 +236,7 @@
 }
 
 sub version () {
-	print_revision($PROGNAME,'$Revision$ ');
+	print_revision($PROGNAME,'$Revision: 940 $ ');
 	exit $ERRORS{'OK'};
 }
 

Modified: nagiosplug/trunk/contrib/packet_utils.pm
===================================================================
--- nagiosplug/trunk/contrib/packet_utils.pm	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/packet_utils.pm	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,8 +1,7 @@
 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
 #

Modified: nagiosplug/trunk/contrib/utils.py
===================================================================
--- nagiosplug/trunk/contrib/utils.py	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/contrib/utils.py	2008-11-23 05:38:47 UTC (rev 2091)
@@ -8,7 +8,7 @@
 
 #==========================================================================
 #
-# Version: = '$Id$'
+# Version: = '$Id: utils.py 2 2002-02-28 06:42:51Z egalstad $'
 #
 # (C) Rob W.W. Hooft, Nonius BV, 1998
 #

Deleted: nagiosplug/trunk/doc/BRANCHING
===================================================================
--- nagiosplug/trunk/doc/BRANCHING	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/doc/BRANCHING	2008-11-23 05:38:47 UTC (rev 2091)
@@ -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?

Modified: nagiosplug/trunk/doc/developer-guidelines.sgml
===================================================================
--- nagiosplug/trunk/doc/developer-guidelines.sgml	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/doc/developer-guidelines.sgml	2008-11-23 05:38:47 UTC (rev 2091)
@@ -16,8 +16,8 @@
 	
     <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>
 

Modified: nagiosplug/trunk/lib/extra_opts.c
===================================================================
--- nagiosplug/trunk/lib/extra_opts.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/lib/extra_opts.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,9 +5,6 @@
 * 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
@@ -21,8 +18,6 @@
 * 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"

Modified: nagiosplug/trunk/lib/parse_ini.c
===================================================================
--- nagiosplug/trunk/lib/parse_ini.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/lib/parse_ini.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,9 +5,6 @@
 * 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
@@ -21,7 +18,6 @@
 * 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$
 * 
 *****************************************************************************/
 

Modified: nagiosplug/trunk/lib/tests/test_base64.c
===================================================================
--- nagiosplug/trunk/lib/tests/test_base64.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/lib/tests/test_base64.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -13,7 +13,6 @@
 * 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$
 * 
 *****************************************************************************/
 

Modified: nagiosplug/trunk/lib/tests/test_cmd.c
===================================================================
--- nagiosplug/trunk/lib/tests/test_cmd.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/lib/tests/test_cmd.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -13,7 +13,6 @@
 * 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$
 * 
 *****************************************************************************/
 

Modified: nagiosplug/trunk/lib/tests/test_disk.c
===================================================================
--- nagiosplug/trunk/lib/tests/test_disk.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/lib/tests/test_disk.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -13,7 +13,6 @@
 * 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$
 * 
 *****************************************************************************/
 

Modified: nagiosplug/trunk/lib/tests/test_ini.c
===================================================================
--- nagiosplug/trunk/lib/tests/test_ini.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/lib/tests/test_ini.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -13,7 +13,6 @@
 * 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$
 * 
 *****************************************************************************/
 

Modified: nagiosplug/trunk/lib/tests/test_opts.c
===================================================================
--- nagiosplug/trunk/lib/tests/test_opts.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/lib/tests/test_opts.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -13,8 +13,6 @@
 * 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"

Modified: nagiosplug/trunk/lib/tests/test_tcp.c
===================================================================
--- nagiosplug/trunk/lib/tests/test_tcp.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/lib/tests/test_tcp.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -13,7 +13,6 @@
 * 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$
 * 
 *****************************************************************************/
 

Modified: nagiosplug/trunk/lib/tests/test_utils.c
===================================================================
--- nagiosplug/trunk/lib/tests/test_utils.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/lib/tests/test_utils.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -13,7 +13,6 @@
 * 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$
 * 
 *****************************************************************************/
 

Modified: nagiosplug/trunk/lib/utils_base.c
===================================================================
--- nagiosplug/trunk/lib/utils_base.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/lib/utils_base.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2006 Nagios Plugins Development Team
 *
-* Last Modified: $Date$
-*
 * Library of useful functions for plugins
 * 
 *
@@ -23,7 +21,6 @@
 * 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$
 *
 *****************************************************************************/
 

Modified: nagiosplug/trunk/lib/utils_cmd.c
===================================================================
--- nagiosplug/trunk/lib/utils_cmd.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/lib/utils_cmd.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * 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
@@ -35,7 +33,6 @@
 * 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$
 *
 *****************************************************************************/
 

Modified: nagiosplug/trunk/lib/utils_disk.c
===================================================================
--- nagiosplug/trunk/lib/utils_disk.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/lib/utils_disk.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * 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
@@ -25,7 +23,6 @@
 * 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$
 * 
 *****************************************************************************/
 

Modified: nagiosplug/trunk/lib/utils_tcp.c
===================================================================
--- nagiosplug/trunk/lib/utils_tcp.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/lib/utils_tcp.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * 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
@@ -25,7 +23,6 @@
 * 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$
 * 
 *****************************************************************************/
 

Modified: nagiosplug/trunk/plugins/Makefile.am
===================================================================
--- nagiosplug/trunk/plugins/Makefile.am	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/Makefile.am	2008-11-23 05:38:47 UTC (rev 2091)
@@ -1,5 +1,11 @@
 ## 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@
@@ -65,10 +71,10 @@
 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
@@ -153,7 +159,7 @@
 
 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 $@
@@ -166,6 +172,10 @@
 	
 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
+

Modified: nagiosplug/trunk/plugins/check_apt.c
===================================================================
--- nagiosplug/trunk/plugins/check_apt.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_apt.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -7,8 +7,6 @@
 * 
 * Original author: Sean Finney
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_apt plugin
@@ -29,12 +27,9 @@
 * 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 = "[email protected]";
 
@@ -159,7 +154,7 @@
 			print_help();
 			exit(STATE_OK);
 		case 'V':
-			print_revision(progname, revision);
+			print_revision(progname, NP_VERSION);
 			exit(STATE_OK);
 		case 'v':
 			verbose++;
@@ -404,7 +399,7 @@
 void
 print_help (void)
 {
-  print_revision(progname, revision);
+  print_revision(progname, NP_VERSION);
 
   printf(_(COPYRIGHT), copyright, email);
 

Modified: nagiosplug/trunk/plugins/check_by_ssh.c
===================================================================
--- nagiosplug/trunk/plugins/check_by_ssh.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_by_ssh.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_by_ssh plugin
@@ -25,12 +23,10 @@
 * 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 = "[email protected]";
 
@@ -201,7 +197,7 @@
 
 		switch (c) {
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -339,7 +335,7 @@
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Karl DeBisschop <[email protected]>\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_cluster.c
===================================================================
--- nagiosplug/trunk/plugins/check_cluster.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_cluster.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -6,9 +6,6 @@
 * Copyright (c) 2000-2004 Ethan Galstad ([email protected])
 * 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
@@ -22,12 +19,10 @@
 * 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 = "[email protected]";
 
@@ -204,7 +199,7 @@
 			break;
 
 		case 'V': /* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 			break;
 
@@ -228,7 +223,7 @@
 void
 print_help(void)
 {
-	print_revision(progname, revision);
+	print_revision(progname, NP_VERSION);
 	printf ("Copyright (c) 2000-2004 Ethan Galstad ([email protected])\n");
 	printf(COPYRIGHT, copyright, email);
 

Modified: nagiosplug/trunk/plugins/check_dig.c
===================================================================
--- nagiosplug/trunk/plugins/check_dig.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_dig.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2002-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_dig plugin
@@ -25,7 +23,6 @@
 * 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$
 * 
 *****************************************************************************/
 
@@ -36,7 +33,6 @@
  *  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 = "[email protected]";
 
@@ -220,7 +216,7 @@
       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);
@@ -312,7 +308,7 @@
 
   asprintf (&myport, "%d", DEFAULT_PORT);
 
-  print_revision (progname, revision);
+  print_revision (progname, NP_VERSION);
 
   printf ("Copyright (c) 2000 Karl DeBisschop <[email protected]>\n");
   printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_disk.c
===================================================================
--- nagiosplug/trunk/plugins/check_disk.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_disk.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_disk plugin
@@ -25,13 +23,11 @@
 * 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 = "[email protected]";
 
@@ -787,7 +783,7 @@
       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 @@
 void
 print_help (void)
 {
-  print_revision (progname, revision);
+  print_revision (progname, NP_VERSION);
 
   printf ("Copyright (c) 1999 Ethan Galstad <[email protected]>\n");
   printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_dns.c
===================================================================
--- nagiosplug/trunk/plugins/check_dns.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_dns.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_dns plugin
@@ -28,12 +26,10 @@
 * 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 = "[email protected]";
 
@@ -363,7 +359,7 @@
       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;
@@ -446,7 +442,7 @@
 void
 print_help (void)
 {
-  print_revision (progname, revision);
+  print_revision (progname, NP_VERSION);
 
   printf ("Copyright (c) 1999 Ethan Galstad <[email protected]>\n");
   printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_dummy.c
===================================================================
--- nagiosplug/trunk/plugins/check_dummy.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_dummy.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_dummy plugin
@@ -27,12 +25,10 @@
 * 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 = "[email protected]";
 
@@ -55,7 +51,7 @@
   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) {
@@ -100,7 +96,7 @@
 void
 print_help (void)
 {
-  print_revision (progname, revision);
+  print_revision (progname, NP_VERSION);
 
   printf ("Copyright (c) 1999 Ethan Galstad <[email protected]>\n");
   printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_fping.c
===================================================================
--- nagiosplug/trunk/plugins/check_fping.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_fping.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_disk plugin
@@ -28,12 +26,10 @@
 * 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 = "[email protected]";
 
@@ -264,7 +260,7 @@
       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;
@@ -368,7 +364,7 @@
 print_help (void)
 {
 
-  print_revision (progname, revision);
+  print_revision (progname, NP_VERSION);
 
   printf ("Copyright (c) 1999 Didi Rieder <[email protected]>\n");
   printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_game.c
===================================================================
--- nagiosplug/trunk/plugins/check_game.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_game.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2002-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_game plugin
@@ -28,12 +26,10 @@
 * 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 = "[email protected]";
 
@@ -202,7 +198,7 @@
       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;
@@ -293,7 +289,7 @@
 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);

Modified: nagiosplug/trunk/plugins/check_hpjd.c
===================================================================
--- nagiosplug/trunk/plugins/check_hpjd.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_hpjd.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_hpjd plugin
@@ -28,12 +26,10 @@
 * 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 = "[email protected]";
 
@@ -346,7 +342,7 @@
 			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 ();
@@ -387,7 +383,7 @@
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Ethan Galstad <[email protected]>\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_http.c
===================================================================
--- nagiosplug/trunk/plugins/check_http.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_http.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_http plugin
@@ -30,14 +28,12 @@
 * 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 = "[email protected]";
 
@@ -144,8 +140,8 @@
   /* 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);
@@ -242,7 +238,7 @@
       exit (STATE_OK);
       break;
     case 'V': /* version */
-      print_revision (progname, revision);
+      print_revision (progname, NP_VERSION);
       exit (STATE_OK);
       break;
     case 't': /* timeout period */
@@ -1271,7 +1267,7 @@
 void
 print_help (void)
 {
-  print_revision (progname, revision);
+  print_revision (progname, NP_VERSION);
 
   printf ("Copyright (c) 1999 Ethan Galstad <[email protected]>\n");
   printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_ide_smart.c
===================================================================
--- nagiosplug/trunk/plugins/check_ide_smart.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_ide_smart.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -9,8 +9,6 @@
 * Copyright (c) 2000 Robert Dale <[email protected]>
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_ide_smart plugin
@@ -32,12 +30,10 @@
 * 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 = "[email protected]";
 	
@@ -211,7 +207,7 @@
 			print_help ();
 			return STATE_OK;
 		case 'V':
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			return STATE_OK;
 		default:
 			usage5 ();
@@ -481,7 +477,7 @@
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Nagios feature - 1999 Robert Dale <[email protected]>\n");
 	printf ("(C) 1999 Ragnar Hojland Espinosa <[email protected]>\n");

Modified: nagiosplug/trunk/plugins/check_ldap.c
===================================================================
--- nagiosplug/trunk/plugins/check_ldap.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_ldap.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_ldap plugin
@@ -25,13 +23,11 @@
 * 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 = "[email protected]";
 
@@ -289,7 +285,7 @@
 			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))
@@ -390,7 +386,7 @@
 	char *myport;
 	asprintf (&myport, "%d", DEFAULT_PORT);
 
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Didi Rieder ([email protected])\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_load.c
===================================================================
--- nagiosplug/trunk/plugins/check_load.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_load.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_load plugin
@@ -27,12 +25,10 @@
 * 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 = "[email protected]";
 
@@ -245,7 +241,7 @@
 			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 ();
@@ -298,7 +294,7 @@
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Felipe Gustavo de Almeida <[email protected]>\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_mrtg.c
===================================================================
--- nagiosplug/trunk/plugins/check_mrtg.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_mrtg.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_mrtg plugin
@@ -28,12 +26,10 @@
 * 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 = "[email protected]";
 
@@ -237,7 +233,7 @@
 			units = optarg;
 			break;
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -317,7 +313,7 @@
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Ethan Galstad <[email protected]>\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_mrtgtraf.c
===================================================================
--- nagiosplug/trunk/plugins/check_mrtgtraf.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_mrtgtraf.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_mtrgtraf plugin
@@ -28,7 +26,6 @@
 * 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$
 * 
 *****************************************************************************/
 
@@ -36,7 +33,6 @@
 #include "utils.h"
 
 const char *progname = "check_mrtgtraf";
-const char *revision = "$Revision$";
 const char *copyright = "1999-2007";
 const char *email = "[email protected]";
 
@@ -273,7 +269,7 @@
 							&outgoing_warning_threshold);
 			break;
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -331,7 +327,7 @@
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Ethan Galstad <[email protected]>\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_mysql.c
===================================================================
--- nagiosplug/trunk/plugins/check_mysql.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_mysql.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -7,8 +7,6 @@
 * Copyright (c) 2000 Karl DeBisschop ([email protected])
 * Copyright (c) 1999-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-*
 * Description:
 * 
 * This file contains the check_mysql plugin
@@ -29,12 +27,10 @@
 * 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 = "[email protected]";
 
@@ -310,7 +306,7 @@
 			critical = optarg;
 			break;
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -377,7 +373,7 @@
 	char *myport;
 	asprintf (&myport, "%d", MYSQL_PORT);
 
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf (_(COPYRIGHT), copyright, email);
 

Modified: nagiosplug/trunk/plugins/check_mysql_query.c
===================================================================
--- nagiosplug/trunk/plugins/check_mysql_query.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_mysql_query.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -6,8 +6,6 @@
 * 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
@@ -28,12 +26,10 @@
 * 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 = "[email protected]";
 
@@ -231,7 +227,7 @@
 			verbose++;
 			break;
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -286,7 +282,7 @@
 	char *myport;
 	asprintf (&myport, "%d", MYSQL_PORT);
 
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf (_(COPYRIGHT), copyright, email);
 

Modified: nagiosplug/trunk/plugins/check_nagios.c
===================================================================
--- nagiosplug/trunk/plugins/check_nagios.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_nagios.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_nagios plugin
@@ -31,12 +29,10 @@
 * 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 = "[email protected]";
 
@@ -240,7 +236,7 @@
 			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;
@@ -278,7 +274,7 @@
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf (_(COPYRIGHT), copyright, email);
 

Modified: nagiosplug/trunk/plugins/check_nt.c
===================================================================
--- nagiosplug/trunk/plugins/check_nt.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_nt.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -6,8 +6,6 @@
 * Copyright (c) 2000-2002 Yves Rubin ([email protected])
 * Copyright (c) 2003-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_nt plugin
@@ -31,12 +29,10 @@
 * 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 = "[email protected]";
 
@@ -517,7 +513,7 @@
 				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);
@@ -637,7 +633,7 @@
 
 void print_help(void)
 {
-	print_revision(progname,revision);
+	print_revision(progname, NP_VERSION);
 	
 	printf ("Copyright (c) 2000 Yves Rubin ([email protected])\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_ntp.c
===================================================================
--- nagiosplug/trunk/plugins/check_ntp.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_ntp.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -6,8 +6,6 @@
 * Copyright (c) 2006 Sean Finney <[email protected]>
 * Copyright (c) 2006-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_ntp plugin
@@ -29,12 +27,10 @@
 * 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 = "[email protected]";
 
@@ -682,7 +678,7 @@
 			exit(STATE_OK);
 			break;
 		case 'V':
-			print_revision(progname, revision);
+			print_revision(progname, NP_VERSION);
 			exit(STATE_OK);
 			break;
 		case 'v':
@@ -836,7 +832,7 @@
 
 
 void print_help(void){
-	print_revision(progname, revision);
+	print_revision(progname, NP_VERSION);
 
 	printf ("Copyright (c) 2006 Sean Finney\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_ntp_peer.c
===================================================================
--- nagiosplug/trunk/plugins/check_ntp_peer.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_ntp_peer.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -6,8 +6,6 @@
 * Copyright (c) 2006 Sean Finney <[email protected]>
 * Copyright (c) 2006-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_ntp_peer plugin
@@ -34,12 +32,10 @@
 * 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 = "[email protected]";
 
@@ -492,7 +488,7 @@
 			exit(STATE_OK);
 			break;
 		case 'V':
-			print_revision(progname, revision);
+			print_revision(progname, NP_VERSION);
 			exit(STATE_OK);
 			break;
 		case 'v':
@@ -671,7 +667,7 @@
 
 
 void print_help(void){
-	print_revision(progname, revision);
+	print_revision(progname, NP_VERSION);
 
 	printf ("Copyright (c) 2006 Sean Finney\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_ntp_time.c
===================================================================
--- nagiosplug/trunk/plugins/check_ntp_time.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_ntp_time.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -6,8 +6,6 @@
 * Copyright (c) 2006 Sean Finney <[email protected]>
 * Copyright (c) 2006-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_ntp_time plugin
@@ -33,12 +31,10 @@
 * 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 = "[email protected]";
 
@@ -476,7 +472,7 @@
 			exit(STATE_OK);
 			break;
 		case 'V':
-			print_revision(progname, revision);
+			print_revision(progname, NP_VERSION);
 			exit(STATE_OK);
 			break;
 		case 'v':
@@ -594,7 +590,7 @@
 }
 
 void print_help(void){
-	print_revision(progname, revision);
+	print_revision(progname, NP_VERSION);
 
 	printf ("Copyright (c) 2006 Sean Finney\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_nwstat.c
===================================================================
--- nagiosplug/trunk/plugins/check_nwstat.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_nwstat.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_nwstat plugin
@@ -28,12 +26,10 @@
 * 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 = "[email protected]";
 
@@ -1360,7 +1356,7 @@
 				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;
@@ -1597,7 +1593,7 @@
 	char *myport;
 	asprintf (&myport, "%d", PORT);
 
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Ethan Galstad <[email protected]>\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_overcr.c
===================================================================
--- nagiosplug/trunk/plugins/check_overcr.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_overcr.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_overcr plugin
@@ -28,12 +26,10 @@
 * 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 = "[email protected]";
 
@@ -346,7 +342,7 @@
 			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;
@@ -415,7 +411,7 @@
 	char *myport;
 	asprintf (&myport, "%d", PORT);
 
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Ethan Galstad <[email protected]>\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_pgsql.c
===================================================================
--- nagiosplug/trunk/plugins/check_pgsql.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_pgsql.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_pgsql plugin
@@ -27,12 +25,10 @@
 * 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 = "[email protected]";
 
@@ -231,7 +227,7 @@
 			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))
@@ -404,7 +400,7 @@
 
 	asprintf (&myport, "%d", DEFAULT_PORT);
 
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf (COPYRIGHT, copyright, email);
 

Modified: nagiosplug/trunk/plugins/check_ping.c
===================================================================
--- nagiosplug/trunk/plugins/check_ping.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_ping.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_ping plugin
@@ -27,12 +25,10 @@
 * 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 = "[email protected]";
 
@@ -231,7 +227,7 @@
 			exit (STATE_OK);
 			break;
 		case 'V':	/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 			break;
 		case 't':	/* timeout period */
@@ -555,7 +551,7 @@
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Ethan Galstad <[email protected]>\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_procs.c
===================================================================
--- nagiosplug/trunk/plugins/check_procs.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_procs.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_procs plugin
@@ -30,13 +28,11 @@
 * 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 = "[email protected]";
 
@@ -361,7 +357,7 @@
 			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))
@@ -674,7 +670,7 @@
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Ethan Galstad <[email protected]>\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_radius.c
===================================================================
--- nagiosplug/trunk/plugins/check_radius.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_radius.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_radius plugin
@@ -27,12 +25,10 @@
 * 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 = "[email protected]";
 
@@ -239,7 +235,7 @@
 			print_help ();
 			exit (OK);
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (OK);
 		case 'v':									/* verbose mode */
 			verbose = TRUE;
@@ -312,7 +308,7 @@
 	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);

Modified: nagiosplug/trunk/plugins/check_real.c
===================================================================
--- nagiosplug/trunk/plugins/check_real.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_real.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_real plugin
@@ -27,12 +25,10 @@
 * 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 = "[email protected]";
 
@@ -361,7 +357,7 @@
 			}
 			break;
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -409,7 +405,7 @@
 	char *myport;
 	asprintf (&myport, "%d", PORT);
 
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Pedro Leite <[email protected]>\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_smtp.c
===================================================================
--- nagiosplug/trunk/plugins/check_smtp.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_smtp.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_smtp plugin
@@ -27,12 +25,10 @@
 * 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 = "[email protected]";
 
@@ -620,7 +616,7 @@
 #endif
 			break;
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -762,7 +758,7 @@
 	char *myport;
 	asprintf (&myport, "%d", SMTP_PORT);
 
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999-2001 Ethan Galstad <[email protected]>\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_snmp.c
===================================================================
--- nagiosplug/trunk/plugins/check_snmp.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_snmp.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_snmp plugin
@@ -27,12 +25,10 @@
 * 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 = "[email protected]";
 
@@ -475,7 +471,7 @@
 			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;
@@ -928,7 +924,7 @@
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf (COPYRIGHT, copyright, email);
 

Modified: nagiosplug/trunk/plugins/check_ssh.c
===================================================================
--- nagiosplug/trunk/plugins/check_ssh.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_ssh.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_ssh plugin
@@ -27,12 +25,10 @@
 * 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 = "[email protected]";
 
@@ -129,7 +125,7 @@
 		case '?':									/* help */
 			usage5 ();
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -218,10 +214,8 @@
 	char *buffer = NULL;
 	char *ssh_proto = NULL;
 	char *ssh_server = NULL;
-	char rev_no[20];
+	static char *rev_no = VERSION;
 
-	sscanf ("$Revision$", "$Revision: %[0123456789.]", rev_no);
-
 	result = my_tcp_connect (haddr, hport, &sd);
 
 	if (result != STATE_OK)
@@ -272,7 +266,7 @@
 	char *myport;
 	asprintf (&myport, "%d", SSH_DFL_PORT);
 
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Remi Paulmier <[email protected]>\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_swap.c
===================================================================
--- nagiosplug/trunk/plugins/check_swap.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_swap.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -6,8 +6,6 @@
 * Copyright (c) 2000 Karl DeBisschop ([email protected])
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_disk plugin
@@ -26,12 +24,10 @@
 * 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 = "[email protected]";
 
@@ -463,7 +459,7 @@
 			verbose++;
 			break;
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -522,7 +518,7 @@
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf (_(COPYRIGHT), copyright, email);
 

Modified: nagiosplug/trunk/plugins/check_tcp.c
===================================================================
--- nagiosplug/trunk/plugins/check_tcp.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_tcp.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_tcp plugin
@@ -31,7 +29,6 @@
 
 /* progname "check_tcp" changes depending on symlink called */
 char *progname;
-const char *revision = "$Revision$";
 const char *copyright = "1999-2008";
 const char *email = "[email protected]";
 
@@ -451,7 +448,7 @@
 			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;
@@ -592,7 +589,7 @@
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Ethan Galstad <[email protected]>\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/check_time.c
===================================================================
--- nagiosplug/trunk/plugins/check_time.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_time.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_time plugin
@@ -27,12 +25,10 @@
 * 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 = "[email protected]";
 
@@ -237,7 +233,7 @@
 			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)
@@ -335,7 +331,7 @@
 	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);

Modified: nagiosplug/trunk/plugins/check_ups.c
===================================================================
--- nagiosplug/trunk/plugins/check_ups.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_ups.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -8,8 +8,6 @@
 *               2004 Arnaud Quette <[email protected]>
 * Copyright (c) 2002-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains Network UPS Tools plugin for Nagios
@@ -31,12 +29,10 @@
 * 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 = "[email protected]";
 
@@ -561,7 +557,7 @@
 			}
 			break;
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -601,7 +597,7 @@
 	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 <[email protected]>\n");

Modified: nagiosplug/trunk/plugins/check_users.c
===================================================================
--- nagiosplug/trunk/plugins/check_users.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/check_users.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_users plugin
@@ -29,12 +27,10 @@
 * 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 = "[email protected]";
 
@@ -163,7 +159,7 @@
 			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))
@@ -203,7 +199,7 @@
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Ethan Galstad\n");
 	printf (COPYRIGHT, copyright, email);

Modified: nagiosplug/trunk/plugins/common.h
===================================================================
--- nagiosplug/trunk/plugins/common.h	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/common.h	2008-11-23 05:38:47 UTC (rev 2091)
@@ -6,8 +6,6 @@
 * Copyright (c) 1999 Ethan Galstad ([email protected])
 * Copyright (c) 2003-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains common include files and defines used in many of
@@ -27,7 +25,6 @@
 * 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$
 * 
 *****************************************************************************/
 

Modified: nagiosplug/trunk/plugins/negate.c
===================================================================
--- nagiosplug/trunk/plugins/negate.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/negate.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2002-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the negate plugin
@@ -28,12 +26,10 @@
 * 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 = "[email protected]";
 
@@ -155,7 +151,7 @@
 			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))
@@ -233,7 +229,7 @@
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf (COPYRIGHT, copyright, email);
 

Modified: nagiosplug/trunk/plugins/netutils.c
===================================================================
--- nagiosplug/trunk/plugins/netutils.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/netutils.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -6,8 +6,6 @@
 * Copyright (c) 1999 Ethan Galstad ([email protected])
 * Copyright (c) 2003-2008 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains commons functions used in many of the plugins.
@@ -26,7 +24,6 @@
 * 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$
 * 
 *****************************************************************************/
 

Modified: nagiosplug/trunk/plugins/netutils.h
===================================================================
--- nagiosplug/trunk/plugins/netutils.h	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/netutils.h	2008-11-23 05:38:47 UTC (rev 2091)
@@ -6,8 +6,6 @@
 * Copyright (c) 1999 Ethan Galstad ([email protected])
 * Copyright (c) 2003-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains common include files and function definitions
@@ -27,7 +25,6 @@
 * 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$
 * 
 *****************************************************************************/
 

Modified: nagiosplug/trunk/plugins/popen.c
===================================================================
--- nagiosplug/trunk/plugins/popen.c	2008-11-21 01:40:47 UTC (rev 2090)
+++ nagiosplug/trunk/plugins/popen.c	2008-11-23 05:38:47 UTC (rev 2091)
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2005-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * A safe alternative to popen
@@ -37,7 +35,6 @@
 * You should have received a copy of the GNU General Public License

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.