Merge pull request #1164 from waja/github981

This commit is contained in:
Jan Wagner 2014-07-30 23:33:57 +02:00
commit 8775edcb10
2 changed files with 23 additions and 0 deletions

View file

@ -328,3 +328,4 @@ Julius Kriukas
Patrick McAndrew
Alexander Wittig
Jason Benguerel
Matthew Kent

View file

@ -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;