diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2022-04-18 23:57:48 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2022-04-26 13:36:09 +0000 |
| commit | 2cf06d01f916b164cccbb5d09fe20d259d09cf2b (patch) | |
| tree | 80246238f10bcd1f92b940d4abbb8103a4cedab0 | |
| parent | 364a69a529b215d72357e2957bf45f2c3652ae4f (diff) | |
| download | src-2cf06d01f916b164cccbb5d09fe20d259d09cf2b.tar.gz src-2cf06d01f916b164cccbb5d09fe20d259d09cf2b.zip | |
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
(cherry picked from commit 19780592633e50efca39454d1ecf029bd7d87868)
| -rw-r--r-- | crypto/openssh/session.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c index 31d3bb932a50..7911ac98c786 100644 --- a/crypto/openssh/session.c +++ b/crypto/openssh/session.c @@ -1078,12 +1078,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); |