diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2022-11-14 21:09:33 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2022-11-14 21:09:33 +0000 |
| commit | 6ad31bf1f283226d1072aa6013535f0c52db7a7f (patch) | |
| tree | 133ab3614358b8d8c3be947a27d6988f9e122b8e /usr.sbin/nsd/xfrd.c | |
| parent | efa695ea2ad229400cf439ff8bd452ca0bbc9b65 (diff) | |
merge conflicts
Diffstat (limited to 'usr.sbin/nsd/xfrd.c')
| -rw-r--r-- | usr.sbin/nsd/xfrd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/nsd/xfrd.c b/usr.sbin/nsd/xfrd.c index a587594d42a..f2a29169acd 100644 --- a/usr.sbin/nsd/xfrd.c +++ b/usr.sbin/nsd/xfrd.c @@ -2246,6 +2246,7 @@ xfrd_handle_received_xfr_packet(xfrd_zone_type* zone, buffer_type* packet) xfrd_soa_type soa; enum xfrd_packet_result res; uint64_t xfrfile_size; + assert(zone->latest_xfr); /* parse and check the packet - see if it ends the xfr */ switch((res=xfrd_parse_received_xfr_packet(zone, packet, &soa))) @@ -2282,7 +2283,6 @@ xfrd_handle_received_xfr_packet(xfrd_zone_type* zone, buffer_type* packet) zone->master->ip_address_spec)); } if (res == xfrd_packet_notimpl - && zone->latest_xfr && zone->latest_xfr->query_type == TYPE_IXFR) return res; else |