===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -r1.480 -r1.481
--- src/usr.bin/ssh/ssh.c	2018/06/06 18:22:41	1.480
+++ src/usr.bin/ssh/ssh.c	2018/06/08 03:35:36	1.481
@@ -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 @@
 		filename = percent_expand(cp,
 		    "d", pw->pw_dir,
 		    "h", host,
-		    "i", host,
+		    "i", uidstr,
 		    "l", thishost,
 		    "r", options.user,
 		    "u", pw->pw_name,