1
0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 23:08:07 +00:00

Merge pull request #1456 from WaLLy3K/patch-3

Update queryFunc() to search Whitelist
This commit is contained in:
Dan Schaper 2017-05-11 03:45:40 -07:00 committed by GitHub
commit e23c6899e0

6
pihole
View File

@ -106,12 +106,12 @@ queryFunc() {
domain="${2}"
fi
# Scan Blacklist and Wildcards
lists="/etc/pihole/blacklist.txt $wildcardlist"
# Scan Whitelist, Blacklist and Wildcards
lists="/etc/pihole/whitelist.txt /etc/pihole/blacklist.txt $wildcardlist"
result=$(scanList ${domain} "${lists}" ${method})
if [ -n "$result" ]; then
echo "$result"
exit 0
[[ ! -t 1 ]] && exit 0
fi
# Scan Domains lists