diff options
| author |   djm <djm@openbsd.org> | 2020-12-14 03:13:12 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-12-14 03:13:12 +0000 |
| commit | 1ef976f35c1610369108fe6fc25ca6f679ed0c2a (patch) | |
| tree | 3d54145b8d46005ef944dd5bdb6b368f13af5483 | |
| parent | remove unused (and wrong) disable_irq() and enable_irq() defines (diff) | |
| download | wireguard-openbsd-1ef976f35c1610369108fe6fc25ca6f679ed0c2a.tar.xz wireguard-openbsd-1ef976f35c1610369108fe6fc25ca6f679ed0c2a.zip | |
use _PATH_SSH_USER_DIR instead of hardcoded .ssh in path
| -rw-r--r-- | usr.bin/ssh/session.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c index 55912443472..b52d273b3df 100644 --- a/usr.bin/ssh/session.c +++ b/usr.bin/ssh/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.326 2020/11/28 03:27:59 djm Exp $ */ +/* $OpenBSD: session.c,v 1.327 2020/12/14 03:13:12 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -905,8 +905,8 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell) /* read $HOME/.ssh/environment. */ if (options.permit_user_env) { - snprintf(buf, sizeof buf, "%.200s/.ssh/environment", - pw->pw_dir); + snprintf(buf, sizeof buf, "%.200s/%s/environment", + pw->pw_dir, _PATH_SSH_USER_DIR); read_environment_file(&env, &envsize, buf, options.permit_user_env_allowlist); } |