[Nagiosplug-checkins] nagiosplug/plugins check_dns.c,1.31,1.32 check_game.c,1.12,1.13 check_http.c,1.67,1.68 check_ide-smart.c,1.6,1.7 check_load.c,1.17,1.18 check_mrtgtraf.c,1.15,1.16 check_mysql.c,1.16,1.17 check_nagios.c,1.13,1.14 check_nt.c,1.26,1.27 check_nwstat.c,1.17,1.18 check_overcr.c,1.10,1.11 check_pgsql.c,1.19,1.20 check_ping.c,1.30,1.31 check_procs.c,1.30,1.31 check_radius.c,1.12,1.13 check_real.c,1.15,1.16 check_snmp.c,1.40,1.41 check_ssh.c,1.17,1.18 check_tcp.c,1.45,1.46 check_time.c,1.15,1.16 check_udp.c,1.14,1.15 check_ups.c,1.16,1.17 negate.c,1.16,1.17 popen.c,1.8,1.9
Benoit Mortier
opensides at users.sourceforge.net
Wed Dec 1 17:12:09 CET 2004
Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26664/plugins
Modified Files:
check_dns.c check_game.c check_http.c check_ide-smart.c
check_load.c check_mrtgtraf.c check_mysql.c check_nagios.c
check_nt.c check_nwstat.c check_overcr.c check_pgsql.c
check_ping.c check_procs.c check_radius.c check_real.c
check_snmp.c check_ssh.c check_tcp.c check_time.c check_udp.c
check_ups.c negate.c popen.c
Log Message:
changed Error: by CRITICAL -
more localization fixes
Index: check_tcp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_tcp.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- check_tcp.c 1 Dec 2004 23:54:51 -0000 1.45
+++ check_tcp.c 2 Dec 2004 01:11:01 -0000 1.46
@@ -230,7 +230,7 @@
}
else {
progname = strdup ("check_tcp");
- usage (_("ERROR: Generic check_tcp called with unknown service\n"));
+ usage (_("CRITICAL - Generic check_tcp called with unknown service\n"));
}
server_address = strdup ("127.0.0.1");
@@ -239,7 +239,7 @@
server_quit = QUIT;
status = strdup ("");
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != OK)
usage (_("check_tcp: could not parse arguments\n"));
/* use default expect if none listed in process_arguments() */
@@ -259,13 +259,13 @@
#ifdef HAVE_SSL
if (use_ssl && check_cert == TRUE) {
if (connect_SSL () != OK)
- die (STATE_CRITICAL,"TCP CRITICAL - Could not make SSL connection\n");
+ die (STATE_CRITICAL,"CRITICAL - Could not make SSL connection\n");
if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) {
result = check_certificate (&server_cert);
X509_free(server_cert);
}
else {
- printf("ERROR: Cannot retrieve server certificate.\n");
+ printf("CRITICAL Cannot retrieve server certificate.\n");
result = STATE_CRITICAL;
}
SSL_shutdown (ssl);
@@ -592,7 +592,7 @@
OpenSSL_add_all_algorithms();
if ((ctx = SSL_CTX_new (meth)) == NULL)
{
- printf (_("ERROR: Cannot create SSL context.\n"));
+ printf (_("CRITICAL - Cannot create SSL context.\n"));
return STATE_CRITICAL;
}
@@ -615,13 +615,13 @@
if (SSL_connect(ssl) == 1)
return OK;
/* ERR_print_errors_fp (stderr); */
- printf (_("ERROR: Cannot make SSL connection "));
+ printf (_("CRITICAL - Cannot make SSL connection "));
ERR_print_errors_fp (stdout);
/* printf("\n"); */
}
else
{
- printf (_("ERROR: Cannot initiate SSL handshake.\n"));
+ printf (_("CRITICAL - Cannot initiate SSL handshake.\n"));
}
SSL_free (ssl);
}
@@ -651,7 +651,7 @@
/* Generate tm structure to process timestamp */
if (tm->type == V_ASN1_UTCTIME) {
if (tm->length < 10) {
- printf ("ERROR: Wrong time format in certificate.\n");
+ printf ("CRITICAL - Wrong time format in certificate.\n");
return STATE_CRITICAL;
}
else {
@@ -663,7 +663,7 @@
}
else {
if (tm->length < 12) {
- printf ("ERROR: Wrong time format in certificate.\n");
+ printf ("CRITICAL - Wrong time format in certificate.\n");
return STATE_CRITICAL;
}
else {
Index: check_overcr.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_overcr.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- check_overcr.c 1 Dec 2004 23:54:51 -0000 1.10
+++ check_overcr.c 2 Dec 2004 01:11:00 -0000 1.11
@@ -85,7 +85,7 @@
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != OK)
usage (_("check_overcr: could not parse arguments\n"));
/* initialize alarm signal handling */
@@ -180,7 +180,7 @@
/* error if we couldn't find the info for the disk */
if (found_disk == FALSE)
die (STATE_CRITICAL,
- "Error: Disk '%s' non-existent or not mounted",
+ "CRITICAL - Disk '%s' non-existent or not mounted",
disk_name);
if (check_critical_value == TRUE && (percent_used_disk_space >= critical_value))
@@ -339,7 +339,7 @@
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, "$Revision$");
+ print_revision (progname, revision);
exit (STATE_OK);
case 'H': /* hostname */
server_address = optarg;
Index: check_radius.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_radius.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- check_radius.c 1 Dec 2004 23:54:51 -0000 1.12
+++ check_radius.c 2 Dec 2004 01:11:01 -0000 1.13
@@ -112,7 +112,7 @@
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != OK)
usage (_("check_radius: could not parse arguments\n"));
str = strdup ("dictionary");
Index: check_mrtgtraf.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mrtgtraf.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- check_mrtgtraf.c 1 Dec 2004 23:54:51 -0000 1.15
+++ check_mrtgtraf.c 2 Dec 2004 01:11:00 -0000 1.16
@@ -191,7 +191,9 @@
return result;
}
-
+
+
+
/* process command-line arguments */
int
process_arguments (int argc, char **argv)
@@ -303,8 +305,6 @@
-
-
int
validate_arguments (void)
{
@@ -313,8 +313,6 @@
-
-
void
print_help (void)
{
Index: check_http.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_http.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- check_http.c 1 Dec 2004 23:54:51 -0000 1.67
+++ check_http.c 2 Dec 2004 01:11:00 -0000 1.68
@@ -145,7 +145,7 @@
asprintf (&user_agent, "User-Agent: check_http/%s (nagios-plugins %s)",
clean_revstring (revision), VERSION);
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != OK)
usage (_("check_http: could not parse arguments\n"));
if (strstr (timestamp, ":")) {
@@ -174,7 +174,7 @@
X509_free (server_cert);
}
else {
- printf (_("ERROR: Cannot retrieve server certificate.\n"));
+ printf (_("CRITICAL - Cannot retrieve server certificate.\n"));
result = STATE_CRITICAL;
}
SSL_shutdown (ssl);
@@ -738,7 +738,7 @@
X509_free (server_cert);
}
else {
- printf (_("ERROR: Cannot retrieve server certificate.\n"));
+ printf (_("CRITICAL - Cannot retrieve server certificate.\n"));
return STATE_CRITICAL;
}
@@ -1049,11 +1049,11 @@
addr = malloc (MAX_IPV4_HOSTLENGTH + 1);
if (addr == NULL)
- die (STATE_UNKNOWN, _("ERROR: could not allocate addr\n"));
+ die (STATE_UNKNOWN, _("could not allocate addr\n"));
url = malloc (strcspn (pos, "\r\n"));
if (url == NULL)
- die (STATE_UNKNOWN, _("ERROR: could not allocate url\n"));
+ die (STATE_UNKNOWN, _("could not allocate url\n"));
while (pos) {
@@ -1073,7 +1073,7 @@
url = realloc (url, strcspn (pos, "\r\n"));
if (url == NULL)
- die (STATE_UNKNOWN, _("ERROR: could not allocate url\n"));
+ die (STATE_UNKNOWN, _("could not allocate url\n"));
/* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */
if (sscanf (pos, HD1, type, addr, port, url) == 4) {
Index: check_time.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_time.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- check_time.c 1 Dec 2004 23:54:51 -0000 1.15
+++ check_time.c 2 Dec 2004 01:11:01 -0000 1.16
@@ -124,7 +124,7 @@
else
result = STATE_UNKNOWN;
die (result,
- _("TIME UNKNOWN - no data on recv() from server %s, port %d\n"),
+ _("TIME UNKNOWN - no data received from server %s, port %d\n"),
server_address, server_port);
}
Index: check_ssh.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ssh.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- check_ssh.c 1 Dec 2004 23:54:51 -0000 1.17
+++ check_ssh.c 2 Dec 2004 01:11:01 -0000 1.18
@@ -57,7 +57,7 @@
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != OK)
usage (_("check_ssh: could not parse arguments\n"));
/* initialize alarm signal handling */
Index: check_udp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_udp.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- check_udp.c 1 Dec 2004 23:54:51 -0000 1.14
+++ check_udp.c 2 Dec 2004 01:11:01 -0000 1.15
@@ -51,7 +51,7 @@
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != OK)
usage (_("check_udp: could not parse arguments\n"));
/* initialize alarm signal handling */
Index: check_ping.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ping.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- check_ping.c 1 Dec 2004 23:54:51 -0000 1.30
+++ check_ping.c 2 Dec 2004 01:11:00 -0000 1.31
@@ -78,7 +78,7 @@
addresses = malloc (sizeof(char*) * max_addr);
addresses[0] = NULL;
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != OK)
usage (_("check_ping: could not parse arguments\n"));
/* Set signal handling and alarm */
@@ -121,7 +121,7 @@
if (pl == UNKNOWN_PACKET_LOSS || rta < 0.0) {
printf ("%s\n", cmd);
die (STATE_UNKNOWN,
- _("Error: Could not interpret output from ping command\n"));
+ _("CRITICAL - Could not interpret output from ping command\n"));
}
if (pl >= cpl || rta >= crta || rta < 0)
Index: check_dns.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dns.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- check_dns.c 1 Dec 2004 23:54:51 -0000 1.31
+++ check_dns.c 2 Dec 2004 01:11:00 -0000 1.32
@@ -107,7 +107,7 @@
if ((temp_buffer = strstr (input_buffer, "name = ")))
address = strdup (temp_buffer + 7);
else {
- output = strdup (_("Unknown error (plugin)"));
+ output = strdup (_("Warning plugin error"));
result = STATE_WARNING;
}
}
Index: check_ide-smart.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ide-smart.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- check_ide-smart.c 1 Dec 2004 23:54:51 -0000 1.6
+++ check_ide-smart.c 2 Dec 2004 01:11:00 -0000 1.7
@@ -249,7 +249,7 @@
total);
break;
case OPERATIONAL:
- printf (_("STATUS - Operational (%d/%d tests passed)\n"), passed, total);
+ printf (_("OK - Operational (%d/%d tests passed)\n"), passed, total);
break;
default:
printf (_("ERROR - Status '%d' uknown. %d/%d tests passed\n"), status,
Index: check_snmp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_snmp.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- check_snmp.c 1 Dec 2004 23:54:51 -0000 1.40
+++ check_snmp.c 2 Dec 2004 01:11:01 -0000 1.41
@@ -156,7 +156,7 @@
output_delim = strdup (DEFAULT_OUTPUT_DELIMITER);
miblist = strdup (DEFAULT_MIBLIST);
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != OK)
usage (_("check_snmp: could not parse arguments\n"));
/* create the command line to execute */
Index: popen.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/popen.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- popen.c 1 Dec 2004 23:54:51 -0000 1.8
+++ popen.c 2 Dec 2004 01:11:01 -0000 1.9
@@ -123,7 +123,7 @@
str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
if (i >= argc - 2) {
- printf ("You've got a big problem buddy! You need more args!!!\n");
+ printf ("CRITICAL - You need more args!!!\n");
return (NULL);
}
Index: check_real.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_real.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- check_real.c 1 Dec 2004 23:54:51 -0000 1.15
+++ check_real.c 2 Dec 2004 01:11:01 -0000 1.16
@@ -345,7 +345,7 @@
}
break;
case 'V': /* version */
- print_revision (progname, "$Revision$");
+ print_revision (progname, revision);
exit (STATE_OK);
case 'h': /* help */
print_help ();
@@ -395,7 +395,7 @@
char *myport;
asprintf (&myport, "%d", PORT);
- print_revision (progname, "$Revision$");
+ print_revision (progname, revision);
printf ("Copyright (c) 1999 Pedro Leite <leite at cic.ua.pt>\n");
printf (COPYRIGHT, copyright, email);
Index: check_mysql.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mysql.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- check_mysql.c 1 Dec 2004 23:54:51 -0000 1.16
+++ check_mysql.c 2 Dec 2004 01:11:00 -0000 1.17
@@ -39,6 +39,8 @@
void print_help (void);
void print_usage (void);
+
+
int
main (int argc, char **argv)
{
Index: check_ups.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ups.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- check_ups.c 1 Dec 2004 23:54:51 -0000 1.16
+++ check_ups.c 2 Dec 2004 01:11:01 -0000 1.17
@@ -396,20 +396,20 @@
ptr = temp_buffer + strlen (varname) + 5;
if (!strcmp (ptr, "NOT-SUPPORTED")) {
- printf ("Error: Variable '%s' is not supported\n", varname);
+ printf ("CRITICAL - Variable '%s' is not supported\n", varname);
return ERROR;
}
if (!strcmp (ptr, "DATA-STALE")) {
- printf ("Error: UPS data is stale\n");
+ printf ("CRITICAL - UPS data is stale\n");
return ERROR;
}
if (!strcmp (ptr, "UNKNOWN-UPS")) {
if (ups_name)
- printf ("Error: UPS '%s' is unknown\n", ups_name);
+ printf ("CRITICAL - UPS '%s' is unknown\n", ups_name);
else
- printf ("Error: UPS is unknown\n");
+ printf ("CRITICAL - UPS is unknown\n");
return ERROR;
}
Index: check_nwstat.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nwstat.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- check_nwstat.c 1 Dec 2004 23:54:51 -0000 1.17
+++ check_nwstat.c 2 Dec 2004 01:11:00 -0000 1.18
@@ -121,8 +121,8 @@
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments(argc,argv)==ERROR)
- usage(_("check_nwstat: could not parse arguments\n"));
+ if (process_arguments(argc,argv) != OK)
+ usage (_("check_nwstat: could not parse arguments\n"));
/* initialize alarm signal handling */
signal(SIGALRM,socket_timeout_alarm_handler);
@@ -293,7 +293,7 @@
return result;
if (!strcmp(recv_buffer,"-1\n")) {
- asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+ asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
result=STATE_CRITICAL;
} else {
free_disk_space=strtoul(recv_buffer,NULL,10);
@@ -318,7 +318,7 @@
if (!strcmp(recv_buffer,"-1\n")) {
- asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+ asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
result=STATE_CRITICAL;
} else {
@@ -438,7 +438,7 @@
return result;
if (!strcmp(recv_buffer,"-1\n")) {
- asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+ asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
result=STATE_CRITICAL;
} else {
purgeable_disk_space=strtoul(recv_buffer,NULL,10);
@@ -459,7 +459,7 @@
if (!strcmp(recv_buffer,"-1\n")) {
- asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+ asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
result=STATE_CRITICAL;
} else {
@@ -491,7 +491,7 @@
return result;
if (!strcmp(recv_buffer,"-1\n")) {
- asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+ asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
result=STATE_CRITICAL;
} else {
non_purgeable_disk_space=strtoul(recv_buffer,NULL,10);
@@ -512,7 +512,7 @@
if (!strcmp(recv_buffer,"-1\n")) {
- asprintf (&output_message,_("Error: Volume '%s' does not exist!"),volume_name);
+ asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
result=STATE_CRITICAL;
} else {
Index: check_pgsql.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_pgsql.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- check_pgsql.c 1 Dec 2004 23:54:51 -0000 1.19
+++ check_pgsql.c 2 Dec 2004 01:11:00 -0000 1.20
@@ -132,7 +132,7 @@
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != OK)
usage (_("check_pgsql: could not parse arguments\n"));
/* Set signal handling and alarm */
Index: check_game.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_game.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- check_game.c 1 Dec 2004 23:54:51 -0000 1.12
+++ check_game.c 2 Dec 2004 01:11:00 -0000 1.13
@@ -67,7 +67,7 @@
// result = process_arguments (argc, argv);
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != OK)
usage (_("check_game: could not parse arguments\n"));
/* if (result != OK) {
@@ -116,7 +116,7 @@
*/
if (!strncmp (input_buffer, "unknown option", 14)) {
- printf (_("ERROR: Host type parameter incorrect!\n"));
+ printf (_("CRITICAL - Host type parameter incorrect!\n"));
result = STATE_CRITICAL;
return result;
}
@@ -136,15 +136,15 @@
}
if (strstr (ret[2], QSTAT_HOST_ERROR)) {
- printf ("ERROR: Host not found\n");
+ printf ("CRITICAL - Host not found\n");
result = STATE_CRITICAL;
}
else if (strstr (ret[2], QSTAT_HOST_DOWN)) {
- printf ("ERROR: Game server down or unavailable\n");
+ printf ("CRITICAL - Game server down or unavailable\n");
result = STATE_CRITICAL;
}
else if (strstr (ret[2], QSTAT_HOST_TIMEOUT)) {
- printf ("ERROR: Game server timeout\n");
+ printf ("CRITICAL - Game server timeout\n");
result = STATE_CRITICAL;
}
else {
Index: check_nagios.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nagios.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- check_nagios.c 1 Dec 2004 23:54:51 -0000 1.13
+++ check_nagios.c 2 Dec 2004 01:11:00 -0000 1.14
@@ -65,7 +65,7 @@
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != OK)
usage (_("check_nagios: could not parse arguments\n"));
/* Set signal handling and alarm */
@@ -80,7 +80,7 @@
/* open the status log */
fp = fopen (status_log, "r");
if (fp == NULL) {
- printf (_("ERROR - Cannot open status log for reading!\n"));
+ printf (_("CRITICAL - Cannot open status log for reading!\n"));
return STATE_CRITICAL;
}
@@ -227,7 +227,7 @@
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, "$Revision$");
+ print_revision (progname, revision);
exit (STATE_OK);
case 'F': /* status log */
status_log = optarg;
Index: check_procs.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_procs.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- check_procs.c 1 Dec 2004 23:54:51 -0000 1.30
+++ check_procs.c 2 Dec 2004 01:11:01 -0000 1.31
@@ -115,7 +115,7 @@
asprintf (&metric_name, "PROCS");
metric = METRIC_PROCS;
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != OK)
usage (_("check_procs: could not parse arguments\n"));
/* Set signal handling and alarm timeout */
Index: negate.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/negate.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- negate.c 1 Dec 2004 23:54:51 -0000 1.16
+++ negate.c 2 Dec 2004 01:11:01 -0000 1.17
@@ -83,7 +83,7 @@
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != OK)
usage (_("negate: could not parse arguments\n"));
/* Set signal handling and alarm */
Index: check_nt.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nt.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- check_nt.c 1 Dec 2004 23:54:51 -0000 1.26
+++ check_nt.c 2 Dec 2004 01:11:00 -0000 1.27
@@ -110,8 +110,8 @@
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if(process_arguments(argc,argv)==ERROR)
- usage(_("check_nt: could not parse arguments\n"));
+ if(process_arguments(argc,argv) != OK)
+ usage (_("check_nt: could not parse arguments\n"));
/* initialize alarm signal handling */
signal(SIGALRM,socket_timeout_alarm_handler);
Index: check_load.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_load.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- check_load.c 1 Dec 2004 23:54:51 -0000 1.17
+++ check_load.c 2 Dec 2004 01:11:00 -0000 1.18
@@ -51,9 +51,6 @@
-
-
-
int
main (int argc, char **argv)
{
@@ -76,7 +73,7 @@
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) == ERROR)
+ if (process_arguments (argc, argv) != OK)
usage (_("check_load: could not parse arguments\n"));
#if HAVE_GETLOADAVG==1
@@ -162,9 +159,6 @@
-
-
-
/* process command-line arguments */
int
process_arguments (int argc, char **argv)
@@ -223,7 +217,7 @@
usage (_("Critical threshold must be float or float triplet!\n"));
break;
case 'V': /* version */
- print_revision (progname, "$Revision$");
+ print_revision (progname, revision);
exit (STATE_OK);
case 'h': /* help */
print_help ();
@@ -271,8 +265,6 @@
-
-
int
validate_arguments (void)
{
@@ -299,9 +291,6 @@
-
-
-
void
print_help (void)
{
More information about the Commits
mailing list