diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2007-05-20 07:09:42 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2007-05-20 07:09:42 +0200 |
| commit | 26c6662834a0ed748c52044a60ed51b9102e7d54 (patch) | |
| tree | c04bfd7bfc94fe1b26f6e830f1aad27f3e8c1b3a /sshconnect2.c | |
| parent | - djm@cvs.openbsd.org 2007/05/17 07:55:29 (diff) | |
| download | openssh-26c6662834a0ed748c52044a60ed51b9102e7d54.tar.xz openssh-26c6662834a0ed748c52044a60ed51b9102e7d54.zip | |
- djm@cvs.openbsd.org 2007/05/17 20:48:13
[sshconnect2.c]
fall back to gethostname() when the outgoing connection is not
on a socket, such as is the case when ProxyCommand is used.
Gives hostbased auth an opportunity to work; bz#616, report
and feedback stuart AT kaloram.com; ok markus@
Diffstat (limited to '')
| -rw-r--r-- | sshconnect2.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index dd971a9f9..2b2740154 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.162 2006/08/30 00:06:51 dtucker Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.163 2007/05/17 20:48:13 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -1307,7 +1307,7 @@ userauth_hostbased(Authctxt *authctxt) Sensitive *sensitive = authctxt->sensitive; Buffer b; u_char *signature, *blob; - char *chost, *pkalg, *p; + char *chost, *pkalg, *p, myname[NI_MAXHOST]; const char *service; u_int blen, slen; int ok, i, len, found = 0; @@ -1331,7 +1331,16 @@ userauth_hostbased(Authctxt *authctxt) return 0; } /* figure out a name for the client host */ - p = get_local_name(packet_get_connection_in()); + p = NULL; + if (packet_connection_is_on_socket()) + p = get_local_name(packet_get_connection_in()); + if (p == NULL) { + if (gethostname(myname, sizeof(myname)) == -1) { + verbose("userauth_hostbased: gethostname: %s", + strerror(errno)); + } else + p = xstrdup(myname); + } if (p == NULL) { error("userauth_hostbased: cannot get local ipaddr/name"); key_free(private); |