diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-12-14 03:13:12 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-12-14 15:38:50 +1100 |
| commit | bef92346c4a808f33216e54d6f4948f9df2ad7c1 (patch) | |
| tree | 4b0e12859395ea8965d0c31afb3cce4f933f0d57 /session.c | |
| parent | a5ab499bd2644b4026596fc2cb24a744fa310666 (diff) | |
| download | openssh-git-bef92346c4a808f33216e54d6f4948f9df2ad7c1.tar.gz | |
upstream: use _PATH_SSH_USER_DIR instead of hardcoded .ssh in path
OpenBSD-Commit-ID: 5c1048468813107baa872f5ee33ba51623630e01
Diffstat (limited to 'session.c')
| -rw-r--r-- | session.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 @@ -1120,8 +1120,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); } |