diff options
author | vangyzen <vangyzen@FreeBSD.org> | 2015-07-16 18:44:18 +0000 |
---|---|---|
committer | vangyzen <vangyzen@FreeBSD.org> | 2015-07-16 18:44:18 +0000 |
commit | 2eb95738be3dbbc2cddd1215164bcecc14914109 (patch) | |
tree | 5ec5aa506669fa0e0093abdac61b8a54541bad51 /crypto | |
parent | e0ca6c5ecbbdd5ade6eea81c075dbda74df27860 (diff) | |
download | FreeBSD-src-2eb95738be3dbbc2cddd1215164bcecc14914109.zip FreeBSD-src-2eb95738be3dbbc2cddd1215164bcecc14914109.tar.gz |
ssh: canonicize the host name before looking it up in the host file
Re-apply r99054 by des in 2002. This was accidentally dropped
by the update to OpenSSH 6.5p1 (r261320).
This change is actually taken from r387082 of
ports/security/openssh-portable/files/patch-ssh.c
PR: 198043
Differential Revision: https://reviews.freebsd.org/D3103
Reviewed by: des
Approved by: kib (mentor)
MFC after: 3 days
Relnotes: yes
Sponsored by: Dell Inc.
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/openssh/ssh.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c index eb69b72..1c0784a 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -1001,6 +1001,23 @@ main(int ac, char **av) shorthost[strcspn(thishost, ".")] = '\0'; snprintf(portstr, sizeof(portstr), "%d", options.port); + /* Find canonic host name. */ + if (strchr(host, '.') == 0) { + struct addrinfo hints; + struct addrinfo *ai = NULL; + int errgai; + memset(&hints, 0, sizeof(hints)); + hints.ai_family = options.address_family; + hints.ai_flags = AI_CANONNAME; + hints.ai_socktype = SOCK_STREAM; + errgai = getaddrinfo(host, NULL, &hints, &ai); + if (errgai == 0) { + if (ai->ai_canonname != NULL) + host = xstrdup(ai->ai_canonname); + freeaddrinfo(ai); + } + } + if (options.local_command != NULL) { debug3("expanding LocalCommand: %s", options.local_command); cp = options.local_command; |