From: Yorgos Thessalonikefs <yorgos@nlnetlabs.nl>
Date: Wed, 6 Nov 2024 15:19:19 +0000 (+0100)
Subject: - Fix SERVFAIL logging.
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7b68e21565c29ba724cce9727070a802b91c208e;p=thirdparty%2Funbound.git

- Fix SERVFAIL logging.
---

diff --git a/services/mesh.c b/services/mesh.c
index cca12cf24..f69825b3c 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1510,11 +1510,12 @@ void mesh_query_done(struct mesh_state* mstate)
 		comm_timer_delete(mstate->s.serve_expired_data->timer);
 		mstate->s.serve_expired_data->timer = NULL;
 	}
-	if(mstate->s.env->cfg->serve_expired &&
-		(mstate->s.return_rcode == LDNS_RCODE_SERVFAIL ||
-		(rep && FLAGS_GET_RCODE(rep->flags) == LDNS_RCODE_SERVFAIL))) {
-		/* we are SERVFAILing; check for expired answer here */
-		mesh_respond_serve_expired(mstate);
+	if(mstate->s.return_rcode == LDNS_RCODE_SERVFAIL ||
+		(rep && FLAGS_GET_RCODE(rep->flags) == LDNS_RCODE_SERVFAIL)) {
+		if(mstate->s.env->cfg->serve_expired) {
+			/* we are SERVFAILing; check for expired answer here */
+			mesh_respond_serve_expired(mstate);
+		}
 		if((mstate->reply_list || mstate->cb_list)
 		&& mstate->s.env->cfg->log_servfail
 		&& !mstate->s.env->cfg->val_log_squelch) {