2 files changed, 23 insertions, 0 deletions

diff --git a/THANKS.in b/THANKS.in
index 0d004aa..433698c 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -328,3 +328,4 @@ Julius Kriukas
 Patrick McAndrew
 Alexander Wittig
 Jason Benguerel
+Matthew Kent
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 31a953d..d7f7346 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 = strchr (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;