upstream: fix incorrect expansion of %i in

load_public_identity_files(); reported by Roumen Petrov

OpenBSD-Commit-ID: a827289e77149b5e0850d72a350c8b0300e7ef25
This commit is contained in:
djm@openbsd.org 2018-06-08 03:35:36 +00:00 committed by Damien Miller
parent 027607fc2d
commit 0368889f82
1 changed files with 2 additions and 2 deletions

4
ssh.c
View File

@ -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,