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

rename variables to avoid linker errors on aa

Browse Source
This commit is contained in:
Brian Wellington
2000-01-31 23:15:33 +00:00
parent 22eeba5ec6
commit b72b07e79b
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/dnssec/dnssec-signzone.c
View File

@@ -71,7 +71,7 @@ struct signer_array_struct {
}; };
ISC_LIST(signer_key_t) keylist; ISC_LIST(signer_key_t) keylist;
isc_stdtime_t start = 0, end = 0, now; isc_stdtime_t starttime = 0, endtime = 0, now;
int cycle = -1; int cycle = -1;
int verbose; int verbose;
@@ -165,7 +165,7 @@ signwithkey(dns_name_t *name, dns_rdataset_t *rdataset, dns_rdata_t *rdata,
isc_result_t result; isc_result_t result;
dns_rdata_init(rdata); dns_rdata_init(rdata);
result = dns_dnssec_sign(name, rdataset, key, &start, &end, result = dns_dnssec_sign(name, rdataset, key, &starttime, &endtime,
mctx, b, rdata); mctx, b, rdata);
check_result(result, "dns_dnssec_sign()"); check_result(result, "dns_dnssec_sign()");
#if 0 #if 0
@@ -477,8 +477,8 @@ signset(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
siglist.rdclass = set->rdclass; siglist.rdclass = set->rdclass;
siglist.type = dns_rdatatype_sig; siglist.type = dns_rdatatype_sig;
siglist.covers = set->type; siglist.covers = set->type;
if (end - start < set->ttl) if (endtime - starttime < set->ttl)
siglist.ttl = end - start; siglist.ttl = endtime - starttime;
else else
siglist.ttl = set->ttl; siglist.ttl = set->ttl;
dns_rdataset_init(&sigset); dns_rdataset_init(&sigset);
@@ -975,21 +975,21 @@ main(int argc, char *argv[]) {
isc_stdtime_get(&now); isc_stdtime_get(&now);
if (startstr != NULL) { if (startstr != NULL) {
start = strtotime(startstr, now, now); starttime = strtotime(startstr, now, now);
isc_mem_free(mctx, startstr); isc_mem_free(mctx, startstr);
} }
else else
start = now; starttime = now;
if (endstr != NULL) { if (endstr != NULL) {
end = strtotime(endstr, now, start); endtime = strtotime(endstr, now, starttime);
isc_mem_free(mctx, endstr); isc_mem_free(mctx, endstr);
} }
else else
end = start + (30 * 24 * 60 * 60); endtime = starttime + (30 * 24 * 60 * 60);
if (cycle == -1) { if (cycle == -1) {
cycle = (end - start) / 4; cycle = (endtime - starttime) / 4;
} }
argc -= isc_commandline_index; argc -= isc_commandline_index;

18
bin/tests/signer.c
View File

@@ -71,7 +71,7 @@ struct signer_array_struct {
}; };
ISC_LIST(signer_key_t) keylist; ISC_LIST(signer_key_t) keylist;
isc_stdtime_t start = 0, end = 0, now; isc_stdtime_t starttime = 0, endtime = 0, now;
int cycle = -1; int cycle = -1;
int verbose; int verbose;
@@ -165,7 +165,7 @@ signwithkey(dns_name_t *name, dns_rdataset_t *rdataset, dns_rdata_t *rdata,
isc_result_t result; isc_result_t result;
dns_rdata_init(rdata); dns_rdata_init(rdata);
result = dns_dnssec_sign(name, rdataset, key, &start, &end, result = dns_dnssec_sign(name, rdataset, key, &starttime, &endtime,
mctx, b, rdata); mctx, b, rdata);
check_result(result, "dns_dnssec_sign()"); check_result(result, "dns_dnssec_sign()");
#if 0 #if 0
@@ -477,8 +477,8 @@ signset(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
siglist.rdclass = set->rdclass; siglist.rdclass = set->rdclass;
siglist.type = dns_rdatatype_sig; siglist.type = dns_rdatatype_sig;
siglist.covers = set->type; siglist.covers = set->type;
if (end - start < set->ttl) if (endtime - starttime < set->ttl)
siglist.ttl = end - start; siglist.ttl = endtime - starttime;
else else
siglist.ttl = set->ttl; siglist.ttl = set->ttl;
dns_rdataset_init(&sigset); dns_rdataset_init(&sigset);
@@ -975,21 +975,21 @@ main(int argc, char *argv[]) {
isc_stdtime_get(&now); isc_stdtime_get(&now);
if (startstr != NULL) { if (startstr != NULL) {
start = strtotime(startstr, now, now); starttime = strtotime(startstr, now, now);
isc_mem_free(mctx, startstr); isc_mem_free(mctx, startstr);
} }
else else
start = now; starttime = now;
if (endstr != NULL) { if (endstr != NULL) {
end = strtotime(endstr, now, start); endtime = strtotime(endstr, now, starttime);
isc_mem_free(mctx, endstr); isc_mem_free(mctx, endstr);
} }
else else
end = start + (30 * 24 * 60 * 60); endtime = starttime + (30 * 24 * 60 * 60);
if (cycle == -1) { if (cycle == -1) {
cycle = (end - start) / 4; cycle = (endtime - starttime) / 4;
} }
argc -= isc_commandline_index; argc -= isc_commandline_index;