Fixes from merge

diff --git a/util/data/msgencode.c b/util/data/msgencode.c
index c2decfc7b872e9ed4d48559bea1b4d98281415d1..2c2ccc1a2d97b572c57ef97285f1eb58a63b214c 100644 (file)
--- a/util/data/msgencode.c
+++ b/util/data/msgencode.c
@@ -984,6 +984,6 @@ error_encode(sldns_buffer* buf, int r, struct query_info* qinfo,
                es.bits &= EDNS_DO;
                if(sldns_buffer_limit(buf) + edns_field_size > edns->udp_size)
                        return;
-               attach_edns_record_(buf, &es, edns->udp_size - edns_field_size);
+               attach_edns_record(buf, &es);
        }
 }

diff --git a/util/edns.h b/util/edns.h
index c4d63ec29a487690b17842beb10e16365b6e0003..b94e53443bac107e474449a2ff202dd645483ee2 100644 (file)
--- a/util/edns.h
+++ b/util/edns.h
@@ -44,6 +44,7 @@
 
 #include "util/storage/dnstree.h"
 
+struct edns_option;
 struct edns_data;
 struct config_file;
 struct comm_point;