summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2020-04-03 03:12:12 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2020-04-03 03:12:12 +0000
commit3373a6e2ea71d74c5c3fcf84103d6096fe79a0e8 (patch)
tree2475c965c539251395a37048cb098893d5847e5b /usr.bin
parent6f6188894d60b8dc09c5a551292baea2ea11a30f (diff)
%C expansion just added to Match Exec should include remote user not local
user.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/readconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index dce08a7e7ad..0e1c4405231 100644
--- a/usr.bin/ssh/readconf.c
+++ b/usr.bin/ssh/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
@@ -660,7 +660,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,