diff options
| author | des <des@FreeBSD.org> | 2010-03-09 19:16:43 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2010-03-09 19:16:43 +0000 |
| commit | c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9 (patch) | |
| tree | 286162d33ef4c84bb329fd42641bbe0dd68cc42c /crypto/openssh/canohost.c | |
| parent | 68f48e51f9a4d71d7fb9c332592215895a206ff6 (diff) | |
| parent | 57baac6b030508c9bcd74f3b995bd6a4a4f79211 (diff) | |
| download | FreeBSD-src-c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9.zip FreeBSD-src-c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9.tar.gz | |
Upgrade to OpenSSH 5.4p1.
MFC after: 1 month
Diffstat (limited to 'crypto/openssh/canohost.c')
| -rw-r--r-- | crypto/openssh/canohost.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/crypto/openssh/canohost.c b/crypto/openssh/canohost.c index 22b19bb..ef94d91 100644 --- a/crypto/openssh/canohost.c +++ b/crypto/openssh/canohost.c @@ -1,4 +1,4 @@ -/* $OpenBSD: canohost.c,v 1.65 2009/05/27 06:31:25 andreas Exp $ */ +/* $OpenBSD: canohost.c,v 1.66 2010/01/13 01:20:20 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -27,6 +27,7 @@ #include <stdlib.h> #include <string.h> #include <stdarg.h> +#include <unistd.h> #include "xmalloc.h" #include "packet.h" @@ -301,9 +302,22 @@ get_local_ipaddr(int sock) } char * -get_local_name(int sock) +get_local_name(int fd) { - return get_socket_address(sock, 0, NI_NAMEREQD); + char *host, myname[NI_MAXHOST]; + + /* Assume we were passed a socket */ + if ((host = get_socket_address(fd, 0, NI_NAMEREQD)) != NULL) + return host; + + /* Handle the case where we were passed a pipe */ + if (gethostname(myname, sizeof(myname)) == -1) { + verbose("get_local_name: gethostname: %s", strerror(errno)); + } else { + host = xstrdup(myname); + } + + return host; } void |
