Merge pull request #1893 from pi-hole/release/v5.25.1

Fix spurious "resource limit exceeded" messages (v5 backport)
pi-hole · Feb 20, 2024 · 1c2257b · 1c2257b
2 parents 4f92b48 + df58921
commit 1c2257b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,6 +11,6 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(PIHOLE_FTL C)
 
-set(DNSMASQ_VERSION pi-hole-v2.90)
+set(DNSMASQ_VERSION pi-hole-v2.90+1)
 
 add_subdirectory(src)
diff --git a/src/dnsmasq/forward.c b/src/dnsmasq/forward.c
@@ -981,10 +981,10 @@ static void dnssec_validate(struct frec *forward, struct dns_header *header,
 	status = dnssec_validate_reply(now, header, plen, daemon->namebuff, daemon->keyname, &forward->class, 
 				       !option_bool(OPT_DNSSEC_IGN_NS) && (forward->sentto->flags & SERV_DO_DNSSEC),
 				       NULL, NULL, NULL, &orig->validate_counter);
-    }
 
-  if (STAT_ISEQUAL(status, STAT_ABANDONED))
-    log_resource = 1;
+      if (STAT_ISEQUAL(status, STAT_ABANDONED))
+	log_resource = 1;
+    }
 
   /* Can't validate, as we're missing key data. Put this
      answer aside, whilst we get that. */