diff options
author | Damien Miller <djm@mindrot.org> | 2014-02-04 11:26:04 +1100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-12 01:16:13 +0000 |
commit | bdb60d16baf6d163844fc6f5f8520bc853b6611b (patch) | |
tree | d9317d409a9f6a6703093496feb81d9688eac119 /ssh.c | |
parent | f08f2d9c3fedf37f97f1b2d06f1fe36af4e5f1c3 (diff) |
Unbreak case-sensitive matching of ssh_config
- 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@
Origin: backport, https://anongit.mindrot.org/openssh.git/commit/?id=d56b44d2dfa093883a5c4e91be3f72d99946b170
Bug-Debian: http://bugs.debian.org/738619
Forwarded: not-needed
Last-Update: 2014-02-11
Patch-Name: fix-case-sensitive-matching.patch
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 | /* |