summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Makefile.am16
-rw-r--r--plugins/check_apt.c9
-rw-r--r--plugins/check_by_ssh.c8
-rw-r--r--plugins/check_cluster.c9
-rw-r--r--plugins/check_dig.c8
-rw-r--r--plugins/check_disk.c8
-rw-r--r--plugins/check_dns.c8
-rw-r--r--plugins/check_dummy.c8
-rw-r--r--plugins/check_fping.c8
-rw-r--r--plugins/check_game.c8
-rw-r--r--plugins/check_hpjd.c8
-rw-r--r--plugins/check_http.c12
-rw-r--r--plugins/check_ide_smart.c8
-rw-r--r--plugins/check_ldap.c8
-rw-r--r--plugins/check_load.c8
-rw-r--r--plugins/check_mrtg.c8
-rw-r--r--plugins/check_mrtgtraf.c8
-rw-r--r--plugins/check_mysql.c8
-rw-r--r--plugins/check_mysql_query.c8
-rw-r--r--plugins/check_nagios.c8
-rw-r--r--plugins/check_nt.c8
-rw-r--r--plugins/check_ntp.c8
-rw-r--r--plugins/check_ntp_peer.c8
-rw-r--r--plugins/check_ntp_time.c8
-rw-r--r--plugins/check_nwstat.c8
-rw-r--r--plugins/check_overcr.c8
-rw-r--r--plugins/check_pgsql.c8
-rw-r--r--plugins/check_ping.c8
-rw-r--r--plugins/check_procs.c8
-rw-r--r--plugins/check_radius.c8
-rw-r--r--plugins/check_real.c8
-rw-r--r--plugins/check_smtp.c8
-rw-r--r--plugins/check_snmp.c8
-rw-r--r--plugins/check_ssh.c12
-rw-r--r--plugins/check_swap.c8
-rw-r--r--plugins/check_tcp.c7
-rw-r--r--plugins/check_time.c8
-rw-r--r--plugins/check_ups.c8
-rw-r--r--plugins/check_users.c8
-rw-r--r--plugins/common.h3
-rw-r--r--plugins/negate.c8
-rw-r--r--plugins/netutils.c3
-rw-r--r--plugins/netutils.h3
-rw-r--r--plugins/popen.c3
-rw-r--r--plugins/popen.h1
-rw-r--r--plugins/runcmd.c3
-rw-r--r--plugins/runcmd.h1
-rw-r--r--plugins/sslutils.c3
-rw-r--r--plugins/t/check_by_ssh.t1
-rw-r--r--plugins/t/check_cluster.t1
-rw-r--r--plugins/t/check_dig.t1
-rw-r--r--plugins/t/check_disk.t1
-rw-r--r--plugins/t/check_dns.t1
-rw-r--r--plugins/t/check_dummy.t1
-rw-r--r--plugins/t/check_fping.t1
-rw-r--r--plugins/t/check_ftp.t1
-rw-r--r--plugins/t/check_hpjd.t1
-rw-r--r--plugins/t/check_http.t1
-rw-r--r--plugins/t/check_imap.t1
-rw-r--r--plugins/t/check_jabber.t1
-rw-r--r--plugins/t/check_load.t1
-rw-r--r--plugins/t/check_mysql.t1
-rw-r--r--plugins/t/check_mysql_query.t1
-rw-r--r--plugins/t/check_nagios.t1
-rw-r--r--plugins/t/check_ntp.t1
-rw-r--r--plugins/t/check_ping.t1
-rw-r--r--plugins/t/check_pop.t1
-rw-r--r--plugins/t/check_procs.t1
-rw-r--r--plugins/t/check_smtp.t1
-rw-r--r--plugins/t/check_snmp.t1
-rw-r--r--plugins/t/check_swap.t1
-rw-r--r--plugins/t/check_tcp.t1
-rw-r--r--plugins/t/check_time.t1
-rw-r--r--plugins/t/check_udp.t1
-rw-r--r--plugins/t/check_users.t1
-rw-r--r--plugins/t/negate.t2
-rw-r--r--plugins/urlize.c8
-rw-r--r--plugins/utils.c21
-rw-r--r--plugins/utils.h3
79 files changed, 99 insertions, 319 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 85e4a5dd..59876902 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,5 +1,11 @@
1## Process this file with automake to produce Makefile.in 1## Process this file with automake to produce Makefile.in
2 2
3NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
4 @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
5-include NP-VERSION-FILE
6
7AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
8
3VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 9VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
4 10
5INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ 11INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
@@ -65,10 +71,10 @@ check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS)
65check_load_LDADD = $(BASEOBJS) popen.o 71check_load_LDADD = $(BASEOBJS) popen.o
66check_mrtg_LDADD = $(BASEOBJS) 72check_mrtg_LDADD = $(BASEOBJS)
67check_mrtgtraf_LDADD = $(BASEOBJS) 73check_mrtgtraf_LDADD = $(BASEOBJS)
68check_mysql_CFLAGS = $(MYSQLCFLAGS) 74check_mysql_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"'
69check_mysql_CPPFLAGS = $(MYSQLINCLUDE) 75check_mysql_CPPFLAGS = $(MYSQLINCLUDE)
70check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS) 76check_mysql_LDADD = $(NETLIBS) $(MYSQLLIBS)
71check_mysql_query_CFLAGS = $(MYSQLCFLAGS) 77check_mysql_query_CFLAGS = $(MYSQLCFLAGS) -DNP_VERSION='"$(NP_VERSION)"'
72check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE) 78check_mysql_query_CPPFLAGS = $(MYSQLINCLUDE)
73check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS) 79check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS)
74check_nagios_LDADD = $(BASEOBJS) runcmd.o 80check_nagios_LDADD = $(BASEOBJS) runcmd.o
@@ -153,7 +159,7 @@ getaddrinfo.o: getaddrinfo.h $(PLUGINHDRS)
153 159
154gethostbyname.o: gethostbyname.h $(PLUGINHDRS) 160gethostbyname.o: gethostbyname.h $(PLUGINHDRS)
155 161
156all-local: $(check_tcp_programs) 162all-local: $(check_tcp_programs) NP-VERSION-FILE
157 163
158$(check_tcp_programs): check_tcp 164$(check_tcp_programs): check_tcp
159 rm -f $@ 165 rm -f $@
@@ -166,6 +172,10 @@ install-exec-hook:
166 172
167clean-local: 173clean-local:
168 rm -f $(check_tcp_programs) 174 rm -f $(check_tcp_programs)
175 rm -f NP-VERSION-FILE
169 176
170uninstall-local: 177uninstall-local:
171 cd $(DESTDIR)$(libexecdir) && rm -f $(check_tcp_programs) 178 cd $(DESTDIR)$(libexecdir) && rm -f $(check_tcp_programs)
179
180.PHONY: .FORCE-NP-VERSION-FILE
181
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index 49a7c4f7..3da54bcf 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -7,8 +7,6 @@
7* 7*
8* Original author: Sean Finney 8* Original author: Sean Finney
9* 9*
10* Last Modified: $Date$
11*
12* Description: 10* Description:
13* 11*
14* This file contains the check_apt plugin 12* This file contains the check_apt plugin
@@ -29,12 +27,9 @@
29* You should have received a copy of the GNU General Public License 27* You should have received a copy of the GNU General Public License
30* along with this program. If not, see <http://www.gnu.org/licenses/>. 28* along with this program. If not, see <http://www.gnu.org/licenses/>.
31* 29*
32* $Id$
33*
34*****************************************************************************/ 30*****************************************************************************/
35 31
36const char *progname = "check_apt"; 32const char *progname = "check_apt";
37const char *revision = "$Revision$";
38const char *copyright = "2006-2008"; 33const char *copyright = "2006-2008";
39const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
40 35
@@ -159,7 +154,7 @@ int process_arguments (int argc, char **argv) {
159 print_help(); 154 print_help();
160 exit(STATE_OK); 155 exit(STATE_OK);
161 case 'V': 156 case 'V':
162 print_revision(progname, revision); 157 print_revision(progname, NP_VERSION);
163 exit(STATE_OK); 158 exit(STATE_OK);
164 case 'v': 159 case 'v':
165 verbose++; 160 verbose++;
@@ -404,7 +399,7 @@ char* construct_cmdline(upgrade_type u, const char *opts){
404void 399void
405print_help (void) 400print_help (void)
406{ 401{
407 print_revision(progname, revision); 402 print_revision(progname, NP_VERSION);
408 403
409 printf(_(COPYRIGHT), copyright, email); 404 printf(_(COPYRIGHT), copyright, email);
410 405
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index ce62ebaf..d0dbf34a 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2008 Nagios Plugins Development Team 6* Copyright (c) 2000-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_by_ssh plugin 10* This file contains the check_by_ssh plugin
@@ -25,12 +23,10 @@
25* You should have received a copy of the GNU General Public License 23* You should have received a copy of the GNU General Public License
26* along with this program. If not, see <http://www.gnu.org/licenses/>. 24* along with this program. If not, see <http://www.gnu.org/licenses/>.
27* 25*
28* $Id$
29* 26*
30*****************************************************************************/ 27*****************************************************************************/
31 28
32const char *progname = "check_by_ssh"; 29const char *progname = "check_by_ssh";
33const char *revision = "$Revision$";
34const char *copyright = "2000-2008"; 30const char *copyright = "2000-2008";
35const char *email = "nagiosplug-devel@lists.sourceforge.net"; 31const char *email = "nagiosplug-devel@lists.sourceforge.net";
36 32
@@ -201,7 +197,7 @@ process_arguments (int argc, char **argv)
201 197
202 switch (c) { 198 switch (c) {
203 case 'V': /* version */ 199 case 'V': /* version */
204 print_revision (progname, revision); 200 print_revision (progname, NP_VERSION);
205 exit (STATE_OK); 201 exit (STATE_OK);
206 case 'h': /* help */ 202 case 'h': /* help */
207 print_help (); 203 print_help ();
@@ -339,7 +335,7 @@ validate_arguments (void)
339void 335void
340print_help (void) 336print_help (void)
341{ 337{
342 print_revision (progname, revision); 338 print_revision (progname, NP_VERSION);
343 339
344 printf ("Copyright (c) 1999 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"); 340 printf ("Copyright (c) 1999 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
345 printf (COPYRIGHT, copyright, email); 341 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index 04919e0d..01385886 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -6,9 +6,6 @@
6* Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org) 6* Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)
7* Copyright (c) 2007 Nagios Plugins Development Team 7* Copyright (c) 2007 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11*
12* This program is free software: you can redistribute it and/or modify 9* This program is free software: you can redistribute it and/or modify
13* it under the terms of the GNU General Public License as published by 10* it under the terms of the GNU General Public License as published by
14* the Free Software Foundation, either version 3 of the License, or 11* the Free Software Foundation, either version 3 of the License, or
@@ -22,12 +19,10 @@
22* You should have received a copy of the GNU General Public License 19* You should have received a copy of the GNU General Public License
23* along with this program. If not, see <http://www.gnu.org/licenses/>. 20* along with this program. If not, see <http://www.gnu.org/licenses/>.
24* 21*
25* $Id$
26* 22*
27*****************************************************************************/ 23*****************************************************************************/
28 24
29const char *progname = "check_cluster"; 25const char *progname = "check_cluster";
30const char *revision = "$Revision$";
31const char *copyright = "2000-2007"; 26const char *copyright = "2000-2007";
32const char *email = "nagiosplug-devel@lists.sourceforge.net"; 27const char *email = "nagiosplug-devel@lists.sourceforge.net";
33 28
@@ -204,7 +199,7 @@ int process_arguments(int argc, char **argv){
204 break; 199 break;
205 200
206 case 'V': /* version */ 201 case 'V': /* version */
207 print_revision (progname, revision); 202 print_revision (progname, NP_VERSION);
208 exit (STATE_OK); 203 exit (STATE_OK);
209 break; 204 break;
210 205
@@ -228,7 +223,7 @@ int process_arguments(int argc, char **argv){
228void 223void
229print_help(void) 224print_help(void)
230{ 225{
231 print_revision(progname, revision); 226 print_revision(progname, NP_VERSION);
232 printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n"); 227 printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n");
233 printf(COPYRIGHT, copyright, email); 228 printf(COPYRIGHT, copyright, email);
234 229
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 34197ecc..08be9373 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2002-2008 Nagios Plugins Development Team 6* Copyright (c) 2002-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_dig plugin 10* This file contains the check_dig plugin
@@ -25,7 +23,6 @@
25* You should have received a copy of the GNU General Public License 23* You should have received a copy of the GNU General Public License
26* along with this program. If not, see <http://www.gnu.org/licenses/>. 24* along with this program. If not, see <http://www.gnu.org/licenses/>.
27* 25*
28* $Id$
29* 26*
30*****************************************************************************/ 27*****************************************************************************/
31 28
@@ -36,7 +33,6 @@
36 * because on some architectures those strings are in non-writable memory */ 33 * because on some architectures those strings are in non-writable memory */
37 34
38const char *progname = "check_dig"; 35const char *progname = "check_dig";
39const char *revision = "$Revision$";
40const char *copyright = "2002-2008"; 36const char *copyright = "2002-2008";
41const char *email = "nagiosplug-devel@lists.sourceforge.net"; 37const char *email = "nagiosplug-devel@lists.sourceforge.net";
42 38
@@ -220,7 +216,7 @@ process_arguments (int argc, char **argv)
220 print_help (); 216 print_help ();
221 exit (STATE_OK); 217 exit (STATE_OK);
222 case 'V': /* version */ 218 case 'V': /* version */
223 print_revision (progname, revision); 219 print_revision (progname, NP_VERSION);
224 exit (STATE_OK); 220 exit (STATE_OK);
225 case 'H': /* hostname */ 221 case 'H': /* hostname */
226 host_or_die(optarg); 222 host_or_die(optarg);
@@ -312,7 +308,7 @@ print_help (void)
312 308
313 asprintf (&myport, "%d", DEFAULT_PORT); 309 asprintf (&myport, "%d", DEFAULT_PORT);
314 310
315 print_revision (progname, revision); 311 print_revision (progname, NP_VERSION);
316 312
317 printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"); 313 printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
318 printf (COPYRIGHT, copyright, email); 314 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 12b77a8a..98a061fb 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2008 Nagios Plugins Development Team 6* Copyright (c) 1999-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_disk plugin 10* This file contains the check_disk plugin
@@ -25,13 +23,11 @@
25* You should have received a copy of the GNU General Public License 23* You should have received a copy of the GNU General Public License
26* along with this program. If not, see <http://www.gnu.org/licenses/>. 24* along with this program. If not, see <http://www.gnu.org/licenses/>.
27* 25*
28* $Id$
29* 26*
30*****************************************************************************/ 27*****************************************************************************/
31 28
32const char *progname = "check_disk"; 29const char *progname = "check_disk";
33const char *program_name = "check_disk"; /* Required for coreutils libs */ 30const char *program_name = "check_disk"; /* Required for coreutils libs */
34const char *revision = "$Revision$";
35const char *copyright = "1999-2008"; 31const char *copyright = "1999-2008";
36const char *email = "nagiosplug-devel@lists.sourceforge.net"; 32const char *email = "nagiosplug-devel@lists.sourceforge.net";
37 33
@@ -787,7 +783,7 @@ process_arguments (int argc, char **argv)
787 group = NULL; 783 group = NULL;
788 break; 784 break;
789 case 'V': /* version */ 785 case 'V': /* version */
790 print_revision (progname, revision); 786 print_revision (progname, NP_VERSION);
791 exit (STATE_OK); 787 exit (STATE_OK);
792 case 'h': /* help */ 788 case 'h': /* help */
793 print_help (); 789 print_help ();
@@ -896,7 +892,7 @@ INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be greate
896void 892void
897print_help (void) 893print_help (void)
898{ 894{
899 print_revision (progname, revision); 895 print_revision (progname, NP_VERSION);
900 896
901 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 897 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
902 printf (COPYRIGHT, copyright, email); 898 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 6bedfefc..bb206a05 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2008 Nagios Plugins Development Team 6* Copyright (c) 2000-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_dns plugin 10* This file contains the check_dns plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_dns"; 32const char *progname = "check_dns";
36const char *revision = "$Revision$";
37const char *copyright = "2000-2008"; 33const char *copyright = "2000-2008";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -363,7 +359,7 @@ process_arguments (int argc, char **argv)
363 print_help (); 359 print_help ();
364 exit (STATE_OK); 360 exit (STATE_OK);
365 case 'V': /* version */ 361 case 'V': /* version */
366 print_revision (progname, revision); 362 print_revision (progname, NP_VERSION);
367 exit (STATE_OK); 363 exit (STATE_OK);
368 case 'v': /* version */ 364 case 'v': /* version */
369 verbose = TRUE; 365 verbose = TRUE;
@@ -446,7 +442,7 @@ validate_arguments ()
446void 442void
447print_help (void) 443print_help (void)
448{ 444{
449 print_revision (progname, revision); 445 print_revision (progname, NP_VERSION);
450 446
451 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 447 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
452 printf (COPYRIGHT, copyright, email); 448 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index ff600a79..8c3f5354 100644
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_dummy plugin 10* This file contains the check_dummy plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_dummy"; 31const char *progname = "check_dummy";
35const char *revision = "$Revision$";
36const char *copyright = "1999-2007"; 32const char *copyright = "1999-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -55,7 +51,7 @@ main (int argc, char **argv)
55 if (argc < 2) 51 if (argc < 2)
56 usage4 (_("Could not parse arguments")); 52 usage4 (_("Could not parse arguments"));
57 else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) { 53 else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) {
58 print_revision (progname, revision); 54 print_revision (progname, NP_VERSION);
59 exit (STATE_OK); 55 exit (STATE_OK);
60 } 56 }
61 else if (strcmp (argv[1], "-h") == 0 || strcmp (argv[1], "--help") == 0) { 57 else if (strcmp (argv[1], "-h") == 0 || strcmp (argv[1], "--help") == 0) {
@@ -100,7 +96,7 @@ main (int argc, char **argv)
100void 96void
101print_help (void) 97print_help (void)
102{ 98{
103 print_revision (progname, revision); 99 print_revision (progname, NP_VERSION);
104 100
105 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 101 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
106 printf (COPYRIGHT, copyright, email); 102 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index aeb2f936..75c7860d 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_disk plugin 10* This file contains the check_disk plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_fping"; 32const char *progname = "check_fping";
36const char *revision = "$Revision$";
37const char *copyright = "2000-2007"; 33const char *copyright = "2000-2007";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -264,7 +260,7 @@ process_arguments (int argc, char **argv)
264 print_help (); 260 print_help ();
265 exit (STATE_OK); 261 exit (STATE_OK);
266 case 'V': /* version */ 262 case 'V': /* version */
267 print_revision (progname, revision); 263 print_revision (progname, NP_VERSION);
268 exit (STATE_OK); 264 exit (STATE_OK);
269 case 'v': /* verbose mode */ 265 case 'v': /* verbose mode */
270 verbose = TRUE; 266 verbose = TRUE;
@@ -368,7 +364,7 @@ void
368print_help (void) 364print_help (void)
369{ 365{
370 366
371 print_revision (progname, revision); 367 print_revision (progname, NP_VERSION);
372 368
373 printf ("Copyright (c) 1999 Didi Rieder <adrieder@sbox.tu-graz.ac.at>\n"); 369 printf ("Copyright (c) 1999 Didi Rieder <adrieder@sbox.tu-graz.ac.at>\n");
374 printf (COPYRIGHT, copyright, email); 370 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_game.c b/plugins/check_game.c
index 2a23b742..235be65c 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2002-2007 Nagios Plugins Development Team 6* Copyright (c) 2002-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_game plugin 10* This file contains the check_game plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_game"; 32const char *progname = "check_game";
36const char *revision = "$Revision$";
37const char *copyright = "2002-2007"; 33const char *copyright = "2002-2007";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -202,7 +198,7 @@ process_arguments (int argc, char **argv)
202 print_help (); 198 print_help ();
203 exit (STATE_OK); 199 exit (STATE_OK);
204 case 'V': /* version */ 200 case 'V': /* version */
205 print_revision (progname, revision); 201 print_revision (progname, NP_VERSION);
206 exit (STATE_OK); 202 exit (STATE_OK);
207 case 'v': /* version */ 203 case 'v': /* version */
208 verbose = TRUE; 204 verbose = TRUE;
@@ -293,7 +289,7 @@ validate_arguments (void)
293void 289void
294print_help (void) 290print_help (void)
295{ 291{
296 print_revision (progname, revision); 292 print_revision (progname, NP_VERSION);
297 293
298 printf ("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n"); 294 printf ("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n");
299 printf (COPYRIGHT, copyright, email); 295 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index c815cc70..add9cc82 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_hpjd plugin 10* This file contains the check_hpjd plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_hpjd"; 32const char *progname = "check_hpjd";
36const char *revision = "$Revision$";
37const char *copyright = "2000-2007"; 33const char *copyright = "2000-2007";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -346,7 +342,7 @@ process_arguments (int argc, char **argv)
346 community = strscpy (community, optarg); 342 community = strscpy (community, optarg);
347 break; 343 break;
348 case 'V': /* version */ 344 case 'V': /* version */
349 print_revision (progname, revision); 345 print_revision (progname, NP_VERSION);
350 exit (STATE_OK); 346 exit (STATE_OK);
351 case 'h': /* help */ 347 case 'h': /* help */
352 print_help (); 348 print_help ();
@@ -387,7 +383,7 @@ validate_arguments (void)
387void 383void
388print_help (void) 384print_help (void)
389{ 385{
390 print_revision (progname, revision); 386 print_revision (progname, NP_VERSION);
391 387
392 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 388 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
393 printf (COPYRIGHT, copyright, email); 389 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 0d499d93..f4a7e5e6 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2008 Nagios Plugins Development Team 6* Copyright (c) 1999-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_http plugin 10* This file contains the check_http plugin
@@ -30,14 +28,12 @@
30* You should have received a copy of the GNU General Public License 28* You should have received a copy of the GNU General Public License
31* along with this program. If not, see <http://www.gnu.org/licenses/>. 29* along with this program. If not, see <http://www.gnu.org/licenses/>.
32* 30*
33* $Id$
34* 31*
35*****************************************************************************/ 32*****************************************************************************/
36 33
37/* splint -I. -I../../plugins -I../../lib/ -I/usr/kerberos/include/ ../../plugins/check_http.c */ 34/* splint -I. -I../../plugins -I../../lib/ -I/usr/kerberos/include/ ../../plugins/check_http.c */
38 35
39const char *progname = "check_http"; 36const char *progname = "check_http";
40const char *revision = "$Revision$";
41const char *copyright = "1999-2008"; 37const char *copyright = "1999-2008";
42const char *email = "nagiosplug-devel@lists.sourceforge.net"; 38const char *email = "nagiosplug-devel@lists.sourceforge.net";
43 39
@@ -144,8 +140,8 @@ main (int argc, char **argv)
144 /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */ 140 /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */
145 server_url = strdup(HTTP_URL); 141 server_url = strdup(HTTP_URL);
146 server_url_length = strlen(server_url); 142 server_url_length = strlen(server_url);
147 asprintf (&user_agent, "User-Agent: check_http/%s (nagios-plugins %s)", 143 asprintf (&user_agent, "User-Agent: check_http/v%s (nagios-plugins %s)",
148 clean_revstring (revision), VERSION); 144 NP_VERSION, VERSION);
149 145
150 /* Parse extra opts if any */ 146 /* Parse extra opts if any */
151 argv=np_extra_opts (&argc, argv, progname); 147 argv=np_extra_opts (&argc, argv, progname);
@@ -242,7 +238,7 @@ process_arguments (int argc, char **argv)
242 exit (STATE_OK); 238 exit (STATE_OK);
243 break; 239 break;
244 case 'V': /* version */ 240 case 'V': /* version */
245 print_revision (progname, revision); 241 print_revision (progname, NP_VERSION);
246 exit (STATE_OK); 242 exit (STATE_OK);
247 break; 243 break;
248 case 't': /* timeout period */ 244 case 't': /* timeout period */
@@ -1271,7 +1267,7 @@ char *perfd_size (int page_len)
1271void 1267void
1272print_help (void) 1268print_help (void)
1273{ 1269{
1274 print_revision (progname, revision); 1270 print_revision (progname, NP_VERSION);
1275 1271
1276 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 1272 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
1277 printf (COPYRIGHT, copyright, email); 1273 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index b0a7ef6c..b0b01890 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -9,8 +9,6 @@
9* Copyright (c) 2000 Robert Dale <rdale@digital-mission.com> 9* Copyright (c) 2000 Robert Dale <rdale@digital-mission.com>
10* Copyright (c) 2000-2007 Nagios Plugins Development Team 10* Copyright (c) 2000-2007 Nagios Plugins Development Team
11* 11*
12* Last Modified: $Date$
13*
14* Description: 12* Description:
15* 13*
16* This file contains the check_ide_smart plugin 14* This file contains the check_ide_smart plugin
@@ -32,12 +30,10 @@
32* You should have received a copy of the GNU General Public License 30* You should have received a copy of the GNU General Public License
33* along with this program. If not, see <http://www.gnu.org/licenses/>. 31* along with this program. If not, see <http://www.gnu.org/licenses/>.
34* 32*
35* $Id$
36* 33*
37*****************************************************************************/ 34*****************************************************************************/
38 35
39const char *progname = "check_ide_smart"; 36const char *progname = "check_ide_smart";
40const char *revision = "$Revision$";
41const char *copyright = "1998-2007"; 37const char *copyright = "1998-2007";
42const char *email = "nagiosplug-devel@lists.sourceforge.net"; 38const char *email = "nagiosplug-devel@lists.sourceforge.net";
43 39
@@ -211,7 +207,7 @@ main (int argc, char *argv[])
211 print_help (); 207 print_help ();
212 return STATE_OK; 208 return STATE_OK;
213 case 'V': 209 case 'V':
214 print_revision (progname, revision); 210 print_revision (progname, NP_VERSION);
215 return STATE_OK; 211 return STATE_OK;
216 default: 212 default:
217 usage5 (); 213 usage5 ();
@@ -481,7 +477,7 @@ smart_read_thresholds (int fd, thresholds_t * thresholds)
481void 477void
482print_help (void) 478print_help (void)
483{ 479{
484 print_revision (progname, revision); 480 print_revision (progname, NP_VERSION);
485 481
486 printf ("Nagios feature - 1999 Robert Dale <rdale@digital-mission.com>\n"); 482 printf ("Nagios feature - 1999 Robert Dale <rdale@digital-mission.com>\n");
487 printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n"); 483 printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n");
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index d0134a09..7ef4509c 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2008 Nagios Plugins Development Team 6* Copyright (c) 2000-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_ldap plugin 10* This file contains the check_ldap plugin
@@ -25,13 +23,11 @@
25* You should have received a copy of the GNU General Public License 23* You should have received a copy of the GNU General Public License
26* along with this program. If not, see <http://www.gnu.org/licenses/>. 24* along with this program. If not, see <http://www.gnu.org/licenses/>.
27* 25*
28* $Id$
29* 26*
30*****************************************************************************/ 27*****************************************************************************/
31 28
32/* progname may be check_ldaps */ 29/* progname may be check_ldaps */
33char *progname = "check_ldap"; 30char *progname = "check_ldap";
34const char *revision = "$Revision$";
35const char *copyright = "2000-2008"; 31const char *copyright = "2000-2008";
36const char *email = "nagiosplug-devel@lists.sourceforge.net"; 32const char *email = "nagiosplug-devel@lists.sourceforge.net";
37 33
@@ -289,7 +285,7 @@ process_arguments (int argc, char **argv)
289 print_help (); 285 print_help ();
290 exit (STATE_OK); 286 exit (STATE_OK);
291 case 'V': /* version */ 287 case 'V': /* version */
292 print_revision (progname, revision); 288 print_revision (progname, NP_VERSION);
293 exit (STATE_OK); 289 exit (STATE_OK);
294 case 't': /* timeout period */ 290 case 't': /* timeout period */
295 if (!is_intnonneg (optarg)) 291 if (!is_intnonneg (optarg))
@@ -390,7 +386,7 @@ print_help (void)
390 char *myport; 386 char *myport;
391 asprintf (&myport, "%d", DEFAULT_PORT); 387 asprintf (&myport, "%d", DEFAULT_PORT);
392 388
393 print_revision (progname, revision); 389 print_revision (progname, NP_VERSION);
394 390
395 printf ("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n"); 391 printf ("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n");
396 printf (COPYRIGHT, copyright, email); 392 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 5ff9a8c0..940d37ec 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_load plugin 10* This file contains the check_load plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_load"; 31const char *progname = "check_load";
35const char *revision = "$Revision$";
36const char *copyright = "1999-2007"; 32const char *copyright = "1999-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -245,7 +241,7 @@ process_arguments (int argc, char **argv)
245 take_into_account_cpus = 1; 241 take_into_account_cpus = 1;
246 break; 242 break;
247 case 'V': /* version */ 243 case 'V': /* version */
248 print_revision (progname, revision); 244 print_revision (progname, NP_VERSION);
249 exit (STATE_OK); 245 exit (STATE_OK);
250 case 'h': /* help */ 246 case 'h': /* help */
251 print_help (); 247 print_help ();
@@ -298,7 +294,7 @@ validate_arguments (void)
298void 294void
299print_help (void) 295print_help (void)
300{ 296{
301 print_revision (progname, revision); 297 print_revision (progname, NP_VERSION);
302 298
303 printf ("Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>\n"); 299 printf ("Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>\n");
304 printf (COPYRIGHT, copyright, email); 300 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index a0bdbeba..550326b1 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_mrtg plugin 10* This file contains the check_mrtg plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_mrtg"; 32const char *progname = "check_mrtg";
36const char *revision = "$Revision$";
37const char *copyright = "1999-2007"; 33const char *copyright = "1999-2007";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -237,7 +233,7 @@ process_arguments (int argc, char **argv)
237 units = optarg; 233 units = optarg;
238 break; 234 break;
239 case 'V': /* version */ 235 case 'V': /* version */
240 print_revision (progname, revision); 236 print_revision (progname, NP_VERSION);
241 exit (STATE_OK); 237 exit (STATE_OK);
242 case 'h': /* help */ 238 case 'h': /* help */
243 print_help (); 239 print_help ();
@@ -317,7 +313,7 @@ validate_arguments (void)
317void 313void
318print_help (void) 314print_help (void)
319{ 315{
320 print_revision (progname, revision); 316 print_revision (progname, NP_VERSION);
321 317
322 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 318 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
323 printf (COPYRIGHT, copyright, email); 319 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index 1911d568..3232f1e7 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_mtrgtraf plugin 10* This file contains the check_mtrgtraf plugin
@@ -28,7 +26,6 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
@@ -36,7 +33,6 @@
36#include "utils.h" 33#include "utils.h"
37 34
38const char *progname = "check_mrtgtraf"; 35const char *progname = "check_mrtgtraf";
39const char *revision = "$Revision$";
40const char *copyright = "1999-2007"; 36const char *copyright = "1999-2007";
41const char *email = "nagiosplug-devel@lists.sourceforge.net"; 37const char *email = "nagiosplug-devel@lists.sourceforge.net";
42 38
@@ -273,7 +269,7 @@ process_arguments (int argc, char **argv)
273 &outgoing_warning_threshold); 269 &outgoing_warning_threshold);
274 break; 270 break;
275 case 'V': /* version */ 271 case 'V': /* version */
276 print_revision (progname, revision); 272 print_revision (progname, NP_VERSION);
277 exit (STATE_OK); 273 exit (STATE_OK);
278 case 'h': /* help */ 274 case 'h': /* help */
279 print_help (); 275 print_help ();
@@ -331,7 +327,7 @@ validate_arguments (void)
331void 327void
332print_help (void) 328print_help (void)
333{ 329{
334 print_revision (progname, revision); 330 print_revision (progname, NP_VERSION);
335 331
336 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 332 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
337 printf (COPYRIGHT, copyright, email); 333 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 77f3b89b..a1a63769 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -7,8 +7,6 @@
7* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) 7* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
8* Copyright (c) 1999-2007 Nagios Plugins Development Team 8* Copyright (c) 1999-2007 Nagios Plugins Development Team
9* 9*
10* Last Modified: $Date$
11*
12* Description: 10* Description:
13* 11*
14* This file contains the check_mysql plugin 12* This file contains the check_mysql plugin
@@ -29,12 +27,10 @@
29* You should have received a copy of the GNU General Public License 27* You should have received a copy of the GNU General Public License
30* along with this program. If not, see <http://www.gnu.org/licenses/>. 28* along with this program. If not, see <http://www.gnu.org/licenses/>.
31* 29*
32* $Id$
33* 30*
34*****************************************************************************/ 31*****************************************************************************/
35 32
36const char *progname = "check_mysql"; 33const char *progname = "check_mysql";
37const char *revision = "$Revision$";
38const char *copyright = "1999-2007"; 34const char *copyright = "1999-2007";
39const char *email = "nagiosplug-devel@lists.sourceforge.net"; 35const char *email = "nagiosplug-devel@lists.sourceforge.net";
40 36
@@ -310,7 +306,7 @@ process_arguments (int argc, char **argv)
310 critical = optarg; 306 critical = optarg;
311 break; 307 break;
312 case 'V': /* version */ 308 case 'V': /* version */
313 print_revision (progname, revision); 309 print_revision (progname, NP_VERSION);
314 exit (STATE_OK); 310 exit (STATE_OK);
315 case 'h': /* help */ 311 case 'h': /* help */
316 print_help (); 312 print_help ();
@@ -377,7 +373,7 @@ print_help (void)
377 char *myport; 373 char *myport;
378 asprintf (&myport, "%d", MYSQL_PORT); 374 asprintf (&myport, "%d", MYSQL_PORT);
379 375
380 print_revision (progname, revision); 376 print_revision (progname, NP_VERSION);
381 377
382 printf (_(COPYRIGHT), copyright, email); 378 printf (_(COPYRIGHT), copyright, email);
383 379
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index a92b8570..802e3456 100644
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -6,8 +6,6 @@
6* Copyright (c) 2006-2007 Nagios Plugins Development Team 6* Copyright (c) 2006-2007 Nagios Plugins Development Team
7* Original code from check_mysql, copyright 1999 Didi Rieder 7* Original code from check_mysql, copyright 1999 Didi Rieder
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains the check_mysql_query plugin 11* This file contains the check_mysql_query plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_mysql_query"; 32const char *progname = "check_mysql_query";
36const char *revision = "$Revision$";
37const char *copyright = "1999-2007"; 33const char *copyright = "1999-2007";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -231,7 +227,7 @@ process_arguments (int argc, char **argv)
231 verbose++; 227 verbose++;
232 break; 228 break;
233 case 'V': /* version */ 229 case 'V': /* version */
234 print_revision (progname, revision); 230 print_revision (progname, NP_VERSION);
235 exit (STATE_OK); 231 exit (STATE_OK);
236 case 'h': /* help */ 232 case 'h': /* help */
237 print_help (); 233 print_help ();
@@ -286,7 +282,7 @@ print_help (void)
286 char *myport; 282 char *myport;
287 asprintf (&myport, "%d", MYSQL_PORT); 283 asprintf (&myport, "%d", MYSQL_PORT);
288 284
289 print_revision (progname, revision); 285 print_revision (progname, NP_VERSION);
290 286
291 printf (_(COPYRIGHT), copyright, email); 287 printf (_(COPYRIGHT), copyright, email);
292 288
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index a2debe21..954ff711 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_nagios plugin 10* This file contains the check_nagios plugin
@@ -31,12 +29,10 @@
31* You should have received a copy of the GNU General Public License 29* You should have received a copy of the GNU General Public License
32* along with this program. If not, see <http://www.gnu.org/licenses/>. 30* along with this program. If not, see <http://www.gnu.org/licenses/>.
33* 31*
34* $Id$
35* 32*
36*****************************************************************************/ 33*****************************************************************************/
37 34
38const char *progname = "check_nagios"; 35const char *progname = "check_nagios";
39const char *revision = "$Revision$";
40const char *copyright = "1999-2007"; 36const char *copyright = "1999-2007";
41const char *email = "nagiosplug-devel@lists.sourceforge.net"; 37const char *email = "nagiosplug-devel@lists.sourceforge.net";
42 38
@@ -240,7 +236,7 @@ process_arguments (int argc, char **argv)
240 print_help (); 236 print_help ();
241 exit (STATE_OK); 237 exit (STATE_OK);
242 case 'V': /* version */ 238 case 'V': /* version */
243 print_revision (progname, revision); 239 print_revision (progname, NP_VERSION);
244 exit (STATE_OK); 240 exit (STATE_OK);
245 case 'F': /* status log */ 241 case 'F': /* status log */
246 status_log = optarg; 242 status_log = optarg;
@@ -278,7 +274,7 @@ process_arguments (int argc, char **argv)
278void 274void
279print_help (void) 275print_help (void)
280{ 276{
281 print_revision (progname, revision); 277 print_revision (progname, NP_VERSION);
282 278
283 printf (_(COPYRIGHT), copyright, email); 279 printf (_(COPYRIGHT), copyright, email);
284 280
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index a0e5c119..4d9157a6 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -6,8 +6,6 @@
6* Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com) 6* Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com)
7* Copyright (c) 2003-2007 Nagios Plugins Development Team 7* Copyright (c) 2003-2007 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains the check_nt plugin 11* This file contains the check_nt plugin
@@ -31,12 +29,10 @@
31* You should have received a copy of the GNU General Public License 29* You should have received a copy of the GNU General Public License
32* along with this program. If not, see <http://www.gnu.org/licenses/>. 30* along with this program. If not, see <http://www.gnu.org/licenses/>.
33* 31*
34* $Id$
35* 32*
36*****************************************************************************/ 33*****************************************************************************/
37 34
38const char *progname = "check_nt"; 35const char *progname = "check_nt";
39const char *revision = "$Revision$";
40const char *copyright = "2000-2007"; 36const char *copyright = "2000-2007";
41const char *email = "nagiosplug-devel@lists.sourceforge.net"; 37const char *email = "nagiosplug-devel@lists.sourceforge.net";
42 38
@@ -517,7 +513,7 @@ int process_arguments(int argc, char **argv){
517 print_help(); 513 print_help();
518 exit(STATE_OK); 514 exit(STATE_OK);
519 case 'V': /* version */ 515 case 'V': /* version */
520 print_revision(progname,revision); 516 print_revision(progname, NP_VERSION);
521 exit(STATE_OK); 517 exit(STATE_OK);
522 case 'H': /* hostname */ 518 case 'H': /* hostname */
523 if (server_address) free(server_address); 519 if (server_address) free(server_address);
@@ -637,7 +633,7 @@ void preparelist(char *string) {
637 633
638void print_help(void) 634void print_help(void)
639{ 635{
640 print_revision(progname,revision); 636 print_revision(progname, NP_VERSION);
641 637
642 printf ("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n"); 638 printf ("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n");
643 printf (COPYRIGHT, copyright, email); 639 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 20ecf64f..ada7f0c3 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -6,8 +6,6 @@
6* Copyright (c) 2006 Sean Finney <seanius@seanius.net> 6* Copyright (c) 2006 Sean Finney <seanius@seanius.net>
7* Copyright (c) 2006-2008 Nagios Plugins Development Team 7* Copyright (c) 2006-2008 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains the check_ntp plugin 11* This file contains the check_ntp plugin
@@ -29,12 +27,10 @@
29* You should have received a copy of the GNU General Public License 27* You should have received a copy of the GNU General Public License
30* along with this program. If not, see <http://www.gnu.org/licenses/>. 28* along with this program. If not, see <http://www.gnu.org/licenses/>.
31* 29*
32* $Id$
33* 30*
34*****************************************************************************/ 31*****************************************************************************/
35 32
36const char *progname = "check_ntp"; 33const char *progname = "check_ntp";
37const char *revision = "$Revision$";
38const char *copyright = "2006-2008"; 34const char *copyright = "2006-2008";
39const char *email = "nagiosplug-devel@lists.sourceforge.net"; 35const char *email = "nagiosplug-devel@lists.sourceforge.net";
40 36
@@ -682,7 +678,7 @@ int process_arguments(int argc, char **argv){
682 exit(STATE_OK); 678 exit(STATE_OK);
683 break; 679 break;
684 case 'V': 680 case 'V':
685 print_revision(progname, revision); 681 print_revision(progname, NP_VERSION);
686 exit(STATE_OK); 682 exit(STATE_OK);
687 break; 683 break;
688 case 'v': 684 case 'v':
@@ -836,7 +832,7 @@ int main(int argc, char *argv[]){
836 832
837 833
838void print_help(void){ 834void print_help(void){
839 print_revision(progname, revision); 835 print_revision(progname, NP_VERSION);
840 836
841 printf ("Copyright (c) 2006 Sean Finney\n"); 837 printf ("Copyright (c) 2006 Sean Finney\n");
842 printf (COPYRIGHT, copyright, email); 838 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 17876dd8..acca17b5 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -6,8 +6,6 @@
6* Copyright (c) 2006 Sean Finney <seanius@seanius.net> 6* Copyright (c) 2006 Sean Finney <seanius@seanius.net>
7* Copyright (c) 2006-2008 Nagios Plugins Development Team 7* Copyright (c) 2006-2008 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains the check_ntp_peer plugin 11* This file contains the check_ntp_peer plugin
@@ -34,12 +32,10 @@
34* You should have received a copy of the GNU General Public License 32* You should have received a copy of the GNU General Public License
35* along with this program. If not, see <http://www.gnu.org/licenses/>. 33* along with this program. If not, see <http://www.gnu.org/licenses/>.
36* 34*
37* $Id$
38* 35*
39*****************************************************************************/ 36*****************************************************************************/
40 37
41const char *progname = "check_ntp_peer"; 38const char *progname = "check_ntp_peer";
42const char *revision = "$Revision$";
43const char *copyright = "2006-2008"; 39const char *copyright = "2006-2008";
44const char *email = "nagiosplug-devel@lists.sourceforge.net"; 40const char *email = "nagiosplug-devel@lists.sourceforge.net";
45 41
@@ -492,7 +488,7 @@ int process_arguments(int argc, char **argv){
492 exit(STATE_OK); 488 exit(STATE_OK);
493 break; 489 break;
494 case 'V': 490 case 'V':
495 print_revision(progname, revision); 491 print_revision(progname, NP_VERSION);
496 exit(STATE_OK); 492 exit(STATE_OK);
497 break; 493 break;
498 case 'v': 494 case 'v':
@@ -671,7 +667,7 @@ int main(int argc, char *argv[]){
671 667
672 668
673void print_help(void){ 669void print_help(void){
674 print_revision(progname, revision); 670 print_revision(progname, NP_VERSION);
675 671
676 printf ("Copyright (c) 2006 Sean Finney\n"); 672 printf ("Copyright (c) 2006 Sean Finney\n");
677 printf (COPYRIGHT, copyright, email); 673 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index a5b122f3..c7c7a754 100644
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -6,8 +6,6 @@
6* Copyright (c) 2006 Sean Finney <seanius@seanius.net> 6* Copyright (c) 2006 Sean Finney <seanius@seanius.net>
7* Copyright (c) 2006-2008 Nagios Plugins Development Team 7* Copyright (c) 2006-2008 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains the check_ntp_time plugin 11* This file contains the check_ntp_time plugin
@@ -33,12 +31,10 @@
33* You should have received a copy of the GNU General Public License 31* You should have received a copy of the GNU General Public License
34* along with this program. If not, see <http://www.gnu.org/licenses/>. 32* along with this program. If not, see <http://www.gnu.org/licenses/>.
35* 33*
36* $Id$
37* 34*
38*****************************************************************************/ 35*****************************************************************************/
39 36
40const char *progname = "check_ntp_time"; 37const char *progname = "check_ntp_time";
41const char *revision = "$Revision$";
42const char *copyright = "2006-2008"; 38const char *copyright = "2006-2008";
43const char *email = "nagiosplug-devel@lists.sourceforge.net"; 39const char *email = "nagiosplug-devel@lists.sourceforge.net";
44 40
@@ -476,7 +472,7 @@ int process_arguments(int argc, char **argv){
476 exit(STATE_OK); 472 exit(STATE_OK);
477 break; 473 break;
478 case 'V': 474 case 'V':
479 print_revision(progname, revision); 475 print_revision(progname, NP_VERSION);
480 exit(STATE_OK); 476 exit(STATE_OK);
481 break; 477 break;
482 case 'v': 478 case 'v':
@@ -594,7 +590,7 @@ int main(int argc, char *argv[]){
594} 590}
595 591
596void print_help(void){ 592void print_help(void){
597 print_revision(progname, revision); 593 print_revision(progname, NP_VERSION);
598 594
599 printf ("Copyright (c) 2006 Sean Finney\n"); 595 printf ("Copyright (c) 2006 Sean Finney\n");
600 printf (COPYRIGHT, copyright, email); 596 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index c0e5ece9..72a47b16 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_nwstat plugin 10* This file contains the check_nwstat plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_nwstat"; 32const char *progname = "check_nwstat";
36const char *revision = "$Revision$";
37const char *copyright = "2000-2007"; 33const char *copyright = "2000-2007";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -1360,7 +1356,7 @@ int process_arguments(int argc, char **argv) {
1360 print_help(); 1356 print_help();
1361 exit(STATE_OK); 1357 exit(STATE_OK);
1362 case 'V': /* version */ 1358 case 'V': /* version */
1363 print_revision(progname, revision); 1359 print_revision(progname, NP_VERSION);
1364 exit(STATE_OK); 1360 exit(STATE_OK);
1365 case 'H': /* hostname */ 1361 case 'H': /* hostname */
1366 server_address=optarg; 1362 server_address=optarg;
@@ -1597,7 +1593,7 @@ void print_help(void)
1597 char *myport; 1593 char *myport;
1598 asprintf (&myport, "%d", PORT); 1594 asprintf (&myport, "%d", PORT);
1599 1595
1600 print_revision (progname, revision); 1596 print_revision (progname, NP_VERSION);
1601 1597
1602 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 1598 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
1603 printf (COPYRIGHT, copyright, email); 1599 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index af04d3b4..1d9ec8cf 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_overcr plugin 10* This file contains the check_overcr plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "check_overcr"; 32const char *progname = "check_overcr";
36const char *revision = "$Revision$";
37const char *copyright = "2000-2007"; 33const char *copyright = "2000-2007";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -346,7 +342,7 @@ process_arguments (int argc, char **argv)
346 print_help (); 342 print_help ();
347 exit (STATE_OK); 343 exit (STATE_OK);
348 case 'V': /* version */ 344 case 'V': /* version */
349 print_revision (progname, revision); 345 print_revision (progname, NP_VERSION);
350 exit (STATE_OK); 346 exit (STATE_OK);
351 case 'H': /* hostname */ 347 case 'H': /* hostname */
352 server_address = optarg; 348 server_address = optarg;
@@ -415,7 +411,7 @@ print_help (void)
415 char *myport; 411 char *myport;
416 asprintf (&myport, "%d", PORT); 412 asprintf (&myport, "%d", PORT);
417 413
418 print_revision (progname, revision); 414 print_revision (progname, NP_VERSION);
419 415
420 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 416 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
421 printf (COPYRIGHT, copyright, email); 417 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 869ef673..abe721bf 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_pgsql plugin 10* This file contains the check_pgsql plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_pgsql"; 31const char *progname = "check_pgsql";
35const char *revision = "$Revision$";
36const char *copyright = "1999-2007"; 32const char *copyright = "1999-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -231,7 +227,7 @@ process_arguments (int argc, char **argv)
231 print_help (); 227 print_help ();
232 exit (STATE_OK); 228 exit (STATE_OK);
233 case 'V': /* version */ 229 case 'V': /* version */
234 print_revision (progname, revision); 230 print_revision (progname, NP_VERSION);
235 exit (STATE_OK); 231 exit (STATE_OK);
236 case 't': /* timeout period */ 232 case 't': /* timeout period */
237 if (!is_integer (optarg)) 233 if (!is_integer (optarg))
@@ -404,7 +400,7 @@ print_help (void)
404 400
405 asprintf (&myport, "%d", DEFAULT_PORT); 401 asprintf (&myport, "%d", DEFAULT_PORT);
406 402
407 print_revision (progname, revision); 403 print_revision (progname, NP_VERSION);
408 404
409 printf (COPYRIGHT, copyright, email); 405 printf (COPYRIGHT, copyright, email);
410 406
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index c457ad64..8c4c0e64 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_ping plugin 10* This file contains the check_ping plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_ping"; 31const char *progname = "check_ping";
35const char *revision = "$Revision$";
36const char *copyright = "2000-2007"; 32const char *copyright = "2000-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -231,7 +227,7 @@ process_arguments (int argc, char **argv)
231 exit (STATE_OK); 227 exit (STATE_OK);
232 break; 228 break;
233 case 'V': /* version */ 229 case 'V': /* version */
234 print_revision (progname, revision); 230 print_revision (progname, NP_VERSION);
235 exit (STATE_OK); 231 exit (STATE_OK);
236 break; 232 break;
237 case 't': /* timeout period */ 233 case 't': /* timeout period */
@@ -555,7 +551,7 @@ error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)
555void 551void
556print_help (void) 552print_help (void)
557{ 553{
558 print_revision (progname, revision); 554 print_revision (progname, NP_VERSION);
559 555
560 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 556 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
561 printf (COPYRIGHT, copyright, email); 557 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 4aaeddb2..4c729501 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2008 Nagios Plugins Development Team 6* Copyright (c) 2000-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_procs plugin 10* This file contains the check_procs plugin
@@ -30,13 +28,11 @@
30* You should have received a copy of the GNU General Public License 28* You should have received a copy of the GNU General Public License
31* along with this program. If not, see <http://www.gnu.org/licenses/>. 29* along with this program. If not, see <http://www.gnu.org/licenses/>.
32* 30*
33* $Id$
34* 31*
35*****************************************************************************/ 32*****************************************************************************/
36 33
37const char *progname = "check_procs"; 34const char *progname = "check_procs";
38const char *program_name = "check_procs"; /* Required for coreutils libs */ 35const char *program_name = "check_procs"; /* Required for coreutils libs */
39const char *revision = "$Revision$";
40const char *copyright = "2000-2008"; 36const char *copyright = "2000-2008";
41const char *email = "nagiosplug-devel@lists.sourceforge.net"; 37const char *email = "nagiosplug-devel@lists.sourceforge.net";
42 38
@@ -361,7 +357,7 @@ process_arguments (int argc, char **argv)
361 print_help (); 357 print_help ();
362 exit (STATE_OK); 358 exit (STATE_OK);
363 case 'V': /* version */ 359 case 'V': /* version */
364 print_revision (progname, revision); 360 print_revision (progname, NP_VERSION);
365 exit (STATE_OK); 361 exit (STATE_OK);
366 case 't': /* timeout period */ 362 case 't': /* timeout period */
367 if (!is_integer (optarg)) 363 if (!is_integer (optarg))
@@ -674,7 +670,7 @@ convert_to_seconds(char *etime) {
674void 670void
675print_help (void) 671print_help (void)
676{ 672{
677 print_revision (progname, revision); 673 print_revision (progname, NP_VERSION);
678 674
679 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 675 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
680 printf (COPYRIGHT, copyright, email); 676 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index e0b0e2c2..98f6bf98 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2008 Nagios Plugins Development Team 6* Copyright (c) 1999-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_radius plugin 10* This file contains the check_radius plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_radius"; 31const char *progname = "check_radius";
35const char *revision = "$Revision$";
36const char *copyright = "2000-2008"; 32const char *copyright = "2000-2008";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -239,7 +235,7 @@ process_arguments (int argc, char **argv)
239 print_help (); 235 print_help ();
240 exit (OK); 236 exit (OK);
241 case 'V': /* version */ 237 case 'V': /* version */
242 print_revision (progname, revision); 238 print_revision (progname, NP_VERSION);
243 exit (OK); 239 exit (OK);
244 case 'v': /* verbose mode */ 240 case 'v': /* verbose mode */
245 verbose = TRUE; 241 verbose = TRUE;
@@ -312,7 +308,7 @@ print_help (void)
312 char *myport; 308 char *myport;
313 asprintf (&myport, "%d", PW_AUTH_UDP_PORT); 309 asprintf (&myport, "%d", PW_AUTH_UDP_PORT);
314 310
315 print_revision (progname, revision); 311 print_revision (progname, NP_VERSION);
316 312
317 printf ("Copyright (c) 1999 Robert August Vincent II\n"); 313 printf ("Copyright (c) 1999 Robert August Vincent II\n");
318 printf (COPYRIGHT, copyright, email); 314 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_real.c b/plugins/check_real.c
index d333c2a3..cbc3103c 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_real plugin 10* This file contains the check_real plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_real"; 31const char *progname = "check_real";
35const char *revision = "$Revision$";
36const char *copyright = "2000-2007"; 32const char *copyright = "2000-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -361,7 +357,7 @@ process_arguments (int argc, char **argv)
361 } 357 }
362 break; 358 break;
363 case 'V': /* version */ 359 case 'V': /* version */
364 print_revision (progname, revision); 360 print_revision (progname, NP_VERSION);
365 exit (STATE_OK); 361 exit (STATE_OK);
366 case 'h': /* help */ 362 case 'h': /* help */
367 print_help (); 363 print_help ();
@@ -409,7 +405,7 @@ print_help (void)
409 char *myport; 405 char *myport;
410 asprintf (&myport, "%d", PORT); 406 asprintf (&myport, "%d", PORT);
411 407
412 print_revision (progname, revision); 408 print_revision (progname, NP_VERSION);
413 409
414 printf ("Copyright (c) 1999 Pedro Leite <leite@cic.ua.pt>\n"); 410 printf ("Copyright (c) 1999 Pedro Leite <leite@cic.ua.pt>\n");
415 printf (COPYRIGHT, copyright, email); 411 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 4986fe65..6040aa12 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_smtp plugin 10* This file contains the check_smtp plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_smtp"; 31const char *progname = "check_smtp";
35const char *revision = "$Revision$";
36const char *copyright = "2000-2007"; 32const char *copyright = "2000-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -620,7 +616,7 @@ process_arguments (int argc, char **argv)
620#endif 616#endif
621 break; 617 break;
622 case 'V': /* version */ 618 case 'V': /* version */
623 print_revision (progname, revision); 619 print_revision (progname, NP_VERSION);
624 exit (STATE_OK); 620 exit (STATE_OK);
625 case 'h': /* help */ 621 case 'h': /* help */
626 print_help (); 622 print_help ();
@@ -762,7 +758,7 @@ print_help (void)
762 char *myport; 758 char *myport;
763 asprintf (&myport, "%d", SMTP_PORT); 759 asprintf (&myport, "%d", SMTP_PORT);
764 760
765 print_revision (progname, revision); 761 print_revision (progname, NP_VERSION);
766 762
767 printf ("Copyright (c) 1999-2001 Ethan Galstad <nagios@nagios.org>\n"); 763 printf ("Copyright (c) 1999-2001 Ethan Galstad <nagios@nagios.org>\n");
768 printf (COPYRIGHT, copyright, email); 764 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 0aafd951..1c92534c 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_snmp plugin 10* This file contains the check_snmp plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_snmp"; 31const char *progname = "check_snmp";
35const char *revision = "$Revision$";
36const char *copyright = "1999-2007"; 32const char *copyright = "1999-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -475,7 +471,7 @@ process_arguments (int argc, char **argv)
475 print_help (); 471 print_help ();
476 exit (STATE_OK); 472 exit (STATE_OK);
477 case 'V': /* version */ 473 case 'V': /* version */
478 print_revision (progname, revision); 474 print_revision (progname, NP_VERSION);
479 exit (STATE_OK); 475 exit (STATE_OK);
480 case 'v': /* verbose */ 476 case 'v': /* verbose */
481 verbose = TRUE; 477 verbose = TRUE;
@@ -928,7 +924,7 @@ nextarg (char *str)
928void 924void
929print_help (void) 925print_help (void)
930{ 926{
931 print_revision (progname, revision); 927 print_revision (progname, NP_VERSION);
932 928
933 printf (COPYRIGHT, copyright, email); 929 printf (COPYRIGHT, copyright, email);
934 930
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 2e16e651..04cc4d97 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_ssh plugin 10* This file contains the check_ssh plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_ssh"; 31const char *progname = "check_ssh";
35const char *revision = "$Revision$";
36const char *copyright = "2000-2007"; 32const char *copyright = "2000-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -129,7 +125,7 @@ process_arguments (int argc, char **argv)
129 case '?': /* help */ 125 case '?': /* help */
130 usage5 (); 126 usage5 ();
131 case 'V': /* version */ 127 case 'V': /* version */
132 print_revision (progname, revision); 128 print_revision (progname, NP_VERSION);
133 exit (STATE_OK); 129 exit (STATE_OK);
134 case 'h': /* help */ 130 case 'h': /* help */
135 print_help (); 131 print_help ();
@@ -218,9 +214,7 @@ ssh_connect (char *haddr, int hport, char *remote_version)
218 char *buffer = NULL; 214 char *buffer = NULL;
219 char *ssh_proto = NULL; 215 char *ssh_proto = NULL;
220 char *ssh_server = NULL; 216 char *ssh_server = NULL;
221 char rev_no[20]; 217 static char *rev_no = VERSION;
222
223 sscanf ("$Revision$", "$Revision: %[0123456789.]", rev_no);
224 218
225 result = my_tcp_connect (haddr, hport, &sd); 219 result = my_tcp_connect (haddr, hport, &sd);
226 220
@@ -272,7 +266,7 @@ print_help (void)
272 char *myport; 266 char *myport;
273 asprintf (&myport, "%d", SSH_DFL_PORT); 267 asprintf (&myport, "%d", SSH_DFL_PORT);
274 268
275 print_revision (progname, revision); 269 print_revision (progname, NP_VERSION);
276 270
277 printf ("Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n"); 271 printf ("Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n");
278 printf (COPYRIGHT, copyright, email); 272 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index f0269633..be20ca32 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -6,8 +6,6 @@
6* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) 6* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
7* Copyright (c) 2000-2007 Nagios Plugins Development Team 7* Copyright (c) 2000-2007 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains the check_disk plugin 11* This file contains the check_disk plugin
@@ -26,12 +24,10 @@
26* You should have received a copy of the GNU General Public License 24* You should have received a copy of the GNU General Public License
27* along with this program. If not, see <http://www.gnu.org/licenses/>. 25* along with this program. If not, see <http://www.gnu.org/licenses/>.
28* 26*
29* $Id$
30* 27*
31*****************************************************************************/ 28*****************************************************************************/
32 29
33const char *progname = "check_swap"; 30const char *progname = "check_swap";
34const char *revision = "$Revision$";
35const char *copyright = "2000-2007"; 31const char *copyright = "2000-2007";
36const char *email = "nagiosplug-devel@lists.sourceforge.net"; 32const char *email = "nagiosplug-devel@lists.sourceforge.net";
37 33
@@ -463,7 +459,7 @@ process_arguments (int argc, char **argv)
463 verbose++; 459 verbose++;
464 break; 460 break;
465 case 'V': /* version */ 461 case 'V': /* version */
466 print_revision (progname, revision); 462 print_revision (progname, NP_VERSION);
467 exit (STATE_OK); 463 exit (STATE_OK);
468 case 'h': /* help */ 464 case 'h': /* help */
469 print_help (); 465 print_help ();
@@ -522,7 +518,7 @@ validate_arguments (void)
522void 518void
523print_help (void) 519print_help (void)
524{ 520{
525 print_revision (progname, revision); 521 print_revision (progname, NP_VERSION);
526 522
527 printf (_(COPYRIGHT), copyright, email); 523 printf (_(COPYRIGHT), copyright, email);
528 524
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 0d81497e..31659f18 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2008 Nagios Plugins Development Team 6* Copyright (c) 1999-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_tcp plugin 10* This file contains the check_tcp plugin
@@ -31,7 +29,6 @@
31 29
32/* progname "check_tcp" changes depending on symlink called */ 30/* progname "check_tcp" changes depending on symlink called */
33char *progname; 31char *progname;
34const char *revision = "$Revision$";
35const char *copyright = "1999-2008"; 32const char *copyright = "1999-2008";
36const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
37 34
@@ -451,7 +448,7 @@ process_arguments (int argc, char **argv)
451 print_help (); 448 print_help ();
452 exit (STATE_OK); 449 exit (STATE_OK);
453 case 'V': /* version */ 450 case 'V': /* version */
454 print_revision (progname, revision); 451 print_revision (progname, NP_VERSION);
455 exit (STATE_OK); 452 exit (STATE_OK);
456 case 'v': /* verbose mode */ 453 case 'v': /* verbose mode */
457 flags |= FLAG_VERBOSE; 454 flags |= FLAG_VERBOSE;
@@ -592,7 +589,7 @@ process_arguments (int argc, char **argv)
592void 589void
593print_help (void) 590print_help (void)
594{ 591{
595 print_revision (progname, revision); 592 print_revision (progname, NP_VERSION);
596 593
597 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"); 594 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
598 printf (COPYRIGHT, copyright, email); 595 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_time.c b/plugins/check_time.c
index f9a292c0..ee938168 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 1999-2007 Nagios Plugins Development Team 6* Copyright (c) 1999-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_time plugin 10* This file contains the check_time plugin
@@ -27,12 +25,10 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
34const char *progname = "check_time"; 31const char *progname = "check_time";
35const char *revision = "$Revision$";
36const char *copyright = "1999-2007"; 32const char *copyright = "1999-2007";
37const char *email = "nagiosplug-devel@lists.sourceforge.net"; 33const char *email = "nagiosplug-devel@lists.sourceforge.net";
38 34
@@ -237,7 +233,7 @@ process_arguments (int argc, char **argv)
237 print_help (); 233 print_help ();
238 exit (STATE_OK); 234 exit (STATE_OK);
239 case 'V': /* version */ 235 case 'V': /* version */
240 print_revision (progname, revision); 236 print_revision (progname, NP_VERSION);
241 exit (STATE_OK); 237 exit (STATE_OK);
242 case 'H': /* hostname */ 238 case 'H': /* hostname */
243 if (is_host (optarg) == FALSE) 239 if (is_host (optarg) == FALSE)
@@ -335,7 +331,7 @@ print_help (void)
335 char *myport; 331 char *myport;
336 asprintf (&myport, "%d", TIME_PORT); 332 asprintf (&myport, "%d", TIME_PORT);
337 333
338 print_revision (progname, revision); 334 print_revision (progname, NP_VERSION);
339 335
340 printf ("Copyright (c) 1999 Ethan Galstad\n"); 336 printf ("Copyright (c) 1999 Ethan Galstad\n");
341 printf (COPYRIGHT, copyright, email); 337 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index a498d203..7311ca23 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -8,8 +8,6 @@
8* 2004 Arnaud Quette <arnaud.quette@mgeups.com> 8* 2004 Arnaud Quette <arnaud.quette@mgeups.com>
9* Copyright (c) 2002-2007 Nagios Plugins Development Team 9* Copyright (c) 2002-2007 Nagios Plugins Development Team
10* 10*
11* Last Modified: $Date$
12*
13* Description: 11* Description:
14* 12*
15* This file contains Network UPS Tools plugin for Nagios 13* This file contains Network UPS Tools plugin for Nagios
@@ -31,12 +29,10 @@
31* You should have received a copy of the GNU General Public License 29* You should have received a copy of the GNU General Public License
32* along with this program. If not, see <http://www.gnu.org/licenses/>. 30* along with this program. If not, see <http://www.gnu.org/licenses/>.
33* 31*
34* $Id$
35* 32*
36*****************************************************************************/ 33*****************************************************************************/
37 34
38const char *progname = "check_ups"; 35const char *progname = "check_ups";
39const char *revision = "$Revision$";
40const char *copyright = "2000-2007"; 36const char *copyright = "2000-2007";
41const char *email = "nagiosplug-devel@lists.sourceforge.net"; 37const char *email = "nagiosplug-devel@lists.sourceforge.net";
42 38
@@ -561,7 +557,7 @@ process_arguments (int argc, char **argv)
561 } 557 }
562 break; 558 break;
563 case 'V': /* version */ 559 case 'V': /* version */
564 print_revision (progname, revision); 560 print_revision (progname, NP_VERSION);
565 exit (STATE_OK); 561 exit (STATE_OK);
566 case 'h': /* help */ 562 case 'h': /* help */
567 print_help (); 563 print_help ();
@@ -601,7 +597,7 @@ print_help (void)
601 char *myport; 597 char *myport;
602 asprintf (&myport, "%d", PORT); 598 asprintf (&myport, "%d", PORT);
603 599
604 print_revision (progname, revision); 600 print_revision (progname, NP_VERSION);
605 601
606 printf ("Copyright (c) 2000 Tom Shields\n"); 602 printf ("Copyright (c) 2000 Tom Shields\n");
607 printf ("Copyright (c) 2004 Alain Richard <alain.richard@equation.fr>\n"); 603 printf ("Copyright (c) 2004 Alain Richard <alain.richard@equation.fr>\n");
diff --git a/plugins/check_users.c b/plugins/check_users.c
index 4e7e9a29..1bd2c8b2 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the check_users plugin 10* This file contains the check_users plugin
@@ -29,12 +27,10 @@
29* You should have received a copy of the GNU General Public License 27* You should have received a copy of the GNU General Public License
30* along with this program. If not, see <http://www.gnu.org/licenses/>. 28* along with this program. If not, see <http://www.gnu.org/licenses/>.
31* 29*
32* $Id$
33* 30*
34*****************************************************************************/ 31*****************************************************************************/
35 32
36const char *progname = "check_users"; 33const char *progname = "check_users";
37const char *revision = "$Revision$";
38const char *copyright = "2000-2007"; 34const char *copyright = "2000-2007";
39const char *email = "nagiosplug-devel@lists.sourceforge.net"; 35const char *email = "nagiosplug-devel@lists.sourceforge.net";
40 36
@@ -163,7 +159,7 @@ process_arguments (int argc, char **argv)
163 print_help (); 159 print_help ();
164 exit (STATE_OK); 160 exit (STATE_OK);
165 case 'V': /* version */ 161 case 'V': /* version */
166 print_revision (progname, revision); 162 print_revision (progname, NP_VERSION);
167 exit (STATE_OK); 163 exit (STATE_OK);
168 case 'c': /* critical */ 164 case 'c': /* critical */
169 if (!is_intnonneg (optarg)) 165 if (!is_intnonneg (optarg))
@@ -203,7 +199,7 @@ process_arguments (int argc, char **argv)
203void 199void
204print_help (void) 200print_help (void)
205{ 201{
206 print_revision (progname, revision); 202 print_revision (progname, NP_VERSION);
207 203
208 printf ("Copyright (c) 1999 Ethan Galstad\n"); 204 printf ("Copyright (c) 1999 Ethan Galstad\n");
209 printf (COPYRIGHT, copyright, email); 205 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/common.h b/plugins/common.h
index 0711dbf1..dfc09416 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -6,8 +6,6 @@
6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) 6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
7* Copyright (c) 2003-2007 Nagios Plugins Development Team 7* Copyright (c) 2003-2007 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains common include files and defines used in many of 11* This file contains common include files and defines used in many of
@@ -27,7 +25,6 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
diff --git a/plugins/negate.c b/plugins/negate.c
index 40ff1912..0808b685 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2002-2008 Nagios Plugins Development Team 6* Copyright (c) 2002-2008 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the negate plugin 10* This file contains the negate plugin
@@ -28,12 +26,10 @@
28* You should have received a copy of the GNU General Public License 26* You should have received a copy of the GNU General Public License
29* along with this program. If not, see <http://www.gnu.org/licenses/>. 27* along with this program. If not, see <http://www.gnu.org/licenses/>.
30* 28*
31* $Id$
32* 29*
33*****************************************************************************/ 30*****************************************************************************/
34 31
35const char *progname = "negate"; 32const char *progname = "negate";
36const char *revision = "$Revision$";
37const char *copyright = "2002-2008"; 33const char *copyright = "2002-2008";
38const char *email = "nagiosplug-devel@lists.sourceforge.net"; 34const char *email = "nagiosplug-devel@lists.sourceforge.net";
39 35
@@ -155,7 +151,7 @@ process_arguments (int argc, char **argv)
155 exit (EXIT_SUCCESS); 151 exit (EXIT_SUCCESS);
156 break; 152 break;
157 case 'V': /* version */ 153 case 'V': /* version */
158 print_revision (progname, revision); 154 print_revision (progname, NP_VERSION);
159 exit (EXIT_SUCCESS); 155 exit (EXIT_SUCCESS);
160 case 't': /* timeout period */ 156 case 't': /* timeout period */
161 if (!is_integer (optarg)) 157 if (!is_integer (optarg))
@@ -233,7 +229,7 @@ translate_state (char *state_text)
233void 229void
234print_help (void) 230print_help (void)
235{ 231{
236 print_revision (progname, revision); 232 print_revision (progname, NP_VERSION);
237 233
238 printf (COPYRIGHT, copyright, email); 234 printf (COPYRIGHT, copyright, email);
239 235
diff --git a/plugins/netutils.c b/plugins/netutils.c
index 1a5547e9..6082cae0 100644
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -6,8 +6,6 @@
6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) 6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
7* Copyright (c) 2003-2008 Nagios Plugins Development Team 7* Copyright (c) 2003-2008 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains commons functions used in many of the plugins. 11* This file contains commons functions used in many of the plugins.
@@ -26,7 +24,6 @@
26* You should have received a copy of the GNU General Public License 24* You should have received a copy of the GNU General Public License
27* along with this program. If not, see <http://www.gnu.org/licenses/>. 25* along with this program. If not, see <http://www.gnu.org/licenses/>.
28* 26*
29* $Id$
30* 27*
31*****************************************************************************/ 28*****************************************************************************/
32 29
diff --git a/plugins/netutils.h b/plugins/netutils.h
index 4c0a563c..85c92fc0 100644
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -6,8 +6,6 @@
6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) 6* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
7* Copyright (c) 2003-2007 Nagios Plugins Development Team 7* Copyright (c) 2003-2007 Nagios Plugins Development Team
8* 8*
9* Last Modified: $Date$
10*
11* Description: 9* Description:
12* 10*
13* This file contains common include files and function definitions 11* This file contains common include files and function definitions
@@ -27,7 +25,6 @@
27* You should have received a copy of the GNU General Public License 25* You should have received a copy of the GNU General Public License
28* along with this program. If not, see <http://www.gnu.org/licenses/>. 26* along with this program. If not, see <http://www.gnu.org/licenses/>.
29* 27*
30* $Id$
31* 28*
32*****************************************************************************/ 29*****************************************************************************/
33 30
diff --git a/plugins/popen.c b/plugins/popen.c
index a27aecc9..716bd524 100644
--- a/plugins/popen.c
+++ b/plugins/popen.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2005-2007 Nagios Plugins Development Team 6* Copyright (c) 2005-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* A safe alternative to popen 10* A safe alternative to popen
@@ -37,7 +35,6 @@
37* You should have received a copy of the GNU General Public License 35* You should have received a copy of the GNU General Public License
38* along with this program. If not, see <http://www.gnu.org/licenses/>. 36* along with this program. If not, see <http://www.gnu.org/licenses/>.
39* 37*
40* $Id$
41* 38*
42*****************************************************************************/ 39*****************************************************************************/
43 40
diff --git a/plugins/popen.h b/plugins/popen.h
index 8b09edd9..fc7e78e2 100644
--- a/plugins/popen.h
+++ b/plugins/popen.h
@@ -1,6 +1,5 @@
1/****************************************************************************** 1/******************************************************************************
2* 2*
3* $Id$
4* 3*
5*****************************************************************************/ 4*****************************************************************************/
6 5
diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index 8c52b5c9..7574b121 100644
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2005-2006 Nagios Plugins Development Team 6* Copyright (c) 2005-2006 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description : 8* Description :
11* 9*
12* A simple interface to executing programs from other programs, using an 10* A simple interface to executing programs from other programs, using an
@@ -35,7 +33,6 @@
35* You should have received a copy of the GNU General Public License 33* You should have received a copy of the GNU General Public License
36* along with this program. If not, see <http://www.gnu.org/licenses/>. 34* along with this program. If not, see <http://www.gnu.org/licenses/>.
37* 35*
38* $Id$
39* 36*
40*****************************************************************************/ 37*****************************************************************************/
41 38
diff --git a/plugins/runcmd.h b/plugins/runcmd.h
index a048def3..211dee2c 100644
--- a/plugins/runcmd.h
+++ b/plugins/runcmd.h
@@ -18,7 +18,6 @@
18* You should have received a copy of the GNU General Public License 18* You should have received a copy of the GNU General Public License
19* along with this program. If not, see <http://www.gnu.org/licenses/>. 19* along with this program. If not, see <http://www.gnu.org/licenses/>.
20* 20*
21* $Id$
22* 21*
23*****************************************************************************/ 22*****************************************************************************/
24 23
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 3d4f9016..f5035e23 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2005-2007 Nagios Plugins Development Team 6* Copyright (c) 2005-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains common functions for plugins that require SSL. 10* This file contains common functions for plugins that require SSL.
@@ -25,7 +23,6 @@
25* You should have received a copy of the GNU General Public License 23* You should have received a copy of the GNU General Public License
26* along with this program. If not, see <http://www.gnu.org/licenses/>. 24* along with this program. If not, see <http://www.gnu.org/licenses/>.
27* 25*
28* $Id$
29* 26*
30*****************************************************************************/ 27*****************************************************************************/
31 28
diff --git a/plugins/t/check_by_ssh.t b/plugins/t/check_by_ssh.t
index b421d334..5f2c534d 100644
--- a/plugins/t/check_by_ssh.t
+++ b/plugins/t/check_by_ssh.t
@@ -2,7 +2,6 @@
2# 2#
3# check_by_ssh tests 3# check_by_ssh tests
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_cluster.t b/plugins/t/check_cluster.t
index f3e78b83..4736f067 100644
--- a/plugins/t/check_cluster.t
+++ b/plugins/t/check_cluster.t
@@ -2,7 +2,6 @@
2# 2#
3# check_cluster tests 3# check_cluster tests
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_dig.t b/plugins/t/check_dig.t
index 937eec33..323859e8 100644
--- a/plugins/t/check_dig.t
+++ b/plugins/t/check_dig.t
@@ -2,7 +2,6 @@
2# 2#
3# Domain Name Server (DNS) Tests via check_dig 3# Domain Name Server (DNS) Tests via check_dig
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t
index 99c434ac..45c6a613 100644
--- a/plugins/t/check_disk.t
+++ b/plugins/t/check_disk.t
@@ -2,7 +2,6 @@
2# 2#
3# Disk Space Tests via check_disk 3# Disk Space Tests via check_disk
4# 4#
5# $Id$
6# 5#
7 6
8# TODO: Add in tests for perf data. Need to beef up Nagios::Plugin::Performance to cater for max, min, etc 7# TODO: Add in tests for perf data. Need to beef up Nagios::Plugin::Performance to cater for max, min, etc
diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t
index fc89e6e5..64aaf0ce 100644
--- a/plugins/t/check_dns.t
+++ b/plugins/t/check_dns.t
@@ -2,7 +2,6 @@
2# 2#
3# Domain Name Server (DNS) Tests via check_dns 3# Domain Name Server (DNS) Tests via check_dns
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_dummy.t b/plugins/t/check_dummy.t
index aaa7a410..15fc1578 100644
--- a/plugins/t/check_dummy.t
+++ b/plugins/t/check_dummy.t
@@ -2,7 +2,6 @@
2# 2#
3# check_dummy tests 3# check_dummy tests
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_fping.t b/plugins/t/check_fping.t
index c59d59e0..45a9be8a 100644
--- a/plugins/t/check_fping.t
+++ b/plugins/t/check_fping.t
@@ -2,7 +2,6 @@
2# 2#
3# FPing Tests via check_fping 3# FPing Tests via check_fping
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_ftp.t b/plugins/t/check_ftp.t
index 47a73e13..de6831ba 100644
--- a/plugins/t/check_ftp.t
+++ b/plugins/t/check_ftp.t
@@ -2,7 +2,6 @@
2# 2#
3# File Transfer Protocol (FTP) Test via check_ftp 3# File Transfer Protocol (FTP) Test via check_ftp
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_hpjd.t b/plugins/t/check_hpjd.t
index 2fe56000..10ded54a 100644
--- a/plugins/t/check_hpjd.t
+++ b/plugins/t/check_hpjd.t
@@ -2,7 +2,6 @@
2# 2#
3# HP JetDirect Test via check_hpjd 3# HP JetDirect Test via check_hpjd
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t
index c98b4ac3..c43a64a9 100644
--- a/plugins/t/check_http.t
+++ b/plugins/t/check_http.t
@@ -2,7 +2,6 @@
2# 2#
3# HyperText Transfer Protocol (HTTP) Test via check_http 3# HyperText Transfer Protocol (HTTP) Test via check_http
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_imap.t b/plugins/t/check_imap.t
index fa957d1b..9c6eae1f 100644
--- a/plugins/t/check_imap.t
+++ b/plugins/t/check_imap.t
@@ -2,7 +2,6 @@
2# 2#
3# Internet Mail Access Protocol (IMAP) Server Tests via check_imap 3# Internet Mail Access Protocol (IMAP) Server Tests via check_imap
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_jabber.t b/plugins/t/check_jabber.t
index 6a3d4ef7..1aaf8125 100644
--- a/plugins/t/check_jabber.t
+++ b/plugins/t/check_jabber.t
@@ -2,7 +2,6 @@
2# 2#
3# Jabber Server Tests via check_jabber 3# Jabber Server Tests via check_jabber
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_load.t b/plugins/t/check_load.t
index 8987b84c..55f6f752 100644
--- a/plugins/t/check_load.t
+++ b/plugins/t/check_load.t
@@ -2,7 +2,6 @@
2# 2#
3# Load Average Tests via check_load 3# Load Average Tests via check_load
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_mysql.t b/plugins/t/check_mysql.t
index e8bccf1c..d9716458 100644
--- a/plugins/t/check_mysql.t
+++ b/plugins/t/check_mysql.t
@@ -2,7 +2,6 @@
2# 2#
3# MySQL Database Server Tests via check_mysql 3# MySQL Database Server Tests via check_mysql
4# 4#
5# $Id$
6# 5#
7# 6#
8# These are the database permissions required for this test: 7# These are the database permissions required for this test:
diff --git a/plugins/t/check_mysql_query.t b/plugins/t/check_mysql_query.t
index f78f07b8..407af881 100644
--- a/plugins/t/check_mysql_query.t
+++ b/plugins/t/check_mysql_query.t
@@ -2,7 +2,6 @@
2# 2#
3# MySQL Database Server Tests via check_mysql 3# MySQL Database Server Tests via check_mysql
4# 4#
5# $Id$
6# 5#
7# 6#
8# These are the database permissions required for this test: 7# These are the database permissions required for this test:
diff --git a/plugins/t/check_nagios.t b/plugins/t/check_nagios.t
index d5d48465..81fc24d8 100644
--- a/plugins/t/check_nagios.t
+++ b/plugins/t/check_nagios.t
@@ -2,7 +2,6 @@
2# 2#
3# check_nagios tests 3# check_nagios tests
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_ntp.t b/plugins/t/check_ntp.t
index 4f86ab97..b71c8631 100644
--- a/plugins/t/check_ntp.t
+++ b/plugins/t/check_ntp.t
@@ -2,7 +2,6 @@
2# 2#
3# Testing NTP 3# Testing NTP
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_ping.t b/plugins/t/check_ping.t
index c9a09041..e1c119e4 100644
--- a/plugins/t/check_ping.t
+++ b/plugins/t/check_ping.t
@@ -2,7 +2,6 @@
2# 2#
3# Ping Response Tests via check_ping 3# Ping Response Tests via check_ping
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_pop.t b/plugins/t/check_pop.t
index b78291da..62352fd1 100644
--- a/plugins/t/check_pop.t
+++ b/plugins/t/check_pop.t
@@ -2,7 +2,6 @@
2# 2#
3# Post Office Protocol (POP) Server Tests via check_pop 3# Post Office Protocol (POP) Server Tests via check_pop
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_procs.t b/plugins/t/check_procs.t
index 2a41ac5c..fc32952d 100644
--- a/plugins/t/check_procs.t
+++ b/plugins/t/check_procs.t
@@ -2,7 +2,6 @@
2# 2#
3# Process Tests via check_procs 3# Process Tests via check_procs
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_smtp.t b/plugins/t/check_smtp.t
index ff58bc0b..aa6dae45 100644
--- a/plugins/t/check_smtp.t
+++ b/plugins/t/check_smtp.t
@@ -2,7 +2,6 @@
2# 2#
3# Simple Mail Transfer Protocol (SMTP) Test via check_smtp 3# Simple Mail Transfer Protocol (SMTP) Test via check_smtp
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_snmp.t b/plugins/t/check_snmp.t
index 4e831397..369314ec 100644
--- a/plugins/t/check_snmp.t
+++ b/plugins/t/check_snmp.t
@@ -2,7 +2,6 @@
2# 2#
3# Simple Network Management Protocol (SNMP) Test via check_snmp 3# Simple Network Management Protocol (SNMP) Test via check_snmp
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_swap.t b/plugins/t/check_swap.t
index 435730fc..e44adc90 100644
--- a/plugins/t/check_swap.t
+++ b/plugins/t/check_swap.t
@@ -2,7 +2,6 @@
2# 2#
3# Swap Space Tests via check_swap 3# Swap Space Tests via check_swap
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_tcp.t b/plugins/t/check_tcp.t
index 2914350e..fd2b5dd9 100644
--- a/plugins/t/check_tcp.t
+++ b/plugins/t/check_tcp.t
@@ -2,7 +2,6 @@
2# 2#
3# TCP Connection Based Tests via check_tcp 3# TCP Connection Based Tests via check_tcp
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_time.t b/plugins/t/check_time.t
index f7fcf959..961f56e6 100644
--- a/plugins/t/check_time.t
+++ b/plugins/t/check_time.t
@@ -2,7 +2,6 @@
2# 2#
3# System Time Tests via check_time 3# System Time Tests via check_time
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_udp.t b/plugins/t/check_udp.t
index e8a1e394..6d24675a 100644
--- a/plugins/t/check_udp.t
+++ b/plugins/t/check_udp.t
@@ -2,7 +2,6 @@
2# 2#
3# UDP Connection Based Tests via check_udp 3# UDP Connection Based Tests via check_udp
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/check_users.t b/plugins/t/check_users.t
index 4b313d30..cf7fac92 100644
--- a/plugins/t/check_users.t
+++ b/plugins/t/check_users.t
@@ -2,7 +2,6 @@
2# 2#
3# Logged in Users Tests via check_users 3# Logged in Users Tests via check_users
4# 4#
5# $Id$
6# 5#
7 6
8use strict; 7use strict;
diff --git a/plugins/t/negate.t b/plugins/t/negate.t
index 3a894f55..989bf01f 100644
--- a/plugins/t/negate.t
+++ b/plugins/t/negate.t
@@ -3,8 +3,6 @@
3# negate checks 3# negate checks
4# Need check_dummy to work for testing 4# Need check_dummy to work for testing
5# 5#
6# $Id: negate.pl 1717 2007-05-24 08:53:50Z tonvoon $
7#
8 6
9use strict; 7use strict;
10use Test::More; 8use Test::More;
diff --git a/plugins/urlize.c b/plugins/urlize.c
index aeabafd0..a3620082 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -5,8 +5,6 @@
5* License: GPL 5* License: GPL
6* Copyright (c) 2000-2007 Nagios Plugins Development Team 6* Copyright (c) 2000-2007 Nagios Plugins Development Team
7* 7*
8* Last Modified: $Date$
9*
10* Description: 8* Description:
11* 9*
12* This file contains the urlize plugin 10* This file contains the urlize plugin
@@ -29,12 +27,10 @@
29* You should have received a copy of the GNU General Public License 27* You should have received a copy of the GNU General Public License
30* along with this program. If not, see <http://www.gnu.org/licenses/>. 28* along with this program. If not, see <http://www.gnu.org/licenses/>.
31* 29*
32* $Id$
33* 30*
34*****************************************************************************/ 31*****************************************************************************/
35 32
36const char *progname = "urlize"; 33const char *progname = "urlize";
37const char *revision = "$Revision$";
38const char *copyright = "2000-2006"; 34const char *copyright = "2000-2006";
39const char *email = "nagiosplug-devel@lists.sourceforge.net"; 35const char *email = "nagiosplug-devel@lists.sourceforge.net";
40 36
@@ -89,7 +85,7 @@ main (int argc, char **argv)
89 exit (EXIT_SUCCESS); 85 exit (EXIT_SUCCESS);
90 break; 86 break;
91 case 'V': /* version */ 87 case 'V': /* version */
92 print_revision (progname, revision); 88 print_revision (progname, NP_VERSION);
93 exit (EXIT_SUCCESS); 89 exit (EXIT_SUCCESS);
94 break; 90 break;
95 case 'u': 91 case 'u':
@@ -165,7 +161,7 @@ main (int argc, char **argv)
165void 161void
166print_help (void) 162print_help (void)
167{ 163{
168 print_revision (progname, revision); 164 print_revision (progname, NP_VERSION);
169 165
170 printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"); 166 printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
171 printf (COPYRIGHT, copyright, email); 167 printf (COPYRIGHT, copyright, email);
diff --git a/plugins/utils.c b/plugins/utils.c
index c8f3a00d..1900ef86 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -6,9 +6,6 @@
6* Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net) 6* Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net)
7* Copyright (c) 2002-2007 Nagios Plugin Development Team 7* Copyright (c) 2002-2007 Nagios Plugin Development Team
8* 8*
9* Last Modified: $Date$
10*
11*
12* This program is free software: you can redistribute it and/or modify 9* This program is free software: you can redistribute it and/or modify
13* it under the terms of the GNU General Public License as published by 10* it under the terms of the GNU General Public License as published by
14* the Free Software Foundation, either version 3 of the License, or 11* the Free Software Foundation, either version 3 of the License, or
@@ -22,7 +19,6 @@
22* You should have received a copy of the GNU General Public License 19* You should have received a copy of the GNU General Public License
23* along with this program. If not, see <http://www.gnu.org/licenses/>. 20* along with this program. If not, see <http://www.gnu.org/licenses/>.
24* 21*
25* $Id$
26* 22*
27*****************************************************************************/ 23*****************************************************************************/
28 24
@@ -142,24 +138,13 @@ usage5 (void)
142 exit (STATE_UNKNOWN); 138 exit (STATE_UNKNOWN);
143} 139}
144 140
145char *
146clean_revstring (const char *revstring)
147{
148 char plugin_revision[STRLEN];
149 plugin_revision[0] = 'v';
150 if (sscanf (revstring,"$Revision: %[0-9.]", plugin_revision + 1) == 1)
151 return strscpy (NULL, plugin_revision);
152 else
153 return strscpy (NULL, "N/A");
154}
155
156void 141void
157print_revision (const char *command_name, const char *revision_string) 142print_revision (const char *command_name, const char *revision)
158{ 143{
159 char plugin_revision[STRLEN]; 144 char plugin_revision[STRLEN];
160 145
161 printf ("%s %s (%s %s)\n", 146 printf ("%s v%s (%s %s)\n",
162 command_name, clean_revstring(revision_string), PACKAGE, VERSION); 147 command_name, revision, PACKAGE, VERSION);
163} 148}
164 149
165const char * 150const char *
diff --git a/plugins/utils.h b/plugins/utils.h
index 67e099d4..65e06ebd 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -26,10 +26,7 @@ suite of plugins. */
26 26
27/* Standardize version information, termination */ 27/* Standardize version information, termination */
28 28
29/* $Id$ */
30
31void support (void); 29void support (void);
32char *clean_revstring (const char *);
33void print_revision (const char *, const char *); 30void print_revision (const char *, const char *);
34 31
35/* Handle timeouts */ 32/* Handle timeouts */