summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/check_by_ssh.c8
-rw-r--r--plugins/check_dns.c10
-rw-r--r--plugins/check_hpjd.c2
-rw-r--r--plugins/check_mrtg.c2
-rw-r--r--plugins/check_mrtgtraf.c2
-rw-r--r--plugins/check_mysql.c2
-rw-r--r--plugins/check_real.c2
-rw-r--r--plugins/check_smtp.c2
-rw-r--r--plugins/check_swap.c2
-rw-r--r--plugins/check_time.c2
10 files changed, 17 insertions, 17 deletions
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index bbed954..49794cc 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -86,7 +86,7 @@ main (int argc, char **argv)
86 child_process = spopen (comm); 86 child_process = spopen (comm);
87 87
88 if (child_process == NULL) { 88 if (child_process == NULL) {
89 printf (_("Unable to open pipe: %s"), comm); 89 printf (_("Could not open pipe: %s\n"), comm);
90 return STATE_UNKNOWN; 90 return STATE_UNKNOWN;
91 } 91 }
92 92
@@ -145,7 +145,7 @@ main (int argc, char **argv)
145 eol[0] = 0; 145 eol[0] = 0;
146 if (service[commands] && status_text 146 if (service[commands] && status_text
147 && sscanf (status_text, "STATUS CODE: %d", &cresult) == 1) { 147 && sscanf (status_text, "STATUS CODE: %d", &cresult) == 1) {
148 fprintf (fp, _("[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n"), 148 fprintf (fp, "[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n",
149 (int) local_time, host_shortname, service[commands++], cresult, 149 (int) local_time, host_shortname, service[commands++], cresult,
150 output); 150 output);
151 } 151 }
@@ -232,13 +232,13 @@ process_arguments (int argc, char **argv)
232 break; 232 break;
233 case 't': /* timeout period */ 233 case 't': /* timeout period */
234 if (!is_integer (optarg)) 234 if (!is_integer (optarg))
235 usage2 (_("timeout interval must be an integer"), optarg); 235 usage2 (_("Timeout interval must be a positive integer"), optarg);
236 else 236 else
237 timeout_interval = atoi (optarg); 237 timeout_interval = atoi (optarg);
238 break; 238 break;
239 case 'H': /* host */ 239 case 'H': /* host */
240 if (!is_host (optarg)) 240 if (!is_host (optarg))
241 usage2 (_("invalid host name"), optarg); 241 usage2 (_("Invalid host name"), optarg);
242 hostname = optarg; 242 hostname = optarg;
243 break; 243 break;
244 case 'p': /* port number */ 244 case 'p': /* port number */
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 43a38fa..39023f9 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -195,7 +195,7 @@ main (int argc, char **argv)
195 else 195 else
196 multi_address = TRUE; 196 multi_address = TRUE;
197 197
198 printf ("%s %s: ", _("DNS"), _("OK")); 198 printf ("DNS %s: ", _("OK"));
199 printf (ngettext("%.3f second response time, ", "%.3f seconds response time, ", elapsed_time), elapsed_time); 199 printf (ngettext("%.3f second response time, ", "%.3f seconds response time, ", elapsed_time), elapsed_time);
200 printf (_("%s returns %s"), query_address, address); 200 printf (_("%s returns %s"), query_address, address);
201 printf ("|%s\n", fperfdata ("time", elapsed_time, "s", FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0)); 201 printf ("|%s\n", fperfdata ("time", elapsed_time, "s", FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
@@ -225,18 +225,18 @@ error_scan (char *input_buffer)
225 225
226 /* DNS server is not running... */ 226 /* DNS server is not running... */
227 else if (strstr (input_buffer, "No response from server")) 227 else if (strstr (input_buffer, "No response from server"))
228 die (STATE_CRITICAL, _("No response from name server %s\n"), dns_server); 228 die (STATE_CRITICAL, _("No response from DNS %s\n"), dns_server);
229 229
230 /* Host name is valid, but server doesn't have records... */ 230 /* Host name is valid, but server doesn't have records... */
231 else if (strstr (input_buffer, "No records")) 231 else if (strstr (input_buffer, "No records"))
232 die (STATE_CRITICAL, _("Name server %s has no records\n"), dns_server); 232 die (STATE_CRITICAL, _("DNS %s has no records\n"), dns_server);
233 233
234 /* Connection was refused */ 234 /* Connection was refused */
235 else if (strstr (input_buffer, "Connection refused") || 235 else if (strstr (input_buffer, "Connection refused") ||
236 strstr (input_buffer, "Refused") || 236 strstr (input_buffer, "Refused") ||
237 (strstr (input_buffer, "** server can't find") && 237 (strstr (input_buffer, "** server can't find") &&
238 strstr (input_buffer, ": REFUSED"))) 238 strstr (input_buffer, ": REFUSED")))
239 die (STATE_CRITICAL, _("Connection to name server %s was refused\n"), dns_server); 239 die (STATE_CRITICAL, _("Connection to DNS %s was refused\n"), dns_server);
240 240
241 /* Host or domain name does not exist */ 241 /* Host or domain name does not exist */
242 else if (strstr (input_buffer, "Non-existent") || 242 else if (strstr (input_buffer, "Non-existent") ||
@@ -250,7 +250,7 @@ error_scan (char *input_buffer)
250 250
251 /* Internal server failure */ 251 /* Internal server failure */
252 else if (strstr (input_buffer, "Server failure")) 252 else if (strstr (input_buffer, "Server failure"))
253 die (STATE_CRITICAL, _("Server failure for %s\n"), dns_server); 253 die (STATE_CRITICAL, _("DNS failure for %s\n"), dns_server);
254 254
255 /* Request error or the DNS lookup timed out */ 255 /* Request error or the DNS lookup timed out */
256 else if (strstr (input_buffer, "Format error") || 256 else if (strstr (input_buffer, "Format error") ||
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 8d3f4c8..ec6bdf9 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -84,7 +84,7 @@ main (int argc, char **argv)
84 textdomain (PACKAGE); 84 textdomain (PACKAGE);
85 85
86 if (process_arguments (argc, argv) != OK) 86 if (process_arguments (argc, argv) != OK)
87 usage (_("Invalid command arguments supplied\n")); 87 usage (_("Incorrect arguments supplied\n"));
88 88
89 /* removed ' 2>1' at end of command 10/27/1999 - EG */ 89 /* removed ' 2>1' at end of command 10/27/1999 - EG */
90 /* create the query string */ 90 /* create the query string */
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index e138264..15d50fe 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -58,7 +58,7 @@ main (int argc, char **argv)
58 textdomain (PACKAGE); 58 textdomain (PACKAGE);
59 59
60 if (process_arguments (argc, argv) != OK) 60 if (process_arguments (argc, argv) != OK)
61 usage (_("Invalid command arguments supplied\n")); 61 usage (_("Incorrect arguments supplied\n"));
62 62
63 /* open the MRTG log file for reading */ 63 /* open the MRTG log file for reading */
64 fp = fopen (log_file, "r"); 64 fp = fopen (log_file, "r");
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index d23b76d..6b32342 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -64,7 +64,7 @@ main (int argc, char **argv)
64 char outgoing_speed_rating[8]; 64 char outgoing_speed_rating[8];
65 65
66 if (process_arguments (argc, argv) != OK) 66 if (process_arguments (argc, argv) != OK)
67 usage (_("Invalid command arguments supplied\n")); 67 usage (_("Incorrect arguments supplied\n"));
68 68
69 /* open the MRTG log file for reading */ 69 /* open the MRTG log file for reading */
70 fp = fopen (log_file, "r"); 70 fp = fopen (log_file, "r");
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 2c90e6d..dba43c5 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -54,7 +54,7 @@ main (int argc, char **argv)
54 textdomain (PACKAGE); 54 textdomain (PACKAGE);
55 55
56 if (process_arguments (argc, argv) != OK) 56 if (process_arguments (argc, argv) != OK)
57 usage (_("Invalid command arguments supplied\n")); 57 usage (_("Incorrect arguments supplied\n"));
58 58
59 /* initialize mysql */ 59 /* initialize mysql */
60 mysql_init (&mysql); 60 mysql_init (&mysql);
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 05e39d7..7cd17ee 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -66,7 +66,7 @@ main (int argc, char **argv)
66 textdomain (PACKAGE); 66 textdomain (PACKAGE);
67 67
68 if (process_arguments (argc, argv) != OK) 68 if (process_arguments (argc, argv) != OK)
69 usage (_("Invalid command arguments supplied\n")); 69 usage (_("Incorrect arguments supplied\n"));
70 70
71 /* initialize alarm signal handling */ 71 /* initialize alarm signal handling */
72 signal (SIGALRM, socket_timeout_alarm_handler); 72 signal (SIGALRM, socket_timeout_alarm_handler);
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index a43b993..f6f347c 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -90,7 +90,7 @@ main (int argc, char **argv)
90 textdomain (PACKAGE); 90 textdomain (PACKAGE);
91 91
92 if (process_arguments (argc, argv) != OK) 92 if (process_arguments (argc, argv) != OK)
93 usage (_("Invalid command arguments supplied\n")); 93 usage (_("Incorrect arguments supplied\n"));
94 94
95 /* initialize the HELO command with the localhostname */ 95 /* initialize the HELO command with the localhostname */
96#ifndef HOST_MAX_BYTES 96#ifndef HOST_MAX_BYTES
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index ddf298a..3016e1a 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -90,7 +90,7 @@ main (int argc, char **argv)
90 perf = strdup (""); 90 perf = strdup ("");
91 91
92 if (process_arguments (argc, argv) != OK) 92 if (process_arguments (argc, argv) != OK)
93 usage (_("Invalid command arguments supplied\n")); 93 usage (_("Incorrect arguments supplied\n"));
94 94
95#ifdef HAVE_PROC_MEMINFO 95#ifdef HAVE_PROC_MEMINFO
96 fp = fopen (PROC_MEMINFO, "r"); 96 fp = fopen (PROC_MEMINFO, "r");
diff --git a/plugins/check_time.c b/plugins/check_time.c
index 0de6718..1f8b3bd 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -61,7 +61,7 @@ main (int argc, char **argv)
61 textdomain (PACKAGE); 61 textdomain (PACKAGE);
62 62
63 if (process_arguments (argc, argv) != OK) 63 if (process_arguments (argc, argv) != OK)
64 usage (_("Invalid command arguments supplied\n")); 64 usage (_("Incorrect arguments supplied\n"));
65 65
66 /* initialize alarm signal handling */ 66 /* initialize alarm signal handling */
67 signal (SIGALRM, socket_timeout_alarm_handler); 67 signal (SIGALRM, socket_timeout_alarm_handler);