summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Wittig <abgandar@gmail.com>2013-12-16 12:15:31 (GMT)
committerJan Wagner <waja@cyconet.org>2014-07-30 13:22:33 (GMT)
commit8c623b1a432524950050ef6f2d273a87e013dacf (patch)
tree306f6270219c3086778b40e683150a510dcebbf7
parentd8c20cc487f4dc361af553c57b8b4f8a4ab1dd29 (diff)
downloadmonitoring-plugins-8c623b1a432524950050ef6f2d273a87e013dacf.tar.gz
check_dig: Fix to work with dig and drill tool
FreeBSD starting with version 10 is shipped with ldns instead of bind as resolver. Consequently the dig tool in base is replaced by drill. While dig can still be installed as a third party application, it would be nice to make do with the tools available in the system already. This patch rearranges the command line used to invoke dig slightly so that it can be used with both dig and drill (tested with dig 9.8.3-P1 and 9.9.4 as well as drill 1.6.16). It would be really neat if the configure script could be changed to automatically pick up drill when dig is not available (or the other way around), but my autotools-foo is not good enough for that. This part of the patch is an extended version of the locally maintained patch currently deployed in the FreeBSD ports tree by Dmitry Sivachenko.
-rw-r--r--plugins/check_dig.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index d9481f2..8d996b0 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -94,8 +94,8 @@ main (int argc, char **argv)
94 timeout_interval_dig = timeout_interval / number_tries + number_tries; 94 timeout_interval_dig = timeout_interval / number_tries + number_tries;
95 95
96 /* get the command to run */ 96 /* get the command to run */
97 xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s +tries=%d +time=%d", 97 xasprintf (&command_line, "%s %s %s -p %d @%s %s %s +tries=%d +time=%d",
98 PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport, number_tries, timeout_interval_dig); 98 PATH_TO_DIG, dig_args, query_transport, server_port, dns_server, query_address, record_type, number_tries, timeout_interval_dig);
99 99
100 alarm (timeout_interval); 100 alarm (timeout_interval);
101 gettimeofday (&tv, NULL); 101 gettimeofday (&tv, NULL);