From nobody Tue Apr 19 14:37:46 2022 X-Original-To: dev-commits-src-all@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 ACC7411CB563; Tue, 19 Apr 2022 14:37:46 +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 4KjRGy4R2gz4nRK; Tue, 19 Apr 2022 14:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650379066; 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=t81abEewH3KzWMrgbzrtzkS8Db1reAkzdfOlnX+tv6g=; b=OGfv+lK6WCjiJ3ww1uEuZK+PBQxzghNzo/KGcIEtAsvh2ao/Jhq3mrkXFtQuS+mXxTXnTl zDj3tzMakjiG/MXSTg5lf424mJH6ZTH3hBavCHP3LajvobPopa3RyfMOCYkmRECuXmz+RH hDEh9YNZJgzKIxVDqWJD7lMsNt9K4MFMAKjsKoA9pYqU0MCJxTqDQcaocUrp/wo03hfCqq aVcuMKFGp27XhiuKY5w0W3Ml8OVFof6mrQF6rdN7qpkeyksaOvrhwEcu2aiSBEt3ZwNqoO CygHtm5Lu3oHTU11YbxXHwo6s+RNABptrYpovlMXpdGig+mgEMc8xMBNw2MQTA== 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 7816F2911C; Tue, 19 Apr 2022 14:37:46 +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 23JEbkTD078885; Tue, 19 Apr 2022 14:37:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23JEbk09078884; Tue, 19 Apr 2022 14:37:46 GMT (envelope-from git) Date: Tue, 19 Apr 2022 14:37:46 GMT Message-Id: <202204191437.23JEbk09078884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 19780592633e - main - ssh: remove duplicate setting of MAIL env var List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 19780592633e50efca39454d1ecf029bd7d87868 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650379066; 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=t81abEewH3KzWMrgbzrtzkS8Db1reAkzdfOlnX+tv6g=; b=pC+VVHD5RLysYmHvShWFSccCOip1ChrzIAEEMnDWz0+tjNY/ThFRXFFTfrPIpdv5AlYCOJ 5dUHyY4E3NoTHKjmSmcJJFPOYm4EuDuZ4RlG+GxWM7pIgwFJq8wKwb9n+f2WglhPnxF8cm lLZ6HVus+U6OJxxqWSYgQ88EpYYSnHgTYSIi4NRSq+2o6ZnQpCVT9Pu8XFpaF/K1I0wiHd T5wT+VkMqmI3qWtgpo/eNezd6b+vxGig9VpYenYJi9ZPt5f6/G6JYuNeJeBif7aHzzE8Sx r8sjyXSN8/jSp2Js5/cC2I2q0RnLVuskvyHh4cxLpNsNGBcRHkOY0lysfRwp8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650379066; a=rsa-sha256; cv=none; b=ltBDkt+Wu3JIQ3pbJwrFg6cNXgRs2bgtgaNSrYWEG5Rjol0zd5qCEo6n7Jg2xs2hWrTv+T 9fXKrjW/3LFjMT0nbttA/CGloXwm+48X9y6pjAuznsWTQiX9T3ZGqQLPd+PGvkjObjXIFS tZ4Bvs+B9BKM5nAVs8/cA/UJxrvZ2yD4laHUbUB3M4W6PNR6eI4p/yzpjZVyy5pYiV2aOb eU+s2vO/p2ThGXgjQz3SfDu6qJzTWGk2WyRc12Sk6xOMfWwRySFP2QKickV0RA+svRrvG8 IrkMyBZmj0EoRxC5q3ZKIrcDfhLP6XMZA20DrZDN+xZyoqBfiwJ9Yx3xMwpoyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=19780592633e50efca39454d1ecf029bd7d87868 commit 19780592633e50efca39454d1ecf029bd7d87868 Author: Ed Maste AuthorDate: 2022-04-18 23:57:48 +0000 Commit: Ed Maste 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);