mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-27 07:44:29 +02:00
- djm@cvs.openbsd.org 2014/02/04 00:24:29
[ssh.c] delay lowercasing of hostname until right before hostname canonicalisation to unbreak case-sensitive matching of ssh_config; reported by Ike Devolder; ok markus@
This commit is contained in:
parent
db3c595ea7
commit
d56b44d2df
4
ssh.c
4
ssh.c
@ -1,4 +1,4 @@
|
|||||||
/* $OpenBSD: ssh.c,v 1.398 2014/01/31 16:39:19 tedu Exp $ */
|
/* $OpenBSD: ssh.c,v 1.399 2014/02/04 00:24:29 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
|
||||||
@ -780,7 +780,6 @@ main(int ac, char **av)
|
|||||||
if (!host)
|
if (!host)
|
||||||
usage();
|
usage();
|
||||||
|
|
||||||
lowercase(host);
|
|
||||||
host_arg = xstrdup(host);
|
host_arg = xstrdup(host);
|
||||||
|
|
||||||
OpenSSL_add_all_algorithms();
|
OpenSSL_add_all_algorithms();
|
||||||
@ -914,6 +913,7 @@ main(int ac, char **av)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* If canonicalization requested then try to apply it */
|
/* If canonicalization requested then try to apply it */
|
||||||
|
lowercase(host);
|
||||||
if (options.canonicalize_hostname != SSH_CANONICALISE_NO)
|
if (options.canonicalize_hostname != SSH_CANONICALISE_NO)
|
||||||
addrs = resolve_canonicalize(&host, options.port);
|
addrs = resolve_canonicalize(&host, options.port);
|
||||||
/*
|
/*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user