[Nagiosplug-checkins] CVS: nagiosplug/plugins check_dns.c,1.14,1.15
Karl DeBisschop
kdebisschop at users.sourceforge.net
Thu Jul 31 05:07:06 CEST 2003
Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv32658/plugins
Modified Files:
check_dns.c
Log Message:
mark for translation (note problem here - it relies on tranalation in underlying utility, which has a high chance of failing)
Index: check_dns.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dns.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** check_dns.c 31 May 2003 14:39:21 -0000 1.14
--- check_dns.c 31 Jul 2003 12:06:38 -0000 1.15
***************
*** 48,60 ****
#include "popen.h"
#include "utils.h"
const char *progname = "check_dns";
! #define REVISION "$Revision$"
! #define COPYRIGHT "2000-2002"
int process_arguments (int, char **);
int validate_arguments (void);
- void print_usage (void);
- void print_help (void);
int error_scan (char *);
--- 48,98 ----
#include "popen.h"
#include "utils.h"
+ #include "netutils.h"
const char *progname = "check_dns";
! const char *revision = "$Revision$";
! const char *copyright = "2000-2003";
! const char *email = "nagiosplug-devel at lists.sourceforge.net";
!
! void
! print_usage (void)
! {
! printf (_("\
! Usage: %s -H host [-s server] [-a expected-address] [-t timeout]\n\
! %s --help\n\
! %s --version\n"),
! progname, progname, progname);
! }
!
! void
! print_help (void)
! {
! print_revision (progname, revision);
!
! printf (_(COPYRIGHT), copyright, email);
!
! print_usage ();
!
! printf (_(HELP_VRSN));
!
! printf (_("\
! -H, --hostname=HOST\n\
! The name or address you want to query\n\
! -s, --server=HOST\n\
! Optional DNS server you want to use for the lookup\n\
! -a, --expected-address=IP-ADDRESS\n\
! Optional IP address you expect the DNS server to return\n"));
!
! printf (_(TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
!
! printf (_("\n\
! This plugin uses the nslookup program to obtain the IP address\n\
! for the given host/domain query. A optional DNS server to use may\n\
! be specified. If no DNS server is specified, the default server(s)\n\
! specified in /etc/resolv.conf will be used.\n"));
! }
int process_arguments (int, char **);
int validate_arguments (void);
int error_scan (char *);
***************
*** 82,86 ****
/* Set signal handling and alarm */
if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
! printf ("Cannot catch SIGALRM");
return STATE_UNKNOWN;
}
--- 120,124 ----
/* Set signal handling and alarm */
if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
! printf (_("Cannot catch SIGALRM"));
return STATE_UNKNOWN;
}
***************
*** 102,106 ****
child_process = spopen (command_line);
if (child_process == NULL) {
! printf ("Could not open pipe: %s\n", command_line);
return STATE_UNKNOWN;
}
--- 140,144 ----
child_process = spopen (command_line);
if (child_process == NULL) {
! printf (_("Could not open pipe: %s\n"), command_line);
return STATE_UNKNOWN;
}
***************
*** 108,112 ****
child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
if (child_stderr == NULL)
! printf ("Could not open stderr for %s\n", command_line);
/* scan stdout */
--- 146,150 ----
child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
if (child_stderr == NULL)
! printf (_("Could not open stderr for %s\n"), command_line);
/* scan stdout */
***************
*** 120,124 ****
address = strscpy (address, temp_buffer + 7);
else {
! output = strscpy (output, "Unknown error (plugin)");
result = STATE_WARNING;
}
--- 158,162 ----
address = strscpy (address, temp_buffer + 7);
else {
! output = strscpy (output, _("Unknown error (plugin)"));
result = STATE_WARNING;
}
***************
*** 144,153 ****
if (address==NULL || strlen(address)==0)
terminate (STATE_CRITICAL,
! "DNS CRITICAL - '%s' returned empty host name string\n",
! NSLOOKUP_COMMAND);
result = STATE_OK;
}
else {
! output = strdup ("Unknown error (plugin)");
result = STATE_WARNING;
}
--- 182,191 ----
if (address==NULL || strlen(address)==0)
terminate (STATE_CRITICAL,
! _("DNS CRITICAL - '%s' returned empty host name string\n"),
! NSLOOKUP_COMMAND);
result = STATE_OK;
}
else {
! output = strdup (_("Unknown error (plugin)"));
result = STATE_WARNING;
}
***************
*** 181,198 ****
result = max_state (result, STATE_WARNING);
if (!strcmp (output, ""))
! output = strscpy (output, "nslookup returned error status");
}
/* If we got here, we should have an address string,
! and we can segfault if we do not */
if (address==NULL || strlen(address)==0)
terminate (STATE_CRITICAL,
! "DNS CRITICAL - '%s' output parsing exited with no address\n",
! NSLOOKUP_COMMAND);
/* compare to expected address */
if (result == STATE_OK && match_expected_address && strcmp(address, expected_address)) {
result = STATE_CRITICAL;
! asprintf(&output, "expected %s but got %s", expected_address, address);
}
--- 219,236 ----
result = max_state (result, STATE_WARNING);
if (!strcmp (output, ""))
! output = strscpy (output, _("nslookup returned error status"));
}
/* If we got here, we should have an address string,
! and we can segfault if we do not */
if (address==NULL || strlen(address)==0)
terminate (STATE_CRITICAL,
! _("DNS CRITICAL - '%s' output parsing exited with no address\n"),
! NSLOOKUP_COMMAND);
/* compare to expected address */
if (result == STATE_OK && match_expected_address && strcmp(address, expected_address)) {
result = STATE_CRITICAL;
! asprintf(&output, _("expected %s but got %s"), expected_address, address);
}
***************
*** 205,220 ****
multi_address = TRUE;
! printf ("DNS ok - %.3f seconds response time, address%s %s|time=%.3f\n",
! elapsed_time, (multi_address==TRUE ? "es are" : " is"), address, elapsed_time);
}
else if (result == STATE_WARNING)
! printf ("DNS WARNING - %s\n",
! !strcmp (output, "") ? " Probably a non-existent host/domain" : output);
else if (result == STATE_CRITICAL)
! printf ("DNS CRITICAL - %s\n",
! !strcmp (output, "") ? " Probably a non-existent host/domain" : output);
else
! printf ("DNS problem - %s\n",
! !strcmp (output, "") ? " Probably a non-existent host/domain" : output);
return result;
--- 243,258 ----
multi_address = TRUE;
! printf (_("DNS ok - %.3f seconds response time, address%s %s|time=%.3f\n"),
! elapsed_time, (multi_address==TRUE ? "es are" : " is"), address, elapsed_time);
}
else if (result == STATE_WARNING)
! printf (_("DNS WARNING - %s\n"),
! !strcmp (output, "") ? _(" Probably a non-existent host/domain") : output);
else if (result == STATE_CRITICAL)
! printf (_("DNS CRITICAL - %s\n"),
! !strcmp (output, "") ? _(" Probably a non-existent host/domain") : output);
else
! printf (_("DNS problem - %s\n"),
! !strcmp (output, "") ? _(" Probably a non-existent host/domain") : output);
return result;
***************
*** 226,253 ****
/* the DNS lookup timed out */
! if (strstr (input_buffer,
! "Note: nslookup is deprecated and may be removed from future releases.")
! || strstr (input_buffer,
! "Consider using the `dig' or `host' programs instead. Run nslookup with")
! || strstr (input_buffer,
! "the `-sil[ent]' option to prevent this message from appearing."))
return STATE_OK;
/* the DNS lookup timed out */
! else if (strstr (input_buffer, "Timed out"))
return STATE_WARNING;
/* DNS server is not running... */
! else if (strstr (input_buffer, "No response from server"))
return STATE_CRITICAL;
/* Host name is valid, but server doesn't have records... */
! else if (strstr (input_buffer, "No records"))
return STATE_WARNING;
/* Host or domain name does not exist */
! else if (strstr (input_buffer, "Non-existent"))
return STATE_CRITICAL;
! else if (strstr (input_buffer, "** server can't find"))
return STATE_CRITICAL;
else if(strstr(input_buffer,"NXDOMAIN")) /* 9.x */
--- 264,288 ----
/* the DNS lookup timed out */
! if (strstr (input_buffer, _("Note: nslookup is deprecated and may be removed from future releases.")) ||
! strstr (input_buffer, _("Consider using the `dig' or `host' programs instead. Run nslookup with")) ||
! strstr (input_buffer, _("the `-sil[ent]' option to prevent this message from appearing.")))
return STATE_OK;
/* the DNS lookup timed out */
! else if (strstr (input_buffer, _("Timed out")))
return STATE_WARNING;
/* DNS server is not running... */
! else if (strstr (input_buffer, _("No response from server")))
return STATE_CRITICAL;
/* Host name is valid, but server doesn't have records... */
! else if (strstr (input_buffer, _("No records")))
return STATE_WARNING;
/* Host or domain name does not exist */
! else if (strstr (input_buffer, _("Non-existent")))
return STATE_CRITICAL;
! else if (strstr (input_buffer, _("** server can't find")))
return STATE_CRITICAL;
else if(strstr(input_buffer,"NXDOMAIN")) /* 9.x */
***************
*** 255,275 ****
/* Connection was refused */
! else if (strstr (input_buffer, "Connection refused"))
return STATE_CRITICAL;
/* Network is unreachable */
! else if (strstr (input_buffer, "Network is unreachable"))
return STATE_CRITICAL;
/* Internal server failure */
! else if (strstr (input_buffer, "Server failure"))
return STATE_CRITICAL;
/* DNS server refused to service request */
! else if (strstr (input_buffer, "Refused"))
return STATE_CRITICAL;
/* Request error */
! else if (strstr (input_buffer, "Format error"))
return STATE_WARNING;
--- 290,310 ----
/* Connection was refused */
! else if (strstr (input_buffer, _("Connection refused")))
return STATE_CRITICAL;
/* Network is unreachable */
! else if (strstr (input_buffer, _("Network is unreachable")))
return STATE_CRITICAL;
/* Internal server failure */
! else if (strstr (input_buffer, _("Server failure")))
return STATE_CRITICAL;
/* DNS server refused to service request */
! else if (strstr (input_buffer, _("Refused")))
return STATE_CRITICAL;
/* Request error */
! else if (strstr (input_buffer, _("Format error")))
return STATE_WARNING;
***************
*** 313,317 ****
switch (c) {
case '?': /* args not parsable */
! printf ("%s: Unknown argument: %s\n\n", progname, optarg);
print_usage ();
exit (STATE_UNKNOWN);
--- 348,352 ----
switch (c) {
case '?': /* args not parsable */
! printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
print_usage ();
exit (STATE_UNKNOWN);
***************
*** 320,324 ****
exit (STATE_OK);
case 'V': /* version */
! print_revision (progname, REVISION);
exit (STATE_OK);
case 'v': /* version */
--- 355,359 ----
exit (STATE_OK);
case 'V': /* version */
! print_revision (progname, revision);
exit (STATE_OK);
case 'v': /* version */
***************
*** 330,334 ****
case 'H': /* hostname */
if (strlen (optarg) >= ADDRESS_LENGTH)
! terminate (STATE_UNKNOWN, "Input buffer overflow\n");
strcpy (query_address, optarg);
break;
--- 365,369 ----
case 'H': /* hostname */
if (strlen (optarg) >= ADDRESS_LENGTH)
! terminate (STATE_UNKNOWN, _("Input buffer overflow\n"));
strcpy (query_address, optarg);
break;
***************
*** 337,346 ****
response matches */
if (is_host (optarg) == FALSE) {
! printf ("Invalid server name/address\n\n");
print_usage ();
exit (STATE_UNKNOWN);
}
if (strlen (optarg) >= ADDRESS_LENGTH)
! terminate (STATE_UNKNOWN, "Input buffer overflow\n");
strcpy (dns_server, optarg);
break;
--- 372,381 ----
response matches */
if (is_host (optarg) == FALSE) {
! printf (_("Invalid server name/address\n\n"));
print_usage ();
exit (STATE_UNKNOWN);
}
if (strlen (optarg) >= ADDRESS_LENGTH)
! terminate (STATE_UNKNOWN, _("Input buffer overflow\n"));
strcpy (dns_server, optarg);
break;
***************
*** 348,362 ****
/* TODO: Is this is_host necessary? */
if (is_host (optarg) == FALSE) {
! printf ("Invalid host name/address\n\n");
print_usage ();
exit (STATE_UNKNOWN);
}
if (strlen (optarg) >= ADDRESS_LENGTH)
! terminate (STATE_UNKNOWN, "Input buffer overflow\n");
strcpy (ptr_server, optarg);
break;
case 'a': /* expected address */
if (strlen (optarg) >= ADDRESS_LENGTH)
! terminate (STATE_UNKNOWN, "Input buffer overflow\n");
strcpy (expected_address, optarg);
match_expected_address = TRUE;
--- 383,397 ----
/* TODO: Is this is_host necessary? */
if (is_host (optarg) == FALSE) {
! printf (_("Invalid host name/address\n\n"));
print_usage ();
exit (STATE_UNKNOWN);
}
if (strlen (optarg) >= ADDRESS_LENGTH)
! terminate (STATE_UNKNOWN, _("Input buffer overflow\n"));
strcpy (ptr_server, optarg);
break;
case 'a': /* expected address */
if (strlen (optarg) >= ADDRESS_LENGTH)
! terminate (STATE_UNKNOWN, _("Input buffer overflow\n"));
strcpy (expected_address, optarg);
match_expected_address = TRUE;
***************
*** 368,372 ****
if (strlen(query_address)==0 && c<argc) {
if (strlen(argv[c])>=ADDRESS_LENGTH)
! terminate (STATE_UNKNOWN, "Input buffer overflow\n");
strcpy (query_address, argv[c++]);
}
--- 403,407 ----
if (strlen(query_address)==0 && c<argc) {
if (strlen(argv[c])>=ADDRESS_LENGTH)
! terminate (STATE_UNKNOWN, _("Input buffer overflow\n"));
strcpy (query_address, argv[c++]);
}
***************
*** 375,383 ****
/* TODO: See -s option */
if (is_host(argv[c]) == FALSE) {
! printf ("Invalid name/address: %s\n\n", argv[c]);
return ERROR;
}
if (strlen(argv[c]) >= ADDRESS_LENGTH)
! terminate (STATE_UNKNOWN, "Input buffer overflow\n");
strcpy (dns_server, argv[c++]);
}
--- 410,418 ----
/* TODO: See -s option */
if (is_host(argv[c]) == FALSE) {
! printf (_("Invalid name/address: %s\n\n"), argv[c]);
return ERROR;
}
if (strlen(argv[c]) >= ADDRESS_LENGTH)
! terminate (STATE_UNKNOWN, _("Input buffer overflow\n"));
strcpy (dns_server, argv[c++]);
}
***************
*** 393,429 ****
else
return OK;
- }
-
- void
- print_usage (void)
- {
- printf ("Usage: %s -H host [-s server] [-a expected-address] [-t timeout]\n" " %s --help\n"
- " %s --version\n", progname, progname, progname);
- }
-
- void
- print_help (void)
- {
- print_revision (progname, REVISION);
- printf ("Copyright (c) 1999 Ethan Galstad (nagios at nagios.org)\n\n");
- print_usage ();
- printf
- ("\nOptions:\n"
- "-H, --hostname=HOST\n"
- " The name or address you want to query\n"
- "-s, --server=HOST\n"
- " Optional DNS server you want to use for the lookup\n"
- "-a, --expected-address=IP-ADDRESS\n"
- " Optional IP address you expect the DNS server to return\n"
- "-t, --timeout=INTEGER\n"
- " Seconds before connection times out (default: %d)\n"
- "-h, --help\n"
- " Print detailed help\n"
- "-V, --version\n"
- " Print version numbers and license information\n"
- "\n"
- "This plugin uses the nslookup program to obtain the IP address\n"
- "for the given host/domain query. A optional DNS server to use may\n"
- "be specified. If no DNS server is specified, the default server(s)\n"
- "specified in /etc/resolv.conf will be used.\n", DEFAULT_SOCKET_TIMEOUT);
}
--- 428,430 ----
More information about the Commits
mailing list