diff options
| author |   brad <brad@openbsd.org> | 2015-01-31 23:34:17 +0000 |
|---|---|---|
| committer | brad <brad@openbsd.org> | 2015-01-31 23:34:17 +0000 |
| commit | 35fa0a9c24ca8cf4a544361f98ab7cef54a81f01 (patch) | |
| tree | 10d79eb24d3a61fab3cf9a912fffa3db27a06b0f /usr.sbin/unbound/iterator/iterator.c | |
| parent | free(NULL) works, so stop checking for non-zero length allocation (diff) | |
| download | wireguard-openbsd-35fa0a9c24ca8cf4a544361f98ab7cef54a81f01.tar.xz wireguard-openbsd-35fa0a9c24ca8cf4a544361f98ab7cef54a81f01.zip | |
Merge in a commit from upstream..
- Fix 0x20 capsforid fallback to omit gratuitous NS and additional
section changes.
ok sthen@
Diffstat (limited to 'usr.sbin/unbound/iterator/iterator.c')
| -rw-r--r-- | usr.sbin/unbound/iterator/iterator.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.sbin/unbound/iterator/iterator.c b/usr.sbin/unbound/iterator/iterator.c index 6e05c99a0e9..21ef397f1c9 100644 --- a/usr.sbin/unbound/iterator/iterator.c +++ b/usr.sbin/unbound/iterator/iterator.c @@ -2878,6 +2878,9 @@ process_response(struct module_qstate* qstate, struct iter_qstate* iq, iq->response->rep); if(event == module_event_capsfail || iq->caps_fallback) { + /* for fallback we care about main answer, not additionals */ + /* removing that makes comparison more likely to succeed */ + caps_strip_reply(iq->response->rep); if(!iq->caps_fallback) { /* start fallback */ iq->caps_fallback = 1; |