From 717f6365bd4e043467b4ebbc8e2093289ffc58b9 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Sun, 24 Jan 2021 23:59:02 +0100
Subject: [PATCH] Fixes from merge

---
 util/data/msgencode.c | 2 +-
 util/edns.h           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/data/msgencode.c b/util/data/msgencode.c
index c2decfc7b..2c2ccc1a2 100644
--- 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 c4d63ec29..b94e53443 100644
--- 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;
-- 
2.47.2