diff options
author | Damien Miller <djm@mindrot.org> | 2014-02-04 11:26:04 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-02-04 11:26:04 +1100 |
commit | d56b44d2dfa093883a5c4e91be3f72d99946b170 (patch) | |
tree | 32b9891d50fc46edd15c1cf0b73a0fa1ace5c8b5 | |
parent | db3c595ea74ea9ccd5aa644d7e1f8dc675710731 (diff) |
- 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@
-rw-r--r-- | ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.398 2014/01/31 16:39:19 tedu Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.399 2014/02/04 00:24:29 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -780,7 +780,6 @@ main(int ac, char **av) | |||
780 | if (!host) | 780 | if (!host) |
781 | usage(); | 781 | usage(); |
782 | 782 | ||
783 | lowercase(host); | ||
784 | host_arg = xstrdup(host); | 783 | host_arg = xstrdup(host); |
785 | 784 | ||
786 | OpenSSL_add_all_algorithms(); | 785 | OpenSSL_add_all_algorithms(); |
@@ -914,6 +913,7 @@ main(int ac, char **av) | |||
914 | } | 913 | } |
915 | 914 | ||
916 | /* If canonicalization requested then try to apply it */ | 915 | /* If canonicalization requested then try to apply it */ |
916 | lowercase(host); | ||
917 | if (options.canonicalize_hostname != SSH_CANONICALISE_NO) | 917 | if (options.canonicalize_hostname != SSH_CANONICALISE_NO) |
918 | addrs = resolve_canonicalize(&host, options.port); | 918 | addrs = resolve_canonicalize(&host, options.port); |
919 | /* | 919 | /* |