summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/check_by_ssh.c2
-rw-r--r--plugins/check_dig.c2
-rw-r--r--plugins/check_http.c12
-rw-r--r--plugins/check_nwstat.c4
-rw-r--r--plugins/check_pgsql.c2
-rw-r--r--plugins/check_ping.c2
-rw-r--r--plugins/check_udp.c2
-rw-r--r--po/.cvsignore1
8 files changed, 13 insertions, 14 deletions
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index d5bd3de..d9fe26e 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -73,7 +73,7 @@ main (int argc, char **argv)
73 73
74 /* Set signal handling and alarm timeout */ 74 /* Set signal handling and alarm timeout */
75 if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) { 75 if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
76 usage4 (_(" Cannot catch SIGALRM")); 76 usage4 (_("Cannot catch SIGALRM"));
77 } 77 }
78 alarm (timeout_interval); 78 alarm (timeout_interval);
79 79
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 211c16c..32bf2c4 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -318,7 +318,7 @@ print_help (void)
318 printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"); 318 printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
319 printf (COPYRIGHT, copyright, email); 319 printf (COPYRIGHT, copyright, email);
320 320
321 printf (_("Test the DNS service on the specified host using dig\n\n")); 321 printf (_("Test the DNS service on the specified host using dig\n"));
322 322
323 print_usage (); 323 print_usage ();
324 324
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 93bff45..f6cf507 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -346,7 +346,7 @@ process_arguments (int argc, char **argv)
346 break; 346 break;
347 case 'p': /* Server port */ 347 case 'p': /* Server port */
348 if (!is_intnonneg (optarg)) 348 if (!is_intnonneg (optarg))
349 usage2 (_("invalid port number"), optarg); 349 usage2 (_("Invalid port number"), optarg);
350 else { 350 else {
351 server_port = atoi (optarg); 351 server_port = atoi (optarg);
352 specify_port = TRUE; 352 specify_port = TRUE;
@@ -377,7 +377,7 @@ process_arguments (int argc, char **argv)
377 case 'l': /* linespan */ 377 case 'l': /* linespan */
378 case 'r': /* linespan */ 378 case 'r': /* linespan */
379 case 'R': /* linespan */ 379 case 'R': /* linespan */
380 usage (_("check_http: call for regex which was not a compiled option\n")); 380 usage4 (_("Call for regex which was not a compiled option"));
381 break; 381 break;
382#else 382#else
383 case 'l': /* linespan */ 383 case 'l': /* linespan */
@@ -403,7 +403,7 @@ process_arguments (int argc, char **argv)
403#ifdef USE_IPV6 403#ifdef USE_IPV6
404 address_family = AF_INET6; 404 address_family = AF_INET6;
405#else 405#else
406 usage (_("IPv6 support not available\n")); 406 usage4 (_("IPv6 support not available"));
407#endif 407#endif
408 break; 408 break;
409 case 'v': /* verbose */ 409 case 'v': /* verbose */
@@ -446,7 +446,7 @@ process_arguments (int argc, char **argv)
446 446
447 if (server_address == NULL) { 447 if (server_address == NULL) {
448 if (host_name == NULL) 448 if (host_name == NULL)
449 usage (_("check_http: you must specify a server address or host name\n")); 449 usage4 (_("You must specify a server address or host name"));
450 else 450 else
451 server_address = strdup (host_name); 451 server_address = strdup (host_name);
452 } 452 }
@@ -1049,11 +1049,11 @@ redir (char *pos, char *status_line)
1049 1049
1050 addr = malloc (MAX_IPV4_HOSTLENGTH + 1); 1050 addr = malloc (MAX_IPV4_HOSTLENGTH + 1);
1051 if (addr == NULL) 1051 if (addr == NULL)
1052 die (STATE_UNKNOWN, _("could not allocate addr\n")); 1052 die (STATE_UNKNOWN, _("Could not allocate addr\n"));
1053 1053
1054 url = malloc (strcspn (pos, "\r\n")); 1054 url = malloc (strcspn (pos, "\r\n"));
1055 if (url == NULL) 1055 if (url == NULL)
1056 die (STATE_UNKNOWN, _("could not allocate url\n")); 1056 die (STATE_UNKNOWN, _("Could not allocate url\n"));
1057 1057
1058 while (pos) { 1058 while (pos) {
1059 1059
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 41b7c87..9c89ef9 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -643,7 +643,7 @@ main(int argc, char **argv) {
643 result=STATE_CRITICAL; 643 result=STATE_CRITICAL;
644 else if (check_warning_value==TRUE && dirty_cache_buffers <= warning_value) 644 else if (check_warning_value==TRUE && dirty_cache_buffers <= warning_value)
645 result=STATE_WARNING; 645 result=STATE_WARNING;
646 asprintf (&output_message,_("dirty cache buffers = %lu%% of the total"),dirty_cache_buffers); 646 asprintf (&output_message,_("Dirty cache buffers = %lu%% of the total"),dirty_cache_buffers);
647 647
648 /* check % total cache buffers as a percentage of the original*/ 648 /* check % total cache buffers as a percentage of the original*/
649 } else if (vars_to_check==TCB) { 649 } else if (vars_to_check==TCB) {
@@ -658,7 +658,7 @@ main(int argc, char **argv) {
658 result=STATE_CRITICAL; 658 result=STATE_CRITICAL;
659 else if (check_warning_value==TRUE && total_cache_buffers <= warning_value) 659 else if (check_warning_value==TRUE && total_cache_buffers <= warning_value)
660 result=STATE_WARNING; 660 result=STATE_WARNING;
661 asprintf (&output_message,_("total cache buffers = %lu%% of the original"),total_cache_buffers); 661 asprintf (&output_message,_("Total cache buffers = %lu%% of the original"),total_cache_buffers);
662 662
663 } else if (vars_to_check==DSVER) { 663 } else if (vars_to_check==DSVER) {
664 asprintf (&send_buffer,"S13\r\n"); 664 asprintf (&send_buffer,"S13\r\n");
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index a8e84e2..826a105 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -256,7 +256,7 @@ process_arguments (int argc, char **argv)
256 break; 256 break;
257 case 'l': /* login name */ 257 case 'l': /* login name */
258 if (!is_pg_logname (optarg)) 258 if (!is_pg_logname (optarg))
259 usage2 (_("user name is not valid"), optarg); 259 usage2 (_("User name is not valid"), optarg);
260 else 260 else
261 pguser = optarg; 261 pguser = optarg;
262 break; 262 break;
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index e3f5398..132453d 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -475,7 +475,7 @@ error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)
475 warn_text = strdup (_(WARN_DUPLICATES)); 475 warn_text = strdup (_(WARN_DUPLICATES));
476 else if (! strstr (warn_text, _(WARN_DUPLICATES)) && 476 else if (! strstr (warn_text, _(WARN_DUPLICATES)) &&
477 asprintf (&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1) 477 asprintf (&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1)
478 die (STATE_UNKNOWN, _("unable to realloc warn_text")); 478 die (STATE_UNKNOWN, _("Unable to realloc warn_text"));
479 return (STATE_WARNING); 479 return (STATE_WARNING);
480 } 480 }
481 481
diff --git a/plugins/check_udp.c b/plugins/check_udp.c
index 0cb732f..5adf23c 100644
--- a/plugins/check_udp.c
+++ b/plugins/check_udp.c
@@ -206,7 +206,7 @@ process_arguments (int argc, char **argv)
206 } 206 }
207 207
208 if (server_address == NULL) 208 if (server_address == NULL)
209 usage (_("Host name was not supplied\n")); 209 usage4 (_("Hostname was not supplied"));
210 210
211 if (server_send == NULL) 211 if (server_send == NULL)
212 server_send = strdup(""); 212 server_send = strdup("");
diff --git a/po/.cvsignore b/po/.cvsignore
index 4183dde..68b874d 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -6,6 +6,5 @@ en@boldquot.header
6en@quot.header 6en@quot.header
7fr.gmo 7fr.gmo
8insert-header.sin 8insert-header.sin
9nagios-plugins.pot
10quot.sed 9quot.sed
11remove-potcdate.sin 10remove-potcdate.sin