- fix screw up of rDNS display for those few folks having only IPv4 ;-)

This commit is contained in:
Dirk Wetter 2015-10-06 12:30:29 +02:00
parent a3a15aa11e
commit 0600e39b45

View File

@ -4359,7 +4359,7 @@ determine_rdns() {
rDNS=$(nslookup -type=PTR $NODEIP 2>/dev/null | grep -v 'canonical name =' | grep 'name = ' | awk '{ print $NF }' | sed 's/\.$//') rDNS=$(nslookup -type=PTR $NODEIP 2>/dev/null | grep -v 'canonical name =' | grep 'name = ' | awk '{ print $NF }' | sed 's/\.$//')
fi fi
OPENSSL_CONF="$saved_openssl_conf" # see https://github.com/drwetter/testssl.sh/issues/134 OPENSSL_CONF="$saved_openssl_conf" # see https://github.com/drwetter/testssl.sh/issues/134
#rDNS="$(echo $rDNS)" rDNS="$(echo $rDNS)"
[[ -z "$rDNS" ]] && rDNS=" --" [[ -z "$rDNS" ]] && rDNS=" --"
return 0 return 0
} }
@ -4536,9 +4536,11 @@ display_rdns_etc() {
outln " A record via /etc/hosts " outln " A record via /etc/hosts "
fi fi
if [[ -n "$rDNS" ]]; then if [[ -n "$rDNS" ]]; then
$HAS_IPv6 || \ if $HAS_IPv6; then
printf " %-23s %s" "rDNS ($NODEIP):" "$rDNS" && \
printf " %-23s %s" "rDNS $NODEIP:" "$rDNS" printf " %-23s %s" "rDNS $NODEIP:" "$rDNS"
else
printf " %-23s %s" "rDNS ($NODEIP):" "$rDNS"
fi
fi fi
} }
@ -5102,4 +5104,4 @@ fi
exit $? exit $?
# $Id: testssl.sh,v 1.400 2015/10/05 07:56:20 dirkw Exp $ # $Id: testssl.sh,v 1.401 2015/10/06 10:30:27 dirkw Exp $