From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 16 Jul 2021 15:55:10 +0000 (+0200)
Subject: - Fix for older parsers for function call in serve expired get cached.
X-Git-Tag: release-1.13.2rc1~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d300bc8eee547d64c6ab418e2eceaee2ec604c6a;p=thirdparty%2Funbound.git

- Fix for older parsers for function call in serve expired get cached.
---

diff --git a/doc/Changelog b/doc/Changelog
index f1d65b382..d16391c5a 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -12,6 +12,7 @@
 	- review fix to remove duplicate error printout.
 	- Insert header into testcode/readzone.c, it was missing.
 	- Fix from lint for ignored return value.
+	- Fix for older parsers for function call in serve expired get cached.
 
 6 July 2021: Wouter
 	- iana portlist update.
diff --git a/services/mesh.c b/services/mesh.c
index 7931a072f..5679a8b64 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -439,7 +439,7 @@ mesh_serve_expired_init(struct mesh_state* mstate, int timeout)
 	mstate->s.serve_expired_data->get_cached_answer =
 		mstate->s.serve_expired_data->get_cached_answer?
 		mstate->s.serve_expired_data->get_cached_answer:
-		mesh_serve_expired_lookup;
+		&mesh_serve_expired_lookup;
 
 	/* In case this timer already popped, start it again */
 	if(!mstate->s.serve_expired_data->timer) {
@@ -1946,7 +1946,7 @@ mesh_serve_expired_callback(void* arg)
 	while(1) {
 		fptr_ok(fptr_whitelist_serve_expired_lookup(
 			qstate->serve_expired_data->get_cached_answer));
-		msg = qstate->serve_expired_data->get_cached_answer(qstate,
+		msg = (*qstate->serve_expired_data->get_cached_answer)(qstate,
 			lookup_qinfo);
 		if(!msg)
 			return;