From bef92346c4a808f33216e54d6f4948f9df2ad7c1 Mon Sep 17 00:00:00 2001
From: "djm@openbsd.org" <djm@openbsd.org>
Date: Mon, 14 Dec 2020 03:13:12 +0000
Subject: [PATCH] upstream: use _PATH_SSH_USER_DIR instead of hardcoded .ssh in
path
OpenBSD-Commit-ID: 5c1048468813107baa872f5ee33ba51623630e01
---
session.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/session.c b/session.c
index 2f716ce97..e63fc472c 100644
--- a/session.c
+++ b/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
@@ -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);
}