tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 16:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: use _PATH_SSH_USER_DIR instead of hardcoded .ssh in path

Browse Source 
OpenBSD-Commit-ID: 5c1048468813107baa872f5ee33ba51623630e01
This commit is contained in:
djm@openbsd.org 2020-12-14 03:13:12 +00:00 committed by Damien Miller
parent a5ab499bd2
commit bef92346c4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
session.c
View File

@ -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 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -1120,8 +1120,8 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
/* read $HOME/.ssh/environment. */ /* read $HOME/.ssh/environment. */
if (options.permit_user_env) { if (options.permit_user_env) {
snprintf(buf, sizeof buf, "%.200s/.ssh/environment", snprintf(buf, sizeof buf, "%.200s/%s/environment",
pw->pw_dir); pw->pw_dir, _PATH_SSH_USER_DIR);
read_environment_file(&env, &envsize, buf, read_environment_file(&env, &envsize, buf,
options.permit_user_env_allowlist); options.permit_user_env_allowlist);
} }