From nobody Tue Apr 26 13:45:03 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E14C41AB161D; Tue, 26 Apr 2022 13:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Knjmv5zKDz4vn0; Tue, 26 Apr 2022 13:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650980703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WHgnPmoslcAm4Q0fxjViMqPOvC/cc9fGbChXHzinzME=; b=pRXH/6wJcBebGHVMg7/u/f6QUmBDPhINPY9tRwpzL8LYtTxMbHGg/Ytl1XFZau5vM02uA1 JJKnwVzLYKsZxJawNoctufKKPeyIRK89QL2sHaxIfW7E/VdOJXVJCWmsRfbdViuLdbE27I wfqQ+hEgPpwbTV6GBytBjauZ+6gyq8vTerR2apUFEUpu6AnwOEupm8QRoMQ1mN26k3I7E7 AQRHnYeI5Nd+BL66/yma08Eb8RRT4byeTt3OFADYfekjvnym9vXQcMvjmfRgCi4NMzeqo6 CxQBFNRBP+bolEEdls54AhD4sTTiTnL8jyZ3s6l3WOaEkq8WIyZJUwGaPp/Wfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD9BE10336; Tue, 26 Apr 2022 13:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23QDj3vH026760; Tue, 26 Apr 2022 13:45:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QDj30G026759; Tue, 26 Apr 2022 13:45:03 GMT (envelope-from git) Date: Tue, 26 Apr 2022 13:45:03 GMT Message-Id: <202204261345.23QDj30G026759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: f52bfdc1148d - stable/12 - ssh: remove duplicate setting of MAIL env var List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f52bfdc1148d12be09802a37e29e7cdba0b58699 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650980703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WHgnPmoslcAm4Q0fxjViMqPOvC/cc9fGbChXHzinzME=; b=oKhd2AK9GclgjXLD8VRIft12Mlyg6O/NgCSd0xv9DpJmXujr/iOpfWMYLQOyE1MawMTkkw XWoUedHjc03Qzu2eljovxtqnEfEDMT22j7UWJHk1Mgv1ttn5GCjgP4WaRIMtNoWu8EcCm0 Vxffjjg5b10sVTGfkQzGvjiAH34EUQu27nOLwO3kuEu09ltFj0WpgE37LHSeZD4iBEcDMN AU/m4OBkR5pl0dzKP2oQzx+V2DG5Qbhw6W1d6EP7PVoKQo5ppGwYKX8RznA67Vj5n/dtoQ 7nDPIkwzeCymSBGhFfvVKDNkPI9OeEf7dVjzIfyDWb7zAdFqJNzGCzUHFUsTlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650980703; a=rsa-sha256; cv=none; b=B9MjfZe2bVoe+Md4cWLeCGwgdvUoBjsp97fX+uObSohbo/v0IPw6pvCOsBI4jSvBrN11Xq giTWt77FIhj88m/qlP7tgLaXAl2ZLn6goZ+ksmQPZLKTJA19/8YHtoOaHDkoh54ScyTgFe 9S6qMqI0oKasXzNsfRRi8Mn2GLSXWket9EFS3gIinDhkvf5B2hjZ0WcRr8EhLWRcT/xqlo l2BuF5lfPOKRjs6yf5+Xqb/eYtlfru6qsT/YkFC+DcCU4QjGjy1EYlyevaJTWf5Avag1b2 sdkKy74ilWnyXIevCJ5PvQFEuaF/iMVGIM30NjtY0YG5z2sVQ4dc7Fy9yZxISg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f52bfdc1148d12be09802a37e29e7cdba0b58699 commit f52bfdc1148d12be09802a37e29e7cdba0b58699 Author: Ed Maste AuthorDate: 2022-04-18 23:57:48 +0000 Commit: Ed Maste CommitDate: 2022-04-26 13:40:11 +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 (cherry picked from commit 19780592633e50efca39454d1ecf029bd7d87868) --- crypto/openssh/session.c | 6 ------ 1 file changed, 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);