diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-04-03 03:12:11 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-04-03 15:35:28 +1100 |
commit | eece243666d44ceb710d004624c5c7bdc05454bc (patch) | |
tree | 18895d7deb50c528afd1996496d49823a7d3f3d0 /readconf.c | |
parent | d5318a784d016478fc8da90a38d9062c51c10432 (diff) |
upstream: %C expansion just added to Match Exec should include
remote user not local user.
OpenBSD-Commit-ID: 80f1d976938f2a55ee350c11d8b796836c8397e2
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c index 1a3b2db29..4a5dc3aa7 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.327 2020/04/03 02:27:12 dtucker Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.328 2020/04/03 03:12:11 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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, | |||
674 | snprintf(uidstr, sizeof(uidstr), "%llu", | 674 | snprintf(uidstr, sizeof(uidstr), "%llu", |
675 | (unsigned long long)pw->pw_uid); | 675 | (unsigned long long)pw->pw_uid); |
676 | conn_hash_hex = ssh_connection_hash(thishost, host, | 676 | conn_hash_hex = ssh_connection_hash(thishost, host, |
677 | portstr, pw->pw_name); | 677 | portstr, ruser); |
678 | 678 | ||
679 | cmd = percent_expand(arg, | 679 | cmd = percent_expand(arg, |
680 | "C", conn_hash_hex, | 680 | "C", conn_hash_hex, |