From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 20 Nov 2014 13:50:44 +0000 (+0100)
Subject: bugfix #575: ldns_pkt_clone copy timestamp too
X-Git-Tag: release-1.7.0-rc1~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9668232b6e259e50f32bff46258ec4b92bebcf18;p=thirdparty%2Fldns.git

bugfix #575: ldns_pkt_clone copy timestamp too

And also the _edns_present field
Thanks Calle Dybedahl
---

diff --git a/Changelog b/Changelog
index de2f45fa..8bd84d7f 100644
--- a/Changelog
+++ b/Changelog
@@ -40,6 +40,8 @@ TBD
 	  Thanks Jakob Petsovits
 	* bugfix #570: Add TLSA, CDS, CDNSKEY and OPENPGPKEY RR types to ldnsx
 	  Thanks Shussain
+	* bugfix #575: ldns_pkt_clone() does not copy timestamp field
+	  Thanks Calle Dybedahl 
 
 1.6.17	2014-01-10
 	* Fix ldns_dnssec_zone_new_frm_fp_l to allow the last parsed line of a
diff --git a/contrib/DNS-LDNS b/contrib/DNS-LDNS
index f1705d6e..4b040c46 160000
--- a/contrib/DNS-LDNS
+++ b/contrib/DNS-LDNS
@@ -1 +1 @@
-Subproject commit f1705d6e7e6a653136e3d8fd2d8a1efc22d2f990
+Subproject commit 4b040c46c624a9c3919494b1479fbc2c8d058f57
diff --git a/packet.c b/packet.c
index da69c8ec..3e26a6fe 100644
--- a/packet.c
+++ b/packet.c
@@ -1131,6 +1131,7 @@ ldns_pkt_clone(ldns_pkt *pkt)
 	if (ldns_pkt_answerfrom(pkt))
 		ldns_pkt_set_answerfrom(new_pkt,
 			ldns_rdf_clone(ldns_pkt_answerfrom(pkt)));
+	ldns_pkt_set_timestamp(new_pkt, ldns_pkt_timestamp(pkt));
 	ldns_pkt_set_querytime(new_pkt, ldns_pkt_querytime(pkt));
 	ldns_pkt_set_size(new_pkt, ldns_pkt_size(pkt));
 	ldns_pkt_set_tsig(new_pkt, ldns_rr_clone(ldns_pkt_tsig(pkt)));
@@ -1139,6 +1140,7 @@ ldns_pkt_clone(ldns_pkt *pkt)
 	ldns_pkt_set_edns_extended_rcode(new_pkt, 
 		ldns_pkt_edns_extended_rcode(pkt));
 	ldns_pkt_set_edns_version(new_pkt, ldns_pkt_edns_version(pkt));
+	new_pkt->_edns_present = pkt->_edns_present;
 	ldns_pkt_set_edns_z(new_pkt, ldns_pkt_edns_z(pkt));
 	if(ldns_pkt_edns_data(pkt))
 		ldns_pkt_set_edns_data(new_pkt,