BUG/MINOR: dns: unable to parse CNAMEs response

A bug lied in the parsing of DNS CNAME response, leading HAProxy to
think the CNAME was improperly resolved in the response.

This should be backported into 1.6 branch
This commit is contained in:
Baptiste Assmann 2015-10-28 02:10:02 +01:00 committed by Willy Tarreau
parent fad0318c74
commit e4c4b7dda6

View File

@ -628,8 +628,11 @@ int dns_get_ip_from_response(unsigned char *resp, unsigned char *resp_end,
else
ptr = reader;
if (cname && memcmp(ptr, cname, cnamelen))
return DNS_UPD_NAME_ERROR;
if (cname) {
if (memcmp(ptr, cname, cnamelen)) {
return DNS_UPD_NAME_ERROR;
}
}
else if (memcmp(ptr, dn_name, dn_name_len))
return DNS_UPD_NAME_ERROR;