Github
/
FTL
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1894 from pi-hole/master 

Sync master back into development
This commit is contained in:
Dominik 2024-03-02 18:31:02 +01:00 committed by GitHub
parent 8543015f90 1c2257bed6
commit 449654fed4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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
src/dnsmasq/forward.c
View File

@ -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. */