mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

4831. [bug] Convert the RRSIG expirytime to 64 bits for

Browse Source 
comparisions in diff.c:resign. [RT #46710]
This commit is contained in:
Mark Andrews
2017-11-29 15:20:23 +11:00
parent 3a12b43245
commit 0579a11658
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
4831. [bug] Convert the RRSIG expirytime to 64 bits for
comparisions in diff.c:resign. [RT #46710]
4830. [bug] Failure to configure ATF when requested did not cause 4830. [bug] Failure to configure ATF when requested did not cause
an error in top-level configure script. [RT #46655] an error in top-level configure script. [RT #46655]

11
lib/dns/diff.c
View File

@@ -30,6 +30,7 @@
#include <dns/rdatastruct.h> #include <dns/rdatastruct.h>
#include <dns/rdatatype.h> #include <dns/rdatatype.h>
#include <dns/result.h> #include <dns/result.h>
#include <dns/time.h>
#define CHECK(op) \ #define CHECK(op) \
do { result = (op); \ do { result = (op); \
@@ -195,7 +196,7 @@ static isc_stdtime_t
setresign(dns_rdataset_t *modified) { setresign(dns_rdataset_t *modified) {
dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_t rdata = DNS_RDATA_INIT;
dns_rdata_rrsig_t sig; dns_rdata_rrsig_t sig;
isc_stdtime_t when; isc_int64_t when;
isc_result_t result; isc_result_t result;
result = dns_rdataset_first(modified); result = dns_rdataset_first(modified);
@@ -205,7 +206,7 @@ setresign(dns_rdataset_t *modified) {
if ((rdata.flags & DNS_RDATA_OFFLINE) != 0) if ((rdata.flags & DNS_RDATA_OFFLINE) != 0)
when = 0; when = 0;
else else
when = sig.timeexpire; when = dns_time64_from32(sig.timeexpire);
dns_rdata_reset(&rdata); dns_rdata_reset(&rdata);
result = dns_rdataset_next(modified); result = dns_rdataset_next(modified);
@@ -215,14 +216,14 @@ setresign(dns_rdataset_t *modified) {
if ((rdata.flags & DNS_RDATA_OFFLINE) != 0) { if ((rdata.flags & DNS_RDATA_OFFLINE) != 0) {
goto next_rr; goto next_rr;
} }
if (when == 0 || sig.timeexpire < when) if (when == 0 || dns_time64_from32(sig.timeexpire) < when)
when = sig.timeexpire; when = dns_time64_from32(sig.timeexpire);
next_rr: next_rr:
dns_rdata_reset(&rdata); dns_rdata_reset(&rdata);
result = dns_rdataset_next(modified); result = dns_rdataset_next(modified);
} }
INSIST(result == ISC_R_NOMORE); INSIST(result == ISC_R_NOMORE);
return (when); return ((isc_stdtime_t)when);
} }
static void static void