- Revert previous change for #4136: because it introduces build

problems.


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

daemon/daemon.c

@@ -104,8 +104,10 @@ 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. 
@@ -743,8 +745,10 @@ 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 @@
+3 August 2018: Wouter
+	- Revert previous change for #4136: because it introduces build
+	  problems.
+
 1 August 2018: Wouter
 	- Fix to remove systemd sockaddr function check, that is not
 	  always present.  Make socket activation more lenient.  But not

util/configlexer.lex

@@ -29,11 +29,6 @@ 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)