From: Jelte Jansen <jeltejan@NLnetLabs.nl>
Date: Thu, 8 Sep 2005 09:51:12 +0000 (+0000)
Subject: adding of dnskey to zone done in caller, not in sign function
X-Git-Tag: release-1.0.0~195
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a25451b6b2fd036ba8bf9d974bfea2e04d44e46e;p=thirdparty%2Fldns.git

adding of dnskey to zone done in caller, not in sign function
---

diff --git a/dnssec.c b/dnssec.c
index 0bd268ee..a17875cd 100644
--- a/dnssec.c
+++ b/dnssec.c
@@ -1530,7 +1530,6 @@ ldns_zone_sign(ldns_zone *zone, ldns_key_list *key_list)
 	for (i = 0; i < ldns_key_list_key_count(key_list); i++) {
 		ckey = ldns_key2rr(ldns_key_list_key(key_list, i));
 		ldns_rr_list_push_rr(pubkeys, ckey);
-		ldns_rr_list_push_rr(orig_zone_rrs, ckey);
 	}
 	signed_zone_rrs = ldns_rr_list_new();
 
diff --git a/signzone.c b/signzone.c
index a4204e04..e273add9 100644
--- a/signzone.c
+++ b/signzone.c
@@ -210,9 +210,8 @@ main(int argc, char *argv[])
 					}
 					/*ldns_key_set_flags(key, ldns_key_flags(key) | LDNS_KEY_ZONE_KEY);*/
 					ldns_key_list_push_key(keys, key);
-		/*
 					ldns_zone_push_rr(orig_zone, ldns_rr_clone(pubkey));
-		*/			ldns_rr_free(pubkey);
+					ldns_rr_free(pubkey);
 				}