From: Willem Toorop <willem@NLnetLabs.nl>
Date: Mon, 16 Jul 2012 11:17:53 +0000 (+0000)
Subject: bugfix #458: Track all newly created signatures when signing.
X-Git-Tag: release-1.6.14rc1~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8224b54c86ecd7093c7733df08e673c6fd2f8de2;p=thirdparty%2Fldns.git

bugfix #458: Track all newly created signatures when signing.
Thanks Michael Sheldon
---

diff --git a/Changelog b/Changelog
index 2be4ca78..e37c8e8f 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 1.6.14
+	* bugfix #458: Track all newly created signatures when signing.
 	* bugfix #454: Don't set -g and -O2 CFLAGS from configure.
 	* bugfix #457: Memroy leak fix for ldns_key_new_frm_algorithm.
 	* pyldns memory handling fixes and the python3/ldns-signzone.py
diff --git a/dnssec_sign.c b/dnssec_sign.c
index 88878bad..603d3f13 100644
--- a/dnssec_sign.c
+++ b/dnssec_sign.c
@@ -1023,9 +1023,9 @@ ldns_key_list_filter_for_non_dnskey(ldns_key_list *key_list)
 }
 
 ldns_status
-ldns_dnssec_zone_create_rrsigs_flg( ATTR_UNUSED(ldns_dnssec_zone *zone)
-				  , ATTR_UNUSED(ldns_rr_list *new_rrs)
-				  , ATTR_UNUSED(ldns_key_list *key_list)
+ldns_dnssec_zone_create_rrsigs_flg( ldns_dnssec_zone *zone
+				  , ldns_rr_list *new_rrs
+				  , ldns_key_list *key_list
 				  , int (*func)(ldns_rr *, void*)
 				  , void *arg
 				  , int flags
@@ -1112,9 +1112,11 @@ ldns_dnssec_zone_create_rrsigs_flg( ATTR_UNUSED(ldns_dnssec_zone *zone)
 							cur_rrset->signatures = ldns_dnssec_rrs_new();
 							cur_rrset->signatures->rr =
 								ldns_rr_list_rr(siglist, i);
+						}
+						if (new_rrs) {
 							ldns_rr_list_push_rr(new_rrs,
-											 ldns_rr_list_rr(siglist,
-														  i));
+												 ldns_rr_list_rr(siglist,
+															  i));
 						}
 					}
 					ldns_rr_list_free(siglist);
@@ -1146,8 +1148,10 @@ ldns_dnssec_zone_create_rrsigs_flg( ATTR_UNUSED(ldns_dnssec_zone *zone)
 					cur_name->nsec_signatures = ldns_dnssec_rrs_new();
 					cur_name->nsec_signatures->rr =
 						ldns_rr_list_rr(siglist, i);
+				}
+				if (new_rrs) {
 					ldns_rr_list_push_rr(new_rrs,
-									 ldns_rr_list_rr(siglist, i));
+								 ldns_rr_list_rr(siglist, i));
 				}
 			}