From nobody Sat Oct 22 17:05:40 2022 X-Original-To: dev-commits-src-main@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 4Mvnlm3ry3z4gSBc; Sat, 22 Oct 2022 17:05:40 +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 4Mvnlm3FQtz429f; Sat, 22 Oct 2022 17:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666458340; 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=Gt+YyvsycP9wWxi1MuwTQQbyVkc3iR2f8dCg+TI991w=; b=XMypWifVMxLoT8xmrl93HYZUQuax5bSkohoXgWrHdqRJ0rRS9QCa88xVGhu12dUbuvfwdC x26iWopvAAayaeU4F1dNZgb43nWNrNKTvB/H8zTo3qRmV+knuO3xZINUKq5dQp+CNlto+y B+06bXXJwNYBIoEjfXz9YTYBtxFBorWOqzG9SZWu0HcldqKiAkbrAcpRAX3L+xAldVnQmo 3GnsRfViVqVZEwZIJGmIVmlK3/x911JTPAYQopOORvOnombyy0xkm29+qv71VfNqZmdXAV Wg6qKfPIU8sqXJ2WXryxrPR8zb8V370YtJquure4sl3tvj5sRnB8jYlG85hN8A== 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 4Mvnlm2BCtzcbc; Sat, 22 Oct 2022 17:05:40 +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 29MH5eF8021719; Sat, 22 Oct 2022 17:05:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29MH5e41021718; Sat, 22 Oct 2022 17:05:40 GMT (envelope-from git) Date: Sat, 22 Oct 2022 17:05:40 GMT Message-Id: <202210221705.29MH5e41021718@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 8d7221ca2dd5 - main - sh: when loading profile, read only .sh files. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d7221ca2dd5e0b6c633761b314cffed82ddca72 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666458340; 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=Gt+YyvsycP9wWxi1MuwTQQbyVkc3iR2f8dCg+TI991w=; b=SOoDkA9oFGvYY3VOhXNih1yog17HCatNqRT2K4MtV68b5/rapWFSyawTrenQ8h9+WjjtGV exu1NKJQjcDuKBLrNdQ+zD9+oScKbEuPr80TLvMlAVjsvOZNlHakDinzFSUEZ691+s8o1B 77kIbl1sup28VDwrtEBvedrAiBwA6VX353TQwuR6PdZE849WLHWcO6yuBhAsGgGzC0rJll w28KIETFq2GePaLXnJVm9XKS32nt3egEWxRHcV2mL5uN+TxCNZ6/6kASoS7xZmaF2BNmfr bKNLfEHZZbSv1iMqto3cFpGptNhdmA9WQEjIdQD6m54su5ZwLoMFnM718g6A/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666458340; a=rsa-sha256; cv=none; b=wBSBwThIuxMYH6WdidPZS0iivdl2AEtH5/bmy7+bIPVh8fASMohVX03ykhRXXnnlkeyN7Q Y04eUiVqtGIWxndOvdEBGbvF/FsesbrppwgB6SRl8jJ/4nKPxbI7dwRnHLSNzyzWb6j08E FjwktEW3s6hjqxoeGP9kIWESvStwQGgNriikCe2/r68zNaoZ/MWXDI504N+vY2aSY9nlzX 2rR9jA9dSa1Dg6GhXsxGUM3s5kAvIfZxQX4liIk15ceEIzqsDjdRLgrnLUrIyPi9ozTjiO hgQe1bkuIZWW8LMnC2eOMKexhpgq8Ux5C4tXYi0jiDx9wJE81cwdvmDzh/IQAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8d7221ca2dd5e0b6c633761b314cffed82ddca72 commit 8d7221ca2dd5e0b6c633761b314cffed82ddca72 Author: Dag-Erling Smørgrav AuthorDate: 2022-10-18 13:28:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2022-10-22 17:05:31 +0000 sh: when loading profile, read only .sh files. Reviewers: jilles, eugen_grosbein.net, cy Subscribers: imp Differential Revision: https://reviews.freebsd.org/D37034 --- bin/sh/profile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/bin/sh/profile b/bin/sh/profile index ac6acced6596..5b8a57d4b7b2 100644 --- a/bin/sh/profile +++ b/bin/sh/profile @@ -13,17 +13,12 @@ # Allow terminal messages # mesg y -# Load each file in /etc/profile.d/, then /usr/local/etc/profile, then -# each file in /usr/local/etc/profile.d/. +# Load each .sh file in /etc/profile.d/, then /usr/local/etc/profile, +# then each .sh file in /usr/local/etc/profile.d/. _loaded=${_loaded:-/etc/profile} export _loaded for _dir in /etc /usr/local/etc ; do - for _file in "${_dir}"/profile "${_dir}"/profile.d/* ; do - case ${_file} in - *[~#]|*.OLD|*.bak|*.orig|*,v) - continue - ;; - esac + for _file in "${_dir}"/profile "${_dir}"/profile.d/*.sh ; do if [ -f "${_file}" ] ; then case :${_loaded}: in *:"${_file}":*)