arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-23 07:18:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1456 from WaLLy3K/patch-3

Browse Source 
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
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pihole
View File

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