From nobody Fri Jan 19 20:19:50 2024 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 4TGrZG3GK0z57K2w; Fri, 19 Jan 2024 20:19:50 +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 4TGrZG2nHqz3xcB; Fri, 19 Jan 2024 20:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705695590; 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=KI0jwU54ESrAScLtoJhu9C1bQRpDsP7flasjQA2hxEM=; b=xHf3iXv4ar3+H85eKHQOEnOPO0eBTyIbwNHzR5w5m8anucELhY7JlDxSXVCUvEv0nQEBHe Hhky0AYErspgApsYuojA1jZ/dzHETHdNsDxUILE1eAIgD1FrdU+kaE2nV92MN8rqwqRcaQ MHapQMN/h+jt4gCThcJvPqj1LSDKUY1HDK+kcK1prenPkkql0Vlq8YSx7bXDvLFuM2XGlT D/LF0DZKk2jqjs8Zpsbf1656dotpgVeVgfuj69ckGSinJW24i9bMwDxqO/V/bG/aab/Jch 7n3+hliW3IFJq+jQdAdmFEP2dNscml8XOaOnecFqUM+AD8xhsZFKtaUaEtGTng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705695590; 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=KI0jwU54ESrAScLtoJhu9C1bQRpDsP7flasjQA2hxEM=; b=WDewP4LKYbr8rlStDiwlpDqaGd5DcoJio6QzpMMw+Nu6iaDz2mfkCHbb9V3MX0+JaSal8w Ab4ZXb3OYhRcvXAZeXxmiVchGo6ByhR473mXiFXWmvslXStSz2XWe+N2pI2VZVnS4OKCMp r1zrYDGQvy4k3nWPP2UD5/4K1i852MDDknKy7vCelJs6ZoBpBKfbDKhoR/fRS0HQw2mpwa QAP22mNdDVP+ck9S2VWtYeRb7K9xC1uWoKWSsBQyMK4bGKBQLOByLRusAiqI2laus0oGv/ 1Muhy1/YFFCuHJfrKYXLWruiz7kz/5qiWc7vrt/hYP7DDFUnEsruulGbfZ/RQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705695590; a=rsa-sha256; cv=none; b=kJID3ybpfTY68tdM6EyFMn/eH8jgnHOLyR6TUrkP/vgPJShaU6ZAfmw7w4MbXRbFJjN66c qC3EHI2S7fCVQuWwbCNNeTRBpz3QDZEZGruB58aSevr/kEu0eoAty3W9ynVvyw2Vjq5nRF OnCHKKwjsoQtCpIX4EAyvf9rrpcFtJCxgYiqlB5hdDSXXzXlP41KYZ0iGP4kGBwUaNf11y W27hTnqnPM4rRn+dQP0t4tTsIc5uDxPcHYXzAz4pgqiNJb1t49xSuglDHAa7z4w6LP+zv/ VIhsHFgoNVMR56KLE8xCo0xwuOvNTBMcMo7kt5oNj3/jHDlKTTEx/PMDJWJrvw== 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 4TGrZG1qqyz14v9; Fri, 19 Jan 2024 20:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40JKJomq000752; Fri, 19 Jan 2024 20:19:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40JKJoWT000749; Fri, 19 Jan 2024 20:19:50 GMT (envelope-from git) Date: Fri, 19 Jan 2024 20:19:50 GMT Message-Id: <202401192019.40JKJoWT000749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: b4caacbef0a4 - stable/13 - cap_net.3: remove a copypasta 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b4caacbef0a4e5180cd8d1bc5bddae8904719c32 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=b4caacbef0a4e5180cd8d1bc5bddae8904719c32 commit b4caacbef0a4e5180cd8d1bc5bddae8904719c32 Author: Alan Somers AuthorDate: 2023-12-05 23:23:29 +0000 Commit: Alan Somers CommitDate: 2024-01-19 20:19:38 +0000 cap_net.3: remove a copypasta This line appears to have been copied from cap_sysctl.3. While I'm here, reorder and reword the description of cap_net_limit a bit. [skip ci] Sponsored by: Axcient Reviewed by: oshogbo Differential Revision: https://reviews.freebsd.org/D42919 (cherry picked from commit 6b96125afdf245ae61dd82b59891ad0d6aab0066) --- lib/libcasper/services/cap_net/cap_net.3 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/libcasper/services/cap_net/cap_net.3 b/lib/libcasper/services/cap_net/cap_net.3 index ad4b6f4e4c90..2851c2f023a0 100644 --- a/lib/libcasper/services/cap_net/cap_net.3 +++ b/lib/libcasper/services/cap_net/cap_net.3 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 15, 2020 +.Dd December 5, 2023 .Dt CAP_NET 3 .Os .Sh NAME @@ -186,17 +186,14 @@ any port will be accepted in the .Fn cap_connect function. .Pp +The .Fn cap_net_limit -applies a set of sysctl limits to the capability, denying access to sysctl -variables not belonging to the set. +will consume and apply the limits. .Pp Once a set of limits is applied, subsequent calls to .Fn cap_net_limit will fail unless the new set is a subset of the current set. .Pp -The -.Fn cap_net_limit -will consume the limits. If the .Fn cap_net_limit was not called the rights may be freed using