diff options
| author |   sthen <sthen@openbsd.org> | 2015-07-17 17:36:01 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2015-07-17 17:36:01 +0000 |
| commit | c939baa47e74c1c9d041cfa3af1d0d0e62c34641 (patch) | |
| tree | a7cdf9265f94dba688493776204cc821f6255344 /usr.sbin/nsd/dbaccess.c | |
| parent | add exdisplay to chromebook_devs (diff) | |
| download | wireguard-openbsd-c939baa47e74c1c9d041cfa3af1d0d0e62c34641.tar.xz wireguard-openbsd-c939baa47e74c1c9d041cfa3af1d0d0e62c34641.zip | |
update to NSD 4.1.3, ok florian@, also tested by brad
Diffstat (limited to 'usr.sbin/nsd/dbaccess.c')
| -rw-r--r-- | usr.sbin/nsd/dbaccess.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/nsd/dbaccess.c b/usr.sbin/nsd/dbaccess.c index ad15448038a..4e11977d6bd 100644 --- a/usr.sbin/nsd/dbaccess.c +++ b/usr.sbin/nsd/dbaccess.c @@ -156,8 +156,8 @@ read_rrset(udb_base* udb, namedb_type* db, zone_type* zone, rrset = (rrset_type *) region_alloc(db->region, sizeof(rrset_type)); rrset->zone = zone; rrset->rr_count = calculate_rr_count(udb, urrset); - rrset->rrs = (rr_type *) region_alloc( - db->region, rrset->rr_count * sizeof(rr_type)); + rrset->rrs = (rr_type *) region_alloc_array( + db->region, rrset->rr_count, sizeof(rr_type)); /* add the RRs */ udb_ptr_new(&urr, udb, &RRSET(urrset)->rrs); for(i=0; i<rrset->rr_count; i++) { @@ -288,6 +288,7 @@ namedb_zone_delete(namedb_type* db, zone_type* zone) /* see if apex can be deleted */ if(zone->apex) { zone->apex->usage --; + zone->apex->is_apex = 0; if(zone->apex->usage == 0) { /* delete the apex, possibly */ domain_table_deldomain(db, zone->apex); @@ -607,7 +608,7 @@ namedb_read_zonefile(struct nsd* nsd, struct zone* zone, udb_base* taskudb, zone->logstr = NULL; } } else { - VERBOSITY(1, (LOG_INFO, "zone %s read with no errors", + VERBOSITY(1, (LOG_INFO, "zone %s read with success", zone->opts->name)); zone->is_ok = 1; zone->is_changed = 0; |