From 77a3409a6631a58d7e6fa8f7e7f814b14f2d32c8 Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Thu, 19 Aug 1999 17:50:29 +0000 Subject: [PATCH] addrdataset was overriding the merge flag --- lib/dns/rbtdb.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index c3fa0f4912..3e9fc841b9 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -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; } /*