summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-06-08 03:35:36 +0000
committerDamien Miller <djm@mindrot.org>2018-06-09 13:10:59 +1000
commit0368889f82f63c82ff8db9f8c944d89e7c657db4 (patch)
treeb5a186b29fa0e215e7e2dc9be0946aae18c732c9 /ssh.c
parent027607fc2db6a0475a3380f8d95c635482714cb0 (diff)
upstream: fix incorrect expansion of %i in
load_public_identity_files(); reported by Roumen Petrov OpenBSD-Commit-ID: a827289e77149b5e0850d72a350c8b0300e7ef25
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh.c b/ssh.c
index a8505a0e..fe3e1a83 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.480 2018/06/06 18:22:41 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.481 2018/06/08 03:35:36 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2118,7 +2118,7 @@ load_public_identity_files(struct passwd *pw)
filename = percent_expand(cp,
"d", pw->pw_dir,
"h", host,
- "i", host,
+ "i", uidstr,
"l", thishost,
"r", options.user,
"u", pw->pw_name,