upstream: %C expansion just added to Match Exec should include

remote user not local user.

OpenBSD-Commit-ID: 80f1d976938f2a55ee350c11d8b796836c8397e2

diff --git a/readconf.c b/readconf.c
index 1a3b2db290fda6f0fd6deb4bd3c54f12828d8a62..4a5dc3aa7d99415f3c842aa23bd760029c840163 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.327 2020/04/03 02:27:12 dtucker Exp $ */
+/* $OpenBSD: readconf.c,v 1.328 2020/04/03 03:12:11 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -674,7 +674,7 @@ match_cfg_line(Options *options, char **condition, struct passwd *pw,
                        snprintf(uidstr, sizeof(uidstr), "%llu",
                            (unsigned long long)pw->pw_uid);
                        conn_hash_hex = ssh_connection_hash(thishost, host,
-                          portstr, pw->pw_name);
+                          portstr, ruser);
 
                        cmd = percent_expand(arg,
                            "C", conn_hash_hex,