ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

[master] fixed a regression in dyndb due to change #4277

Browse Source
This commit is contained in:
Evan Hunt
2016-02-12 00:22:45 -08:00
parent d372f426ca
commit 93c211afc9
9 changed files with 76 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/system/conf.sh.in
View File

@@ -68,7 +68,7 @@ RANDFILE=$TOP/bin/tests/system/random.data
SUBDIRS="acl additional allow_query addzone autosign builtin
cacheclean case checkconf @CHECKDS@ checknames checkzone
cookie @COVERAGE@ database digdelv dlv dlvauto dlz dlzexternal
dname dns64 dnssec dsdigest dscp @DNSTAP@ ecdsa ednscompliance
dname dns64 dnssec dsdigest dscp @DNSTAP@ dyndb ecdsa ednscompliance
emptyzones fetchlimit filter-aaaa formerr forward geoip glue gost
ixfr inline legacy limits logfileconfig lwresd masterfile
masterformat metadata mkeys names notify nslookup nsupdate

12
bin/tests/system/dyndb/driver/db.c
View File

@@ -439,9 +439,9 @@ transfernode(dns_db_t *db, dns_dbnode_t **sourcep, dns_dbnode_t **targetp) {
static isc_result_t
getnsec3parameters(dns_db_t *db, dns_dbversion_t *version,
dns_hash_t *hash, isc_uint8_t *flags,
isc_uint16_t *iterations,
unsigned char *salt, size_t *salt_length)
dns_hash_t *hash, isc_uint8_t *flags,
isc_uint16_t *iterations,
unsigned char *salt, size_t *salt_length)
{
sampledb_t *sampledb = (sampledb_t *) db;
@@ -465,8 +465,7 @@ findnsec3node(dns_db_t *db, dns_name_t *name, isc_boolean_t create,
}
static isc_result_t
setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign)
{
setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) {
sampledb_t *sampledb = (sampledb_t *) db;
REQUIRE(VALID_SAMPLEDB(sampledb));
@@ -475,8 +474,7 @@ setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign)
}
static isc_result_t
getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *name)
{
getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *name) {
sampledb_t *sampledb = (sampledb_t *) db;
REQUIRE(VALID_SAMPLEDB(sampledb));

4
bin/tests/system/dyndb/driver/driver.c
View File

@@ -81,9 +81,7 @@ dyndb_init(isc_mem_t *mctx, const char *name, const char *parameters,
dns_log_setcontext(dctx->lctx);
}
if (isc_hashctx != NULL && isc_hashctx != dctx->hctx)
isc_hash_ctxdetach(&isc_hashctx);
isc_hashctx = dctx->hctx;
isc_hash_set_initializer(dctx->hashinit);
s = isc_mem_strdup(mctx, parameters);
if (s == NULL) {