Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-10-31 05:45:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

reverse non-typo

Browse Source 
drill comes later
This commit is contained in:
Dirk
2015-11-28 17:33:10 +01:00
parent ad8f82f190
commit 2e0e7b83d5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
testssl.sh
View File

@@ -4235,7 +4235,7 @@ EOF
cwd=$(/bin/pwd) || \ cwd=$(/bin/pwd) || \
cwd=$RUN_DIR cwd=$RUN_DIR
if [[ "$openssl_location" =~ $(/bin/pwd)/bin ]]; then if [[ "$openssl_location" =~ $(/bin/pwd)/bin ]]; then
OPENSSL_LOCATION="$PWD/bin/$(basename "$openssl_location")" OPENSSL_LOCATION="\$PWD/bin/$(basename "$openssl_location")"
elif [[ "$openssl_location" =~ $cwd ]] && [[ "$cwd" != '.' ]]; then elif [[ "$openssl_location" =~ $cwd ]] && [[ "$cwd" != '.' ]]; then
OPENSSL_LOCATION="${openssl_location%%$cwd}" OPENSSL_LOCATION="${openssl_location%%$cwd}"
else else
@@ -4433,8 +4433,8 @@ get_local_a() {
} }
check_resolver_bins() { check_resolver_bins() {
if ! which dig &> /dev/null && ! which drill &> /dev/null && ! which host &> /dev/null && ! which nslookup &>/dev/null; then if ! which dig &> /dev/null && ! which host &> /dev/null && ! which drill &> /dev/null && ! which nslookup &>/dev/null; then
fatal "Neither \"dig\", \"drill\", \"host\" or \"nslookup\" is present" "-3" fatal "Neither \"dig\", \"host\", \"drill\" or \"nslookup\" is present" "-3"
fi fi
return 0 return 0
} }
@@ -4590,7 +4590,7 @@ get_mx_record() {
elif which nslookup &> /dev/null; then elif which nslookup &> /dev/null; then
mxs=$(nslookup -type=MX "$1" 2>/dev/null | grep 'mail exchanger = ' | sed 's/^.*mail exchanger = //g') mxs=$(nslookup -type=MX "$1" 2>/dev/null | grep 'mail exchanger = ' | sed 's/^.*mail exchanger = //g')
else else
fatal "No dig, drill, host or nslookup" -3 fatal "No dig, host, drill or nslookup" -3
fi fi
OPENSSL_CONF="$saved_openssl_conf" OPENSSL_CONF="$saved_openssl_conf"
echo "$mxs" echo "$mxs"
@@ -5377,4 +5377,4 @@ fi
exit $? exit $?
# $Id: testssl.sh,v 1.422 2015/11/21 12:39:36 dirkw Exp $ # $Id: testssl.sh,v 1.423 2015/11/28 16:33:09 dirkw Exp $