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

This reverts commit 1acee0c5d35f4a04df07e5d5f4490e6318513997.

diff --git a/host2wire.c b/host2wire.c
index 137257cdf273918b1e8fa1c3706fb1171aadddf1..49e4924a92f386ea04eadcb18216a4e4e4ee918b 100644 (file)
--- 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)