From 6406e1828dfd92e203568467005e77e6f8154d47 Mon Sep 17 00:00:00 2001
From: Dirk <dirk@testssl.sh>
Date: Sat, 19 Sep 2015 15:03:40 +0200
Subject: [PATCH] - minor polish of output

---
 testssl.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/testssl.sh b/testssl.sh
index 53ac4c4..ad88fe2 100755
--- a/testssl.sh
+++ b/testssl.sh
@@ -2256,8 +2256,8 @@ fd_socket() {
                if [[ "${proyxline%/*}" == "HTTP" ]]; then
                     proyxline=${proyxline#* }
                     if [[ "${proyxline%% *}" != "200" ]]; then
-                         [[ "$PORT" != 443 ]] && outln "Check whether your proxy supports port $PORT and the underlying protocol."
                          pr_magenta "Unable to CONNECT via proxy. "
+                         [[ "$PORT" != 443 ]] && pr_magentaln "Check whether your proxy supports port $PORT and the underlying protocol."
                          return 6
                     fi
                fi
@@ -4290,7 +4290,9 @@ determine_service() {
      local protocol
 
      if ! fd_socket; then                         # check if we can connect to $NODEIP:$PORT
-          fatal "can't connect to \"$NODEIP:$PORT\"\nMake sure a firewall is not between you and your scanning target!" -2
+          [[ -n "$PROXY" ]] && \
+               fatal "You're sure $PROXYNODE:$PROXYPORT allows tunneling here? Can't connect to \"$NODEIP:$PORT\"" -2 || \
+               fatal "Can't connect to \"$NODEIP:$PORT\"\nMake sure a firewall is not between you and your scanning target!" -2
      fi
      close_socket
 
@@ -4360,10 +4362,10 @@ display_rdns_etc() {
           done
           outln
      fi
-     [[ -n "$rDNS" ]] && printf " %-23s %s" "rDNS ($NODEIP):" "$rDNS"
      if "$LOCAL_A"; then
-          out " (A record via /etc/hosts) "
+          outln " A record via            /etc/hosts "
      fi
+     [[ -n "$rDNS" ]] && printf " %-23s %s" "rDNS ($NODEIP):" "$rDNS"
 }
 
 datebanner() {
@@ -4897,4 +4899,4 @@ fi
 exit $?
 
 
-#  $Id: testssl.sh,v 1.381 2015/09/18 13:12:00 dirkw Exp $
+#  $Id: testssl.sh,v 1.382 2015/09/19 13:03:39 dirkw Exp $