![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 92a5eda89366d7e63b65a1b9472b150b2140cc85..4394490e8723ea0fe31c2a0a5d71ca1b0eb022b4 100644 (file)
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ $Id$
+
*****************************************************************************/
+const char *progname = "check_dig";
+const char *revision = "$Revision$";
+const char *copyright = "2002-2004";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
#include "common.h"
#include "netutils.h"
#include "utils.h"
void print_help (void);
void print_usage (void);
-const char *progname = "check_dig";
-const char *revision = "$Revision$";
-const char *copyright = "2002-2003";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
-
enum {
UNDEFINED = 0,
DEFAULT_PORT = 53
char input_buffer[MAX_INPUT_BUFFER];
char *command_line;
char *output;
+ char *t;
long microsec;
double elapsed_time;
int result = STATE_UNKNOWN;
/* Set signal handling and alarm */
if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR)
- usage (_("Cannot catch SIGALRM\n"));
+ usage4 (_("Cannot catch SIGALRM"));
- if (process_arguments (argc, argv) != OK)
- usage (_("Could not parse arguments\n"));
+ if (process_arguments (argc, argv) == ERROR)
+ usage4 (_("Could not parse arguments"));
/* get the command to run */
asprintf (&command_line, "%s @%s -p %d %s -t %s",
if (verbose) {
printf ("%s\n", command_line);
if(expected_address != NULL) {
- printf ("Looking for: '%s'\n", expected_address);
+ printf (_("Looking for: '%s'\n"), expected_address);
} else {
- printf ("Looking for: '%s'\n", query_address);
+ printf (_("Looking for: '%s'\n"), query_address);
}
}
result = STATE_OK;
}
+ /* Translate output TAB -> SPACE */
+ t = output;
+ while ((t = index(t, '\t')) != NULL)
+ *t = ' ';
+
} while (!strstr (input_buffer, ";; "));
if (result == STATE_UNKNOWN) {
asprintf (&output, _("Server not found in ANSWER SECTION"));
result = STATE_WARNING;
}
-
}
}
if (spclose (child_process)) {
result = max_state (result, STATE_WARNING);
if (strlen (output) == 0)
- asprintf (&output, _("dig returned error status"));
+ asprintf (&output, _("dig returned an error status"));
}
microsec = deltime (tv);
-
-
-\f
/* process command-line arguments */
int
process_arguments (int argc, char **argv)
switch (c) {
case '?': /* help */
- usage3 (_("Unknown argument"), optopt);
+ usage2 (_("Unknown argument"), optarg);
case 'h': /* help */
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, "$Revision$");
+ print_revision (progname, revision);
exit (STATE_OK);
case 'H': /* hostname */
if (is_host (optarg)) {
dns_server = optarg;
}
else {
- usage2 (_("Invalid host name"), optarg);
+ usage2 (_("Invalid hostname/address"), optarg);
}
break;
case 'p': /* server port */
server_port = atoi (optarg);
}
else {
- usage2 (_("Server port must be a nonnegative integer"), optarg);
+ usage2 (_("Port must be a positive integer"), optarg);
}
break;
case 'l': /* address to lookup */
warning_interval = strtod (optarg, NULL);
}
else {
- usage2 (_("Warning interval must be a nonnegative integer"), optarg);
+ usage2 (_("Warning interval must be a positive integer"), optarg);
}
break;
case 'c': /* critical */
critical_interval = strtod (optarg, NULL);
}
else {
- usage2 (_("Critical interval must be a nonnegative integer"), optarg);
+ usage2 (_("Critical interval must be a positive integer"), optarg);
}
break;
case 't': /* timeout */
timeout_interval = atoi (optarg);
}
else {
- usage2 (_("Time interval must be a nonnegative integer"), optarg);
+ usage2 (_("Timeout interval must be a positive integer"), optarg);
}
break;
case 'v': /* verbose */
dns_server = argv[c];
}
else {
- usage2 (_("Invalid host name"), argv[c]);
+ usage2 (_("Invalid hostname/address"), argv[c]);
}
}
else {
-
-
int
validate_arguments (void)
{
-
-
-
-\f
void
print_help (void)
{
printf (_("\
-a, --expected_address=STRING\n\
- an address expected to be in the asnwer section.\n\
+ an address expected to be in the answer section.\n\
if not set, uses whatever was in -l\n"));
printf (_(UT_WARN_CRIT));
-
void
print_usage (void)
{
- printf (_("\
+ printf ("\
Usage: %s -H host -l lookup [-p <server port>] [-T <query type>]\n\
- [-w <warning interval>] [-c <critical interval>] [-t <timeout>]\n\
- [-a <expected answer address>] [-v]\n"),
- progname);
- printf (" %s (-h|--help)\n", progname);
- printf (" %s (-V|--version)\n", progname);
+ [-w <warning interval>] [-c <critical interval>] [-t <timeout>]\n\
+ [-a <expected answer address>] [-v]\n", progname);
}