From nobody Sun Oct 11 05:55:23 2026 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 4j2VF80VLQz6jvLJ for ; Sun, 11 Oct 2026 05:55:24 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j2VF73lS1z4q3b for ; Sun, 11 Oct 2026 05:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791698123; 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=JfYdO3roHVpzKvg8neCAviu97xzfV91KEzdgGGpv+Jk=; b=dbCs3lpOSdK/rTHe5GkmMwVBKhof6j3AYGz0DFKFYGWT3RidO7WzZy7WO+z1L5+2qtwcd4 A9VDBVUhTzlDJ2bkGNizdvMKN+C4QBgW5THM12m07t3frh50Fxmwus5KfYG8hKFd1xjFLm PeFBBgHV+6nCpi6G4HJKUKryBRCzsaChg/qYSt7NU0AKGliOvQh7B+TPv3Bk+SA+CjVhuy XXcJCJqanBK2Nqmug66trU/jIXEraFqjMn+J6Wr3QhMxoAvMdnuxIc0S9iAstLrPLPpn+P 9yfpZjN+ddP2wMNwBZj92Hh9fvBCT1MYL1TOZbYM1g4IJJ3GqkLkequyC0g+Rw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791698123; b=uf6zYNicc1PoDpOdR4dNNJEpI5jMbi9hmi3tZVAdU5WRnp3qnjsyxFTJ7VWJ/PROwz6znu E3125on+SppKBhJ1tqpiMUfQZggGZrZE3YfDqUfZRJSErHym5xONEiHS5PWzWPwivVx8kU 3TiWHWQLcHhW2ZwS3v6U+r2won9gl019h5a998kudlWjeCDPZLnUWUhjY2Hxs0DmbHjLuW xfHM6nKpD8xMvWQQnDTee4NjSiN4EYMX34o8gQzv8X6/pxX3HLMeeA9Ezsp2vHQmK83IG6 a+EhIhYDEIB2Rjk21XbJsWwuik7+yrVsQb+g6v07utm7WkZsiql+jdN/2dvdkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791698123; 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=JfYdO3roHVpzKvg8neCAviu97xzfV91KEzdgGGpv+Jk=; b=ZlrPJalIe6YeLU3ULVdloUFAIZLXHW36q/F05ME0P/KvIMKjGSjg+0CFI18JN7E3a6Ob3K gJ+noFbloBD8GIO4oYxz9oCxDc6zq01A/b97LODsD8R0qJ39srZ2FE2CFC2T8p6zIvObQg IJRTIL7RuJaMH098F5dBHgj9jx9bafpL8xpBSrNHBTzcxYieTY9sNLr6bRTKbXjtATa0Xg L+lMxfuxTlP2DrX/xchoGFF1mPchDKaHkAUU7it/ZbWzr4fh/ShgjRIbQKyIg4jDzvQW8z /d40pOWaVxnG3HCJDZNXTa4a7uREH5xGFTD6GzuDpcdRyUYNDSWejStscU1Xbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j2VF72n0DzSVR for ; Sun, 11 Oct 2026 05:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2375c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 11 Oct 2026 05:55:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 475e3bc18a10 - main - safe_eval.sh: add safe_set_var List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 475e3bc18a108dca375424c97de13939224c2d89 Auto-Submitted: auto-generated Date: Sun, 11 Oct 2026 05:55:23 +0000 Message-Id: <6acb24cb.2375c.374db09b@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=475e3bc18a108dca375424c97de13939224c2d89 commit 475e3bc18a108dca375424c97de13939224c2d89 Author: Simon J. Gerraty AuthorDate: 2026-10-11 05:54:59 +0000 Commit: Simon J. Gerraty CommitDate: 2026-10-11 05:55:16 +0000 safe_eval.sh: add safe_set_var Get the log message right! Fix default allowed chars (untabify clobbered TAB) Add a couple more : messages to help debugging. --- libexec/rc/safe_eval.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libexec/rc/safe_eval.sh b/libexec/rc/safe_eval.sh index b5ad1ca8639d..338221dfa564 100644 --- a/libexec/rc/safe_eval.sh +++ b/libexec/rc/safe_eval.sh @@ -1,6 +1,6 @@ : # RCSid: -# $Id: safe_eval.sh,v 1.30 2026/10/11 04:48:37 sjg Exp $ +# $Id: safe_eval.sh,v 1.31 2026/10/11 05:49:50 sjg Exp $ # # @(#) Copyright (c) 2023-2026 Simon J. Gerraty # @@ -52,12 +52,19 @@ safe_set_var() { fi : first is ssv_var sane? case "$ssv_var" in - *[!A-Za-z0-9_]*|ssv_*) ssv_var=invalid; ssv_rc=1;; + *[!A-Za-z0-9_]*|ssv_*) + ssv_var=invalid + ssv_rc=1 + ;; esac + : is ssv_val ok - "$ssv_val" case "$ssv_val" in - *[!${3:-A-Za-z0-9_ ,/=:+-}$4]*) ssv_val=invalid; ssv_rc=${ssv_rc:-2};; + *[!${3:-A-Za-z0-9_. \$,/=:+-}$4]*) + ssv_val=invalid + ssv_rc=${ssv_rc:-2} + ;; esac - : is $ssv_var is allowed + : is $ssv_var is allowed - "${2:-$ssv_var}" case " ${2:-$ssv_var} " in *" $ssv_var "*) ;; *) ssv_rc=${ssv_rc:-3};;