Skip to content

Commit f716193

Browse files
authored
Merge pull request #2362 from drwetter/fix_2361_dnsminimal
Fix misleading output
2 parents be987d1 + 9b8dc3a commit f716193

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

testssl.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9736,7 +9736,7 @@ certificate_info() {
97369736
pr_italic "$(out_row_aligned_max_width "$all_caa" "$indent " $TERM_WIDTH)"
97379737
fileout "${jsonID}${json_postfix}" "OK" "$all_caa"
97389738
elif [[ -n "$NODNS" ]]; then
9739-
out "(instructed to minimize DNS queries)"
9739+
out "(instructed to minimize/skip DNS queries)"
97409740
fileout "${jsonID}${json_postfix}" "INFO" "check skipped as instructed"
97419741
elif "$DNS_VIA_PROXY"; then
97429742
out "(instructed to use the proxy for DNS only)"
@@ -21268,9 +21268,10 @@ determine_rdns() {
2126821268
local saved_openssl_conf="$OPENSSL_CONF"
2126921269
local nodeip="" rdns="" line=""
2127021270

21271-
[[ -n "$NODNS" ]] && rDNS="(instructed to minimize DNS queries)" && return 0 # PTR records were not asked for
21272-
local nodeip="$(tr -d '[]' <<< $NODEIP)" # for DNS we do not need the square brackets of IPv6 addresses
21273-
OPENSSL_CONF="" # see https://github.com/drwetter/testssl.sh/issues/134
21271+
[[ "$NODNS" == none ]] && rDNS="(instructed to skip DNS queries)" && return 0 # No DNS lookups at all
21272+
[[ "$NODNS" == min ]] && rDNS="(instructed to minimize DNS queries)" && return 0 # PTR records were not asked for
21273+
local nodeip="$(tr -d '[]' <<< $NODEIP)" # for DNS we do not need the square brackets of IPv6 addresses
21274+
OPENSSL_CONF="" # see https://github.com/drwetter/testssl.sh/issues/134
2127421275
if [[ "$NODE" == *.local ]]; then
2127521276
if "$HAS_AVAHIRESOLVE"; then
2127621277
rDNS=$(avahi-resolve -a $nodeip 2>/dev/null | awk '{ print $2 }')

0 commit comments

Comments
 (0)