tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
djm@openbsd.org 2015-09-04 04:56:09 +00:00 committed by Damien Miller
parent 46152af8d2
commit a85768a932
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssh.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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. * have yet resolved the hostname. Do so now.
*/ */
if (addrs == NULL && options.proxy_command == NULL) { if (addrs == NULL && options.proxy_command == NULL) {
debug2("resolving \"%s\" port %d", host, options.port);
if ((addrs = resolve_host(host, options.port, 1, if ((addrs = resolve_host(host, options.port, 1,
cname, sizeof(cname))) == NULL) cname, sizeof(cname))) == NULL)
cleanup_exit(255); /* resolve_host logs the error */ cleanup_exit(255); /* resolve_host logs the error */