From: Willem Toorop <willem@nlnetlabs.nl>
Date: Mon, 15 Aug 2022 09:11:40 +0000 (+0200)
Subject: Revert "Issue #183 EDNS OPT can have no rdata"
X-Git-Tag: 1.8.3~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2156193247ce3025b25898ea52cfb7a2e34e1b0;p=thirdparty%2Fldns.git

Revert "Issue #183 EDNS OPT can have no rdata"

This reverts commit 1acee0c5d35f4a04df07e5d5f4490e6318513997.
---

diff --git a/host2wire.c b/host2wire.c
index 137257cd..49e4924a 100644
--- a/host2wire.c
+++ b/host2wire.c
@@ -449,10 +449,7 @@ ldns_pkt2buffer_wire_compress(ldns_buffer *buffer, const ldns_pkt *packet, ldns_
 			                       , ldns_buffer_export(edns_buf));
 			ldns_buffer_free(edns_buf);
 		}
-		if (edns_rdf)
-			ldns_rr_push_rdf(edns_rr, edns_rdf);
-		else if (packet->_edns_data)
-			ldns_rr_push_rdf(edns_rr, packet->_edns_data);
+		ldns_rr_push_rdf(edns_rr, edns_rdf ? edns_rdf : packet->_edns_data);
 		(void)ldns_rr2buffer_wire_compress(buffer, edns_rr, LDNS_SECTION_ADDITIONAL, compression_data);
 		/* take the edns rdata back out of the rr before we free rr */
 		if (!edns_rdf)