upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix #836: unbound could echo back EDNS options in an error response.

Browse source 
git-svn-id: file:///svn/unbound/trunk@3870 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-09-27 12:22:56 +00:00
parent 2127c65561
commit 8a19ff3baf
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -3,6 +3,7 @@
- trunk contains 1.5.11 in development. - trunk contains 1.5.11 in development.
- Fix dnstap relaying "random" messages instead of resolver/forwarder - Fix dnstap relaying "random" messages instead of resolver/forwarder
responses, from Nikolay Edigaryev. responses, from Nikolay Edigaryev.
- Fix #836: unbound could echo back EDNS options in an error response.
20 September 2016: Wouter 20 September 2016: Wouter
- iana portlist update. - iana portlist update.

2
services/mesh.c
View file

@ -878,6 +878,8 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
comm_point_send_reply(&r->query_reply); comm_point_send_reply(&r->query_reply);
} else if(rcode) { } else if(rcode) {
m->s.qinfo.qname = r->qname; m->s.qinfo.qname = r->qname;
if(!edns_opt_inplace_reply(&r->edns, m->s.region))
r->edns.opt_list = NULL;
error_encode(r->query_reply.c->buffer, rcode, &m->s.qinfo, error_encode(r->query_reply.c->buffer, rcode, &m->s.qinfo,
r->qid, r->qflags, &r->edns); r->qid, r->qflags, &r->edns);
comm_point_send_reply(&r->query_reply); comm_point_send_reply(&r->query_reply);