upstream: fix incorrect expansion of %i in

load_public_identity_files(); reported by Roumen Petrov

OpenBSD-Commit-ID: a827289e77149b5e0850d72a350c8b0300e7ef25

1 files changed, 2 insertions, 2 deletions

diff --git a/ssh.c b/ssh.c
index a8505a0ee..fe3e1a83a 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,