Commit 77a3409a authored by Bob Halley's avatar Bob Halley
Browse files

addrdataset was overriding the merge flag

parent 27e48d2e
......@@ -2706,12 +2706,10 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
if (rbtversion != NULL) {
newheader->serial = rbtversion->serial;
newheader->trust = 0;
merge = ISC_TRUE;
now = 0;
} else {
newheader->serial = 1;
newheader->trust = rdataset->trust;
merge = ISC_FALSE;
}
/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment