From 27023b3f2191c7c6073d63cb46b5c21b3f663aac Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 6 Aug 2018 07:18:05 +0000
Subject: [PATCH] - Fix for #4136: Fix to unconditionally call destroy in
 daemon.c.

git-svn-id: file:///svn/unbound/trunk@4830 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 daemon/daemon.c | 4 ----
 doc/Changelog   | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/daemon/daemon.c b/daemon/daemon.c
index a60f4409a..3dc2553ba 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -104,10 +104,8 @@ static int sig_record_reload = 0;
 /** cleaner ssl memory freeup */
 static void* comp_meth = NULL;
 #endif
-#ifdef LEX_HAS_YYLEX_DESTROY
 /** remove buffers for parsing and init */
 int ub_c_lex_destroy(void);
-#endif
 
 /** used when no other sighandling happens, so we don't die
   * when multiple signals in quick succession are sent to us. 
@@ -745,10 +743,8 @@ daemon_delete(struct daemon* daemon)
 	SSL_CTX_free((SSL_CTX*)daemon->connect_sslctx);
 #endif
 	free(daemon);
-#ifdef LEX_HAS_YYLEX_DESTROY
 	/* lex cleanup */
 	ub_c_lex_destroy();
-#endif
 	/* libcrypto cleanup */
 #ifdef HAVE_SSL
 #  if defined(USE_GOST) && defined(HAVE_LDNS_KEY_EVP_UNLOAD_GOST)
diff --git a/doc/Changelog b/doc/Changelog
index a4882a4e9..b9cb9cd58 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+6 August 2018: Wouter
+	- Fix for #4136: Fix to unconditionally call destroy in daemon.c.
+
 3 August 2018: George
 	- Expose if a query (or a subquery) was ratelimited (not src IP
 	  ratelimiting) to libunbound under 'ub_result.was_ratelimited'.
-- 
2.47.3