- Fix #1193: log-servfail fails to log host SERVFAIL responses in

  Unbound 1.19.2 on Ubuntu 24.04.1 LTS, by not considering cached
  failures when trying to reply with expired data.

diff --git a/services/mesh.c b/services/mesh.c
index 5b9a02ae48a9590d4bef49b8d974c8dbe3acafe7..18a53b4a5947d59c240e1c9a77cdcc4c10d408ec 100644 (file)
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -2203,8 +2203,13 @@ mesh_serve_expired_callback(void* arg)
                        qstate->serve_expired_data->get_cached_answer));
                msg = (*qstate->serve_expired_data->get_cached_answer)(qstate,
                        lookup_qinfo, &is_expired);
-               if(!msg)
+               if(!msg || (FLAGS_GET_RCODE(msg->rep->flags) != LDNS_RCODE_NOERROR
+                       && FLAGS_GET_RCODE(msg->rep->flags) != LDNS_RCODE_NXDOMAIN
+                       && FLAGS_GET_RCODE(msg->rep->flags) != LDNS_RCODE_YXDOMAIN)) {
+                       /* We don't care for cached failure answers at this
+                        * stage. */
                        return;
+               }
                /* Reset these in case we pass a second time from here. */
                encode_rep = msg->rep;
                memset(&actinfo, 0, sizeof(actinfo));