From d0da78ced184197b29af9fe910aaf56a9e7fe762 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Sun, 29 Sep 2013 02:23:11 +0200 Subject: check_dns: returns incorrect state when specifying server This patch verifies if the response is returned by the dns server we are trying to check --- Closes #981 Closes #982 Closes #1164 --- plugins/check_dns.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'plugins') diff --git a/plugins/check_dns.c b/plugins/check_dns.c index 31a953d7..da90da75 100644 --- a/plugins/check_dns.c +++ b/plugins/check_dns.c @@ -136,6 +136,28 @@ main (int argc, char **argv) } } + /* bug ID: 2946553 - Older versions of bind will use all available dns + servers, we have to match the one specified */ + if (strstr (chld_out.line[i], "Server:") && strlen(dns_server) > 0) { + temp_buffer = index (chld_out.line[i], ':'); + temp_buffer++; + + /* Strip leading tabs */ + for (; *temp_buffer != '\0' && *temp_buffer == '\t'; temp_buffer++) + /* NOOP */; + + strip(temp_buffer); + if (temp_buffer==NULL || strlen(temp_buffer)==0) { + die (STATE_CRITICAL, + _("DNS CRITICAL - '%s' returned empty server string\n"), + NSLOOKUP_COMMAND); + } + + if (strcmp(temp_buffer, dns_server) != 0) { + die (STATE_CRITICAL, _("No response from DNS %s\n"), dns_server); + } + } + /* the server is responding, we just got the host name... */ if (strstr (chld_out.line[i], "Name:")) parse_address = TRUE; -- cgit v1.2.3 From b7ce241ba66298e06004236936e9915108876144 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Wed, 30 Jul 2014 23:29:28 +0200 Subject: check_dns: Use strchr instead of index --- plugins/check_dns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/check_dns.c b/plugins/check_dns.c index da90da75..d7f7346f 100644 --- a/plugins/check_dns.c +++ b/plugins/check_dns.c @@ -139,7 +139,7 @@ main (int argc, char **argv) /* bug ID: 2946553 - Older versions of bind will use all available dns servers, we have to match the one specified */ if (strstr (chld_out.line[i], "Server:") && strlen(dns_server) > 0) { - temp_buffer = index (chld_out.line[i], ':'); + temp_buffer = strchr (chld_out.line[i], ':'); temp_buffer++; /* Strip leading tabs */ -- cgit v1.2.3