upstream commit

add a debug2() right before DNS resolution; it's a place
 where ssh could previously silently hang for a while. bz#2433

Upstream-ID: 52a1a3e0748db66518e7598352c427145692a6a0

diff --git a/ssh.c b/ssh.c
index 59c1f931cb0a2f779f0e1478c680bba7cb14e952..6053db2194a64524444766d3df839ae5bbc1e4c0 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.420 2015/07/30 00:01:34 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.421 2015/09/04 04:56:09 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1184,6 +1184,7 @@ main(int ac, char **av)
         * have yet resolved the hostname. Do so now.
         */
        if (addrs == NULL && options.proxy_command == NULL) {
+               debug2("resolving \"%s\" port %d", host, options.port);
                if ((addrs = resolve_host(host, options.port, 1,
                    cname, sizeof(cname))) == NULL)
                        cleanup_exit(255); /* resolve_host logs the error */