Fix crash on TCP DNS request when DNSSEC not enabled.

This commit is contained in:
Simon Kelley
2014-04-16 22:20:55 +01:00
parent 82a14af5e7
commit 6375838445
2 changed files with 7 additions and 1 deletions

View File

@@ -1,3 +1,9 @@
version 2.70
Fix crash, introduced in 2.69, on TCP request when dnsmasq
compiled with DNSSEC support, but running without DNSSEC
enabled. Thanks to Manish Sing for spotting that one.
version 2.69 version 2.69
Implement dynamic interface discovery on *BSD. This allows Implement dynamic interface discovery on *BSD. This allows
the contructor: syntax to be used in dhcp-range for DHCPv6 the contructor: syntax to be used in dhcp-range for DHCPv6

View File

@@ -1745,7 +1745,7 @@ unsigned char *tcp_request(int confd, time_t now,
struct server *firstsendto = NULL; struct server *firstsendto = NULL;
#ifdef HAVE_DNSSEC #ifdef HAVE_DNSSEC
unsigned char *newhash, hash[HASH_SIZE]; unsigned char *newhash, hash[HASH_SIZE];
if ((newhash = hash_questions(header, (unsigned int)size, daemon->keyname))) if ((newhash = hash_questions(header, (unsigned int)size, daemon->namebuff)))
memcpy(hash, newhash, HASH_SIZE); memcpy(hash, newhash, HASH_SIZE);
else else
memset(hash, 0, HASH_SIZE); memset(hash, 0, HASH_SIZE);