From nobody Tue Apr 26 13:40: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 13CC51AB035E; Tue, 26 Apr 2022 13:40:04 +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 4Knjg765Tmz4v2Z; Tue, 26 Apr 2022 13:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650980403; 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=vpTWzJETvP66FAPMkzjE7uj2C1bfR4S5xxrVSq0MKFg=; b=rnx0sU3IFt/NvuTNVFEjp30ddEXJJCQPbIOVgVXRfD4//QJchJnS/ZhymnIJm5l6QftU1O hyyzbjvpNhPGfkYK4SXhsgeVCXLT3Qs1sxzOlLgOq7Y/P8gIPj9a8fKRtzFCWlvcywlVWP SDrQ8AYZUOI+yPv2ZxQHvgfqxe7+aEgjANsrbmKT8NOzkJb+nUCH3z38UFMRyDml+7OILd Gi93XKtlNoCXjGvESiyuzK3igPEhiWLAtgDTlXM3sQ7MEX9tWwfzmk5iEZHhOlggMkk/Xs cRU6181I0Fqqk/vAK/K/KVdF8Ksl2umtZoYRCwy9uYAjKJK5dsA8eW2+NuJrwQ== 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 B2AB07CCF; Tue, 26 Apr 2022 13:40: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 23QDe3SD015827; Tue, 26 Apr 2022 13:40:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QDe3dW015824; Tue, 26 Apr 2022 13:40:03 GMT (envelope-from git) Date: Tue, 26 Apr 2022 13:40:03 GMT Message-Id: <202204261340.23QDe3dW015824@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: 2cf06d01f916 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 2cf06d01f916b164cccbb5d09fe20d259d09cf2b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650980403; 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=vpTWzJETvP66FAPMkzjE7uj2C1bfR4S5xxrVSq0MKFg=; b=moHRKVy8Srtn/Aafjf8cQcEIWXq1qMY3ls0GBRROSGZyRfR9FmyH9LzcwJ6J7sC52Wqm9L rAUWNFH0SG+Nzs6nG5wy0wPSxaeftQxU7/m4AXFVwrG5dKKvo2mLWsUz7FShx5XEFk2LtM H6/rW11TWb6jdW1wXYYhpIK7P/Gr5i/cTRginz+y05jl5nZZFadwIfrlmp1ZOBLYdmcElZ PIPw/T7TYenffuDjCY9dRP8GtzrvWFDuDartSfO+trnxI5M+182oKUng0tZlz6Z+fKVyZ0 7AK6d6NOzs/xZZt+hxnZr/Avn474KLehJ0+t4/IXfmsbjDcjKgJgMeANPEA7Zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650980403; a=rsa-sha256; cv=none; b=ciqsXwa7ODtZgivdItMkJgeS8+ZM9vRxNoLmFO1QA96+GLMtqDOZ11HmYED9aRZUsij5hE WhzVXnN1mm5LuDRGRUFBMNrLLeO0c+9FTBmwMa629cEpTDt1e7V4T7B5ECuzRh3QEnZCtZ oihj/oomivc+Hd9MKLcf77dDT3xUjld2JhQ2B7MMwwwDNVQq0+u1NwMz2oPJs5LYLm3XvX /50AmSRkVm4c3asyj9+OfKe7hW98jYnH0K3/L9eoo8fti1LOAHsXSzcQY8/5KQ7iS6NYcS jI/+ohT+r2JCH4KhJJGlotftU6wnx8PwIK1lgyKno/WlCBF2bqaybEyoi0IGDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2cf06d01f916b164cccbb5d09fe20d259d09cf2b commit 2cf06d01f916b164cccbb5d09fe20d259d09cf2b Author: Ed Maste AuthorDate: 2022-04-18 23:57:48 +0000 Commit: Ed Maste CommitDate: 2022-04-26 13:36:09 +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);