Merge pull request #1976 from ap-wtioit/3.1dev-fix_dig_r_check

Fix dig -r check to only run if dig is available
This commit is contained in:
Dirk Wetter 2021-09-06 10:19:41 +02:00 committed by GitHub
commit 8f20d11830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -20115,15 +20115,15 @@ check_resolver_bins() {
type -p idn &>/dev/null && HAS_IDN=true
type -p idn2 &>/dev/null && HAS_IDN2=true
# Old dig versions don't have an option to ignore $HOME/.digrc
if ! dig -h | grep -qE '\-r.*~/.digrc'; then
HAS_DIG_R=false
DIG_R=""
fi
if ! "$HAS_DIG" && ! "$HAS_HOST" && ! "$HAS_DRILL" && ! "$HAS_NSLOOKUP"; then
fatal "Neither \"dig\", \"host\", \"drill\" or \"nslookup\" is present" $ERR_DNSBIN
fi
if "$HAS_DIG"; then
# Old dig versions don't have an option to ignore $HOME/.digrc
if ! dig -h | grep -qE '\-r.*~/.digrc'; then
HAS_DIG_R=false
DIG_R=""
fi
if dig -h | grep -Eq idnout; then
HAS_DIG_NOIDNOUT=true
fi