summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/Makefile.am4
-rw-r--r--plugins/check_by_ssh.c2
-rw-r--r--plugins/check_dig.c4
-rw-r--r--plugins/check_http.c2
-rw-r--r--plugins/check_ide_smart.c (renamed from plugins/check_ide-smart.c)0
-rw-r--r--plugins/check_mrtg.c2
-rw-r--r--plugins/check_nt.c2
-rw-r--r--plugins/check_nwstat.c2
-rw-r--r--plugins/check_overcr.c2
-rw-r--r--plugins/check_real.c8
-rw-r--r--plugins/check_smtp.c10
-rw-r--r--plugins/check_swap.c4
-rw-r--r--plugins/check_tcp.c16
-rw-r--r--plugins/check_time.c16
-rw-r--r--plugins/check_udp.c6
-rw-r--r--po/POTFILES.in1
16 files changed, 42 insertions, 39 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index feccd00..b87154d 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -21,7 +21,7 @@ check_tcp_programs = check_ftp check_imap check_nntp check_pop check_udp2 \
21 21
22EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \ 22EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
23 check_swap check_fping check_ldap check_game check_dig \ 23 check_swap check_fping check_ldap check_game check_dig \
24 check_nagios check_by_ssh check_dns check_nt check_ide-smart check_procs 24 check_nagios check_by_ssh check_dns check_nt check_ide_smart check_procs
25 25
26EXTRA_DIST = t utils.c netutils.c popen.c utils.h netutils.h popen.h common.h \ 26EXTRA_DIST = t utils.c netutils.c popen.c utils.h netutils.h popen.h common.h \
27 getaddrinfo.c getaddrinfo.h gethostbyname.c gethostbyname.h 27 getaddrinfo.c getaddrinfo.h gethostbyname.c gethostbyname.h
@@ -76,6 +76,7 @@ check_udp_LDADD = $(NETLIBS)
76check_ups_LDADD = $(NETLIBS) 76check_ups_LDADD = $(NETLIBS)
77check_users_LDADD = $(BASEOBJS) popen.o 77check_users_LDADD = $(BASEOBJS) popen.o
78check_by_ssh_LDADD = $(NETLIBS) popen.o 78check_by_ssh_LDADD = $(NETLIBS) popen.o
79check_ide_smart_LDADD = $(BASEOBJS)
79negate_LDADD = $(BASEOBJS) popen.o 80negate_LDADD = $(BASEOBJS) popen.o
80urlize_LDADD = $(BASEOBJS) popen.o 81urlize_LDADD = $(BASEOBJS) popen.o
81 82
@@ -111,6 +112,7 @@ check_udp_DEPENDENCIES = check_udp.c $(NETOBJS) $(DEPLIBS)
111check_ups_DEPENDENCIES = check_ups.c $(NETOBJS) $(DEPLIBS) 112check_ups_DEPENDENCIES = check_ups.c $(NETOBJS) $(DEPLIBS)
112check_users_DEPENDENCIES = check_users.c $(BASEOBJS) popen.o $(DEPLIBS) 113check_users_DEPENDENCIES = check_users.c $(BASEOBJS) popen.o $(DEPLIBS)
113check_by_ssh_DEPENDENCIES = check_by_ssh.c $(NETOBJS) popen.o $(DEPLIBS) 114check_by_ssh_DEPENDENCIES = check_by_ssh.c $(NETOBJS) popen.o $(DEPLIBS)
115check_ide_smart_DEPENDENCIES = check_ide_smart.c $(BASEOBJS) $(DEPLIBS)
114negate_DEPENDENCIES = negate.c $(BASEOBJS) popen.o $(DEPLIBS) 116negate_DEPENDENCIES = negate.c $(BASEOBJS) popen.o $(DEPLIBS)
115urlize_DEPENDENCIES = urlize.c $(BASEOBJS) popen.o $(DEPLIBS) 117urlize_DEPENDENCIES = urlize.c $(BASEOBJS) popen.o $(DEPLIBS)
116check_icmp_DEPENDENCIES = check_icmp.c $(DEPLIBS) 118check_icmp_DEPENDENCIES = check_icmp.c $(DEPLIBS)
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 6d0f4c2..d34b267 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -411,5 +411,5 @@ print_usage (void)
411{ 411{
412 printf ("\n\ 412 printf ("\n\
413Usage: %s [-f46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n\ 413Usage: %s [-f46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n\
414 [-n name] [-s servicelist] [-O outputfile] [-p port]\n", progname); 414 [-n name] [-s servicelist] [-O outputfile] [-p port]\n", progname);
415} 415}
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 3907186..a44d578 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -355,6 +355,6 @@ print_usage (void)
355{ 355{
356 printf ("\ 356 printf ("\
357Usage: %s -H host -l lookup [-p <server port>] [-T <query type>]\n\ 357Usage: %s -H host -l lookup [-p <server port>] [-T <query type>]\n\
358 [-w <warning interval>] [-c <critical interval>] [-t <timeout>]\n\ 358 [-w <warning interval>] [-c <critical interval>] [-t <timeout>]\n\
359 [-a <expected answer address>] [-v]\n", progname); 359 [-a <expected answer address>] [-v]\n", progname);
360} 360}
diff --git a/plugins/check_http.c b/plugins/check_http.c
index c0b18fc..6f8ad9a 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -1496,5 +1496,5 @@ Usage: %s -H <vhost> | -I <IP-address>) [-u <uri>] [-p <port>]\n\
1496 [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\ 1496 [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\
1497 [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n\ 1497 [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n\
1498 [-P string] [-m min_pg_size] [-4|-6] [-N] [-M <age>]\n\ 1498 [-P string] [-m min_pg_size] [-4|-6] [-N] [-M <age>]\n\
1499 [-A string] [-k string]\n"), progname); 1499 [-A string] [-k string]\n"), progname);
1500} 1500}
diff --git a/plugins/check_ide-smart.c b/plugins/check_ide_smart.c
index 1c0af31..1c0af31 100644
--- a/plugins/check_ide-smart.c
+++ b/plugins/check_ide_smart.c
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index f895321..bd37aef 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -378,5 +378,5 @@ print_usage (void)
378 printf ("\ 378 printf ("\
379Usage: %s -F log_file -a <AVG | MAX> -v variable -w warning -c critical\n\ 379Usage: %s -F log_file -a <AVG | MAX> -v variable -w warning -c critical\n\
380 [-l label] [-u units] [-e expire_minutes] [-t timeout]\n\ 380 [-l label] [-u units] [-e expire_minutes] [-t timeout]\n\
381 [-v]\n", progname); 381 [-v]\n", progname);
382} 382}
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 03a7c5d..e52b5a2 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -688,5 +688,5 @@ void print_usage(void)
688{ 688{
689 printf("\ 689 printf("\
690Usage: %s -H host -v variable [-p port] [-w warning] [-c critical]\n\ 690Usage: %s -H host -v variable [-p port] [-w warning] [-c critical]\n\
691 [-l params] [-d SHOWALL] [-t timeout]\n", progname); 691 [-l params] [-d SHOWALL] [-t timeout]\n", progname);
692} 692}
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 53e3f1d..d8913bc 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -989,5 +989,5 @@ void print_usage(void)
989{ 989{
990 printf ("\ 990 printf ("\
991Usage: %s -H host [-p port] [-v variable] [-w warning] [-c critical]\n\ 991Usage: %s -H host [-p port] [-v variable] [-w warning] [-c critical]\n\
992 [-t timeout].\n", progname); 992 [-t timeout].\n", progname);
993} 993}
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 756402b..9bf40d3 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -465,5 +465,5 @@ print_usage (void)
465{ 465{
466 printf ("\ 466 printf ("\
467Usage: %s -H host [-p port] [-v variable] [-w warning] [-c critical]\n\ 467Usage: %s -H host [-p port] [-v variable] [-w warning] [-c critical]\n\
468 [-t timeout]\n", progname); 468 [-t timeout]\n", progname);
469} 469}
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 492848c..3042465 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -312,7 +312,7 @@ process_arguments (int argc, char **argv)
312 server_port = atoi (optarg); 312 server_port = atoi (optarg);
313 } 313 }
314 else { 314 else {
315 usage (_("Port must be a positive integer\n")); 315 usage4 (_("Port must be a positive integer"));
316 } 316 }
317 break; 317 break;
318 case 'w': /* warning time threshold */ 318 case 'w': /* warning time threshold */
@@ -321,7 +321,7 @@ process_arguments (int argc, char **argv)
321 check_warning_time = TRUE; 321 check_warning_time = TRUE;
322 } 322 }
323 else { 323 else {
324 usage (_("Warning time must be a positive integer\n")); 324 usage4 (_("Warning time must be a positive integer"));
325 } 325 }
326 break; 326 break;
327 case 'c': /* critical time threshold */ 327 case 'c': /* critical time threshold */
@@ -330,7 +330,7 @@ process_arguments (int argc, char **argv)
330 check_critical_time = TRUE; 330 check_critical_time = TRUE;
331 } 331 }
332 else { 332 else {
333 usage (_("Critical time must be a nonnegative integer\n")); 333 usage4 (_("Critical time must be a nonnegative integer"));
334 } 334 }
335 break; 335 break;
336 case 'v': /* verbose */ 336 case 'v': /* verbose */
@@ -341,7 +341,7 @@ process_arguments (int argc, char **argv)
341 socket_timeout = atoi (optarg); 341 socket_timeout = atoi (optarg);
342 } 342 }
343 else { 343 else {
344 usage (_("Time interval must be a nonnegative integer\n")); 344 usage4 (_("Time interval must be a nonnegative integer"));
345 } 345 }
346 break; 346 break;
347 case 'V': /* version */ 347 case 'V': /* version */
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index f12b69e..ab1b950 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -295,7 +295,7 @@ process_arguments (int argc, char **argv)
295 if (is_intpos (optarg)) 295 if (is_intpos (optarg))
296 server_port = atoi (optarg); 296 server_port = atoi (optarg);
297 else 297 else
298 usage (_("Port must be a positive integer\n")); 298 usage4 (_("Port must be a positive integer"));
299 break; 299 break;
300 case 'f': /* from argument */ 300 case 'f': /* from argument */
301 from_arg = optarg; 301 from_arg = optarg;
@@ -330,7 +330,7 @@ process_arguments (int argc, char **argv)
330 check_critical_time = TRUE; 330 check_critical_time = TRUE;
331 } 331 }
332 else { 332 else {
333 usage (_("Critical time must be a positive integer\n")); 333 usage4 (_("Critical time must be a positive integer"));
334 } 334 }
335 break; 335 break;
336 case 'w': /* warning time threshold */ 336 case 'w': /* warning time threshold */
@@ -339,7 +339,7 @@ process_arguments (int argc, char **argv)
339 check_warning_time = TRUE; 339 check_warning_time = TRUE;
340 } 340 }
341 else { 341 else {
342 usage (_("Warning time must be a positive integer\n")); 342 usage4 (_("Warning time must be a positive integer"));
343 } 343 }
344 break; 344 break;
345 case 'v': /* verbose */ 345 case 'v': /* verbose */
@@ -350,7 +350,7 @@ process_arguments (int argc, char **argv)
350 socket_timeout = atoi (optarg); 350 socket_timeout = atoi (optarg);
351 } 351 }
352 else { 352 else {
353 usage (_("Time interval must be a positive integer\n")); 353 usage4 (_("Time interval must be a positive integer"));
354 } 354 }
355 break; 355 break;
356 case '4': 356 case '4':
@@ -360,7 +360,7 @@ process_arguments (int argc, char **argv)
360#ifdef USE_IPV6 360#ifdef USE_IPV6
361 address_family = AF_INET6; 361 address_family = AF_INET6;
362#else 362#else
363 usage (_("IPv6 support not available\n")); 363 usage4 (_("IPv6 support not available"));
364#endif 364#endif
365 break; 365 break;
366 case 'V': /* version */ 366 case 'V': /* version */
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index ba353bc..3067f85 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -515,6 +515,6 @@ void
515print_usage (void) 515print_usage (void)
516{ 516{
517 printf ("\ 517 printf ("\
518 Usage: %s [-av] -w <percent_free>%% -c <percent_free>%%\n\ 518Usage: %s [-av] -w <percent_free>%% -c <percent_free>%%\n\
519 %s [-av] -w <bytes_free> -c <bytes_free>\n", progname, progname); 519 %s [-av] -w <bytes_free> -c <bytes_free>\n", progname, progname);
520} 520}
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 418438a..ce57631 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -474,7 +474,7 @@ process_arguments (int argc, char **argv)
474#ifdef USE_IPV6 474#ifdef USE_IPV6
475 address_family = AF_INET6; 475 address_family = AF_INET6;
476#else 476#else
477 usage (_("IPv6 support not available\n")); 477 usage4 (_("IPv6 support not available"));
478#endif 478#endif
479 break; 479 break;
480 case 'H': /* hostname */ 480 case 'H': /* hostname */
@@ -484,7 +484,7 @@ process_arguments (int argc, char **argv)
484 break; 484 break;
485 case 'c': /* critical */ 485 case 'c': /* critical */
486 if (!is_intnonneg (optarg)) 486 if (!is_intnonneg (optarg))
487 usage (_("Critical threshold must be a positive integer\n")); 487 usage4 (_("Critical threshold must be a positive integer"));
488 else 488 else
489 critical_time = strtod (optarg, NULL); 489 critical_time = strtod (optarg, NULL);
490 check_critical_time = TRUE; 490 check_critical_time = TRUE;
@@ -494,7 +494,7 @@ process_arguments (int argc, char **argv)
494 break; 494 break;
495 case 'w': /* warning */ 495 case 'w': /* warning */
496 if (!is_intnonneg (optarg)) 496 if (!is_intnonneg (optarg))
497 usage (_("Warning threshold must be a positive integer\n")); 497 usage4 (_("Warning threshold must be a positive integer"));
498 else 498 else
499 warning_time = strtod (optarg, NULL); 499 warning_time = strtod (optarg, NULL);
500 check_warning_time = TRUE; 500 check_warning_time = TRUE;
@@ -509,13 +509,13 @@ process_arguments (int argc, char **argv)
509 break; 509 break;
510 case 't': /* timeout */ 510 case 't': /* timeout */
511 if (!is_intpos (optarg)) 511 if (!is_intpos (optarg))
512 usage (_("Timeout interval must be a positive integer\n")); 512 usage4 (_("Timeout interval must be a positive integer"));
513 else 513 else
514 socket_timeout = atoi (optarg); 514 socket_timeout = atoi (optarg);
515 break; 515 break;
516 case 'p': /* port */ 516 case 'p': /* port */
517 if (!is_intpos (optarg)) 517 if (!is_intpos (optarg))
518 usage (_("Port must be a positive integer\n")); 518 usage4 (_("Port must be a positive integer"));
519 else 519 else
520 server_port = atoi (optarg); 520 server_port = atoi (optarg);
521 break; 521 break;
@@ -532,7 +532,7 @@ process_arguments (int argc, char **argv)
532 break; 532 break;
533 case 'm': 533 case 'm':
534 if (!is_intpos (optarg)) 534 if (!is_intpos (optarg))
535 usage (_("Maxbytes must be a positive integer\n")); 535 usage4 (_("Maxbytes must be a positive integer"));
536 else 536 else
537 maxbytes = atoi (optarg); 537 maxbytes = atoi (optarg);
538 case 'q': 538 case 'q':
@@ -546,13 +546,13 @@ process_arguments (int argc, char **argv)
546 else if (!strncmp(optarg,"crit",4)) 546 else if (!strncmp(optarg,"crit",4))
547 econn_refuse_state = STATE_CRITICAL; 547 econn_refuse_state = STATE_CRITICAL;
548 else 548 else
549 usage (_("Refuse must be one of ok, warn, crit\n")); 549 usage4 (_("Refuse must be one of ok, warn, crit"));
550 break; 550 break;
551 case 'd': 551 case 'd':
552 if (is_intpos (optarg)) 552 if (is_intpos (optarg))
553 delay = atoi (optarg); 553 delay = atoi (optarg);
554 else 554 else
555 usage (_("Delay must be a positive integer\n")); 555 usage4 (_("Delay must be a positive integer"));
556 break; 556 break;
557 case 'D': /* Check SSL cert validity - days 'til certificate expiration */ 557 case 'D': /* Check SSL cert validity - days 'til certificate expiration */
558#ifdef HAVE_SSL 558#ifdef HAVE_SSL
diff --git a/plugins/check_time.c b/plugins/check_time.c
index dae2dd5..63d7ee2 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -241,11 +241,11 @@ process_arguments (int argc, char **argv)
241 check_warning_time = TRUE; 241 check_warning_time = TRUE;
242 } 242 }
243 else { 243 else {
244 usage (_("Warning thresholds must be a positive integer\n")); 244 usage4 (_("Warning thresholds must be a positive integer"));
245 } 245 }
246 } 246 }
247 else { 247 else {
248 usage (_("Warning threshold must be a positive integer\n")); 248 usage4 (_("Warning threshold must be a positive integer"));
249 } 249 }
250 break; 250 break;
251 case 'c': /* critical-variance */ 251 case 'c': /* critical-variance */
@@ -260,30 +260,30 @@ process_arguments (int argc, char **argv)
260 check_critical_time = TRUE; 260 check_critical_time = TRUE;
261 } 261 }
262 else { 262 else {
263 usage (_("Critical thresholds must be a positive integer\n")); 263 usage4 (_("Critical thresholds must be a positive integer"));
264 } 264 }
265 } 265 }
266 else { 266 else {
267 usage (_("Critical threshold must be a positive integer\n")); 267 usage4 (_("Critical threshold must be a positive integer"));
268 } 268 }
269 break; 269 break;
270 case 'W': /* warning-connect */ 270 case 'W': /* warning-connect */
271 if (!is_intnonneg (optarg)) 271 if (!is_intnonneg (optarg))
272 usage (_("Warning threshold must be a positive integer\n")); 272 usage4 (_("Warning threshold must be a positive integer"));
273 else 273 else
274 warning_time = atoi (optarg); 274 warning_time = atoi (optarg);
275 check_warning_time = TRUE; 275 check_warning_time = TRUE;
276 break; 276 break;
277 case 'C': /* critical-connect */ 277 case 'C': /* critical-connect */
278 if (!is_intnonneg (optarg)) 278 if (!is_intnonneg (optarg))
279 usage (_("Critical threshold must be a positive integer\n")); 279 usage4 (_("Critical threshold must be a positive integer"));
280 else 280 else
281 critical_time = atoi (optarg); 281 critical_time = atoi (optarg);
282 check_critical_time = TRUE; 282 check_critical_time = TRUE;
283 break; 283 break;
284 case 'p': /* port */ 284 case 'p': /* port */
285 if (!is_intnonneg (optarg)) 285 if (!is_intnonneg (optarg))
286 usage (_("Port must be a positive integer\n")); 286 usage4 (_("Port must be a positive integer"));
287 else 287 else
288 server_port = atoi (optarg); 288 server_port = atoi (optarg);
289 break; 289 break;
@@ -306,7 +306,7 @@ process_arguments (int argc, char **argv)
306 server_address = argv[c]; 306 server_address = argv[c];
307 } 307 }
308 else { 308 else {
309 usage (_("Hostname was not supplied\n")); 309 usage4 (_("Hostname was not supplied"));
310 } 310 }
311 } 311 }
312 312
diff --git a/plugins/check_udp.c b/plugins/check_udp.c
index aa8be1c..b79f31f 100644
--- a/plugins/check_udp.c
+++ b/plugins/check_udp.c
@@ -165,14 +165,14 @@ process_arguments (int argc, char **argv)
165 break; 165 break;
166 case 'c': /* critical */ 166 case 'c': /* critical */
167 if (!is_intnonneg (optarg)) 167 if (!is_intnonneg (optarg))
168 usage (_("Critical threshold must be a positive integer\n")); 168 usage4 (_("Critical threshold must be a positive integer"));
169 else 169 else
170 critical_time = atoi (optarg); 170 critical_time = atoi (optarg);
171 check_critical_time = TRUE; 171 check_critical_time = TRUE;
172 break; 172 break;
173 case 'w': /* warning */ 173 case 'w': /* warning */
174 if (!is_intnonneg (optarg)) 174 if (!is_intnonneg (optarg))
175 usage (_("Warning threshold must be a positive integer\n")); 175 usage4 (_("Warning threshold must be a positive integer"));
176 else 176 else
177 warning_time = atoi (optarg); 177 warning_time = atoi (optarg);
178 check_warning_time = TRUE; 178 check_warning_time = TRUE;
@@ -185,7 +185,7 @@ process_arguments (int argc, char **argv)
185 break; 185 break;
186 case 'p': /* port */ 186 case 'p': /* port */
187 if (!is_intnonneg (optarg)) 187 if (!is_intnonneg (optarg))
188 usage (_("Port must be a positive integer\n")); 188 usage4 (_("Port must be a positive integer"));
189 else 189 else
190 server_port = atoi (optarg); 190 server_port = atoi (optarg);
191 break; 191 break;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 993bd90..51a84c7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -31,6 +31,7 @@ plugins/check_time.c
31plugins/check_udp.c 31plugins/check_udp.c
32plugins/check_ups.c 32plugins/check_ups.c
33plugins/check_users.c 33plugins/check_users.c
34plugins/check_ide_smart.c
34plugins/getaddrinfo.c 35plugins/getaddrinfo.c
35plugins/gethostbyname.c 36plugins/gethostbyname.c
36plugins/negate.c 37plugins/negate.c