sync with OpenBSD -current
This commit is contained in:
parent
01dd575d45
commit
12ef7bd342
59 changed files with 264 additions and 223 deletions
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: sshconnect.c,v 1.366 2024/01/11 01:45:36 djm Exp $ */
|
||||
/* $OpenBSD: sshconnect.c,v 1.367 2024/04/23 13:34:50 jsg Exp $ */
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||
|
@ -609,7 +609,7 @@ get_hostfile_hostname_ipaddr(char *hostname, struct sockaddr *hostaddr,
|
|||
if (options.proxy_command == NULL) {
|
||||
if (getnameinfo(hostaddr, hostaddr->sa_len,
|
||||
ntop, sizeof(ntop), NULL, 0, NI_NUMERICHOST) != 0)
|
||||
fatal_f("getnameinfo failed");
|
||||
fatal_f("getnameinfo failed");
|
||||
*hostfile_ipaddr = put_host_port(ntop, port);
|
||||
} else {
|
||||
*hostfile_ipaddr = xstrdup("<no hostip for proxy "
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue