diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-06-08 03:35:36 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-06-09 13:10:59 +1000 |
commit | 0368889f82f63c82ff8db9f8c944d89e7c657db4 (patch) | |
tree | b5a186b29fa0e215e7e2dc9be0946aae18c732c9 | |
parent | 027607fc2db6a0475a3380f8d95c635482714cb0 (diff) |
upstream: fix incorrect expansion of %i in
load_public_identity_files(); reported by Roumen Petrov
OpenBSD-Commit-ID: a827289e77149b5e0850d72a350c8b0300e7ef25
-rw-r--r-- | ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.480 2018/06/06 18:22:41 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.481 2018/06/08 03:35:36 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 |
@@ -2118,7 +2118,7 @@ load_public_identity_files(struct passwd *pw) | |||
2118 | filename = percent_expand(cp, | 2118 | filename = percent_expand(cp, |
2119 | "d", pw->pw_dir, | 2119 | "d", pw->pw_dir, |
2120 | "h", host, | 2120 | "h", host, |
2121 | "i", host, | 2121 | "i", uidstr, |
2122 | "l", thishost, | 2122 | "l", thishost, |
2123 | "r", options.user, | 2123 | "r", options.user, |
2124 | "u", pw->pw_name, | 2124 | "u", pw->pw_name, |