git: 19780592633e - main - ssh: remove duplicate setting of MAIL env var
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 19 Apr 2022 14:37:46 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=19780592633e50efca39454d1ecf029bd7d87868
commit 19780592633e50efca39454d1ecf029bd7d87868
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-04-18 23:57:48 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-04-19 14:30:52 +0000
ssh: remove duplicate setting of MAIL env var
We already set it earlier in do_setup_env().
Fixes: 19261079b743 ("openssh: update to OpenSSH v8.7p1")
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
---
crypto/openssh/session.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c
index 830508e45a60..375ccb671d80 100644
--- a/crypto/openssh/session.c
+++ b/crypto/openssh/session.c
@@ -1077,12 +1077,6 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
# endif /* HAVE_CYGWIN */
#endif /* HAVE_LOGIN_CAP */
- if (!options.use_pam) {
- snprintf(buf, sizeof buf, "%.200s/%.50s",
- _PATH_MAILDIR, pw->pw_name);
- child_set_env(&env, &envsize, "MAIL", buf);
- }
-
/* Normal systems set SHELL by default. */
child_set_env(&env, &envsize, "SHELL", shell);