From 4c9547cd12b5bb569f10b368eb6bb04d897d596f Mon Sep 17 00:00:00 2001 From: Erwin Lansing Date: Mon, 15 Dec 2014 12:14:41 +0000 Subject: Vendor import of BIND 9.9.6-P1 Sponsored by: DK Hostmaster A/S --- lib/dns/dnssec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/dns/dnssec.c') diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c index d7addc681430..6a749ea56b32 100644 --- a/lib/dns/dnssec.c +++ b/lib/dns/dnssec.c @@ -1247,7 +1247,10 @@ get_hints(dns_dnsseckey_t *key, isc_stdtime_t now) { /* Metadata says activate (so we must also publish) */ if (actset && active <= now) { key->hint_sign = ISC_TRUE; - key->hint_publish = ISC_TRUE; + + /* Only publish if publish time has already passed. */ + if (pubset && publish <= now) + key->hint_publish = ISC_TRUE; } /* @@ -1522,7 +1525,7 @@ dns_dnssec_keylistfromrdataset(dns_name_t *origin, const char *directory, isc_mem_t *mctx, dns_rdataset_t *keyset, dns_rdataset_t *keysigs, dns_rdataset_t *soasigs, isc_boolean_t savekeys, - isc_boolean_t public, + isc_boolean_t publickey, dns_dnsseckeylist_t *keylist) { dns_rdataset_t keys; @@ -1551,7 +1554,7 @@ dns_dnssec_keylistfromrdataset(dns_name_t *origin, if (!dns_name_equal(origin, dst_key_name(pubkey))) goto skip; - if (public) { + if (publickey) { RETERR(addkey(keylist, &pubkey, savekeys, mctx)); goto skip; } -- cgit v1.2.3