summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-02-04 11:26:04 +1100
committerDamien Miller <djm@mindrot.org>2014-02-04 11:26:04 +1100
commitd56b44d2dfa093883a5c4e91be3f72d99946b170 (patch)
tree32b9891d50fc46edd15c1cf0b73a0fa1ace5c8b5
parentdb3c595ea74ea9ccd5aa644d7e1f8dc675710731 (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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh.c b/ssh.c
index ec957333..add760ca 100644
--- a/ssh.c
+++ b/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>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -780,7 +780,6 @@ main(int ac, char **av)
if (!host)
usage();
- lowercase(host);
host_arg = xstrdup(host);
OpenSSL_add_all_algorithms();
@@ -914,6 +913,7 @@ main(int ac, char **av)
}
/* If canonicalization requested then try to apply it */
+ lowercase(host);
if (options.canonicalize_hostname != SSH_CANONICALISE_NO)
addrs = resolve_canonicalize(&host, options.port);
/*