Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix spurious "resource limit exceeded" messages (v5 backport) #1893

Merged
merged 3 commits into from
Feb 20, 2024
Merged

Fix spurious "resource limit exceeded" messages (v5 backport) #1893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8543015
Merge pull request #1889 from pi-hole/master
DL6ER Feb 14, 2024
40886dc
Fix spurious "resource limit exceeded" messages.
simonkelley Feb 19, 2024
df58921
Update embedded dnsmasq version to 2.90+1
DL6ER Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 3 additions & 3 deletions src/dnsmasq/forward.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
Loading