summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2018-06-08 03:35:36 +0000
committerdjm <djm@openbsd.org>2018-06-08 03:35:36 +0000
commit88bdf8044fd578c8eb33d0563f11f8505b238506 (patch)
treec238b6c6e2d54f131ab2b60b098c0ada7e84fbd0 /usr.bin/ssh/ssh.c
parentfix some over-long lines and __func__ up some debug messages (diff)
downloadwireguard-openbsd-88bdf8044fd578c8eb33d0563f11f8505b238506.tar.xz
wireguard-openbsd-88bdf8044fd578c8eb33d0563f11f8505b238506.zip
fix incorrect expansion of %i in load_public_identity_files(); reported by
Roumen Petrov
Diffstat (limited to 'usr.bin/ssh/ssh.c')
-rw-r--r--usr.bin/ssh/ssh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index c9fafa8635d..f575e8aaf56 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/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
@@ -2068,7 +2068,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,