- Fix #4136: insufficiency from mismatch of FLEX capability between

released tarball and build host.


git-svn-id: file:///svn/unbound/trunk@4801 be551aaa-1e26-0410-a405-d3ace91eadb9

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)

doc/Changelog

@@ -1,3 +1,7 @@
+30 July 2018: Wouter
+	- Fix #4136: insufficiency from mismatch of FLEX capability between
+	  released tarball and build host.
+
 27 July 2018: Wouter
 	- Fix man page, say that chroot is enabled by default.
 

util/configlexer.lex

@@ -29,6 +29,11 @@ void ub_c_error(const char *message);
 #define LEXOUT(s)
 #endif
 
+#ifndef LEX_HAS_YYLEX_DESTROY
+/* dummy yylex destroy so we can call it */
+int yylex_destroy(void) { return 0; }
+#endif
+
 /** avoid warning in about fwrite return value */
 #define ECHO ub_c_error_msg("syntax error at text: %s", yytext)