From: Matthijs Mekking <matje@NLnetLabs.nl>
Date: Mon, 18 Oct 2010 14:10:14 +0000 (+0000)
Subject: use zone ttl if dnskey ttl from .key is omitted
X-Git-Tag: release-1.6.7~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74ef4e42d44735c2fc74b38f6eb5e26d3cac8d0e;p=thirdparty%2Fldns.git

use zone ttl if dnskey ttl from .key is omitted
---

diff --git a/examples/ldns-signzone.c b/examples/ldns-signzone.c
index 570eba3c..36c26ca6 100644
--- a/examples/ldns-signzone.c
+++ b/examples/ldns-signzone.c
@@ -168,13 +168,13 @@ find_key_in_zone(ldns_rr *pubkey_gen, ldns_zone *zone) {
 }
 
 static ldns_rr *
-find_key_in_file(const char *keyfile_name_base, ldns_key *key)
+find_key_in_file(const char *keyfile_name_base, ldns_key *key, uint32_t zone_ttl)
 {
 	char *keyfile_name;
 	FILE *keyfile;
 	int line_nr;
-	uint32_t default_ttl = LDNS_DEFAULT_TTL;
-	
+	uint32_t default_ttl = zone_ttl;
+
 	ldns_rr *pubkey = NULL;
 	keyfile_name = LDNS_XMALLOC(char,
 	                            strlen(keyfile_name_base) + 5);
@@ -256,11 +256,11 @@ find_or_create_pubkey(const char *keyfile_name_base, ldns_key *key, ldns_zone *o
 	if (!pubkey) {
 		key_in_zone = 0;
 		/* it was not in the zone, try to read a .key file */
-		pubkey = find_key_in_file(keyfile_name_base, key);
+		pubkey = find_key_in_file(keyfile_name_base, key, default_ttl);
 		if (!pubkey && !(ldns_key_flags(key) & LDNS_KEY_SEP_KEY)) {
 			/* maybe it is a ksk? */
 			ldns_key_set_keytag(key, ldns_key_keytag(key) + 1);
-			pubkey = find_key_in_file(keyfile_name_base, key);
+			pubkey = find_key_in_file(keyfile_name_base, key, default_ttl);
 			if (!pubkey) {
 				/* ok, no file, set back to ZSK */
 				ldns_key_set_keytag(key, ldns_key_keytag(key) - 1);