summaryrefslogtreecommitdiff
path: root/usr.sbin/nsd/ipc.c
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2018-03-06 21:01:57 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2018-03-06 21:01:57 +0000
commit4157bfe853632fd5c5114d6aa129b82ab9750e1b (patch)
tree5aedbbf66c0d7bcfbc5e3eac4fc9b18fadef9e3f /usr.sbin/nsd/ipc.c
parent9a8f7b3dd87f2c34a24e399571c736f88059ec36 (diff)
update to NSD 4.1.20, ok florian@
- Fix memory leak in zone file read of unknown rr formatted RRs. - Fix memory leak when rehashing nsec3 after axfr or zonefile read, in the selectively allocated precompiled nsec3 hashes.
Diffstat (limited to 'usr.sbin/nsd/ipc.c')
-rw-r--r--usr.sbin/nsd/ipc.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.sbin/nsd/ipc.c b/usr.sbin/nsd/ipc.c
index 5466239265a..ff5bf07db1a 100644
--- a/usr.sbin/nsd/ipc.c
+++ b/usr.sbin/nsd/ipc.c
@@ -20,6 +20,7 @@
#include "xfrd.h"
#include "xfrd-notify.h"
#include "difffile.h"
+#include "rrl.h"
/* attempt to send NSD_STATS command to child fd */
static void send_stat_to_child(struct main_ipc_handler_data* data, int fd);
@@ -39,9 +40,12 @@ ipc_child_quit(struct nsd* nsd)
bind8_stats(nsd);
#endif /* BIND8_STATS */
-#if 0 /* OS collects memory pages */
- event_base_free(event_base);
- region_destroy(server_region);
+#ifdef MEMCLEAN /* OS collects memory pages */
+#ifdef RATELIMIT
+ rrl_deinit(nsd->this_child->child_num);
+#endif
+ event_base_free(nsd->event_base);
+ region_destroy(nsd->server_region);
#endif
server_shutdown(nsd);
exit(0);