From nobody Wed Dec 6 16:52:24 2023 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 4Slk3D46nyz53gKS; Wed, 6 Dec 2023 16:52: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slk3D3ZlMz4WRx; Wed, 6 Dec 2023 16:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701881544; 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=fvd5OJCZ3wvZ9OaUWbJC0HZn7ZwLKCjBuS/kjBuX64M=; b=wAPaf+yAzUH3kdpE1jJyZhmoeSp39fw0elRQudQ+DDAbIuXw5bNYDV7zJ8k48e59HSFY/y J4XkHaFLEj8Ngd6w8l+p4KHZK6x+d0c/K3j4R9bdH385rhyvrJ4xS3GYOJrKH/qAVsPUGI Bx82UwwBHpELA+1iSqz7MmuRju8zjGWXFbyc5IjMbgAVQXtC5/pCwEHi5GHGvxlDSBia6+ steSXabftoGE9+mePr6t0LUbidYo0/YbDAXw0hOgMgTTnWpW4/mCy9NbVn+YeFikc98yzW X6WHqBGMOg5BTzjn9zHT6Nj6/fydeSdoyhX0ctV637lBU2wkueD7ZoRm93mqcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701881544; a=rsa-sha256; cv=none; b=Bh25QIO9vIqpfML5lbPp99Nk4T4+/dqhiTM0Z70C0Z/cb7QwmK2tRhjr0GyiXi6Fxdy3xA qB3F5nTtxX1JS/qnnHUpCaAMdGEPyu6PLE3SJ+9Vpu9n70OgMsp9xJu1na9HmawSEDWdAv QQjOZhu+BftHgsFAqOroQX2UFvCbgyNxoB39pHx512jN7Dj6F4HVeyMr3HfH8faw4519Cs R5yLb01B30/3htlqKDXsTKFQGDr9kp5jR/zcOwmtqDDitFyWgVzd4LsU3svEdigCuoDQdF DKAZbb5PVNXZM3gonYTajZ0psAMbQ/nKSSjWbX88sMGTcFb6S48Oy8UHHWpfuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701881544; 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=fvd5OJCZ3wvZ9OaUWbJC0HZn7ZwLKCjBuS/kjBuX64M=; b=HpOZ7/aNeW8Xj4zXwGCaPWMYc1RJAD+5GCHv+8xjjmUYnbGByurC8bYXjGEmiVhUfo0p/Z URjico6Wp7X4sFMmXMr8/cUqBEtbEt2tYJDZwqD2vV14hVXSjpYOGPf/7Z08FvZiDyfJYj GCYozeCBEMJc5lmxawf6ltUHdW0W4HxvpOT+JDaIvXcmMh37d2LlHFQeqOs9bXU07IUSl3 OGqdAWjA8mfUv1MRPyfySBjkb3lOrlvz8DaT2ErnfH6/okw6WK5ZZgzuDUtRxDeNrEfNLe 7C7lIuSxwKGZHCC1crfEqrIZr+WAQJOt2ZTDq/hlzM5uwNHLzArSAwR5icjxbA== 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 4Slk3D2g63z11TN; Wed, 6 Dec 2023 16:52:24 +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 3B6GqOSD068352; Wed, 6 Dec 2023 16:52:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6GqOuf068349; Wed, 6 Dec 2023 16:52:24 GMT (envelope-from git) Date: Wed, 6 Dec 2023 16:52:24 GMT Message-Id: <202312061652.3B6GqOuf068349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 6b96125afdf2 - main - cap_net.3: remove a copypasta 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b96125afdf245ae61dd82b59891ad0d6aab0066 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=6b96125afdf245ae61dd82b59891ad0d6aab0066 commit 6b96125afdf245ae61dd82b59891ad0d6aab0066 Author: Alan Somers AuthorDate: 2023-12-05 23:23:29 +0000 Commit: Alan Somers CommitDate: 2023-12-06 16:51:37 +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] MFC after: 2 weeks Sponsored by: Axcient Reviewed by: oshogbo Differential Revision: https://reviews.freebsd.org/D42919 --- 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 97a044e3f950..534d28c2ef7c 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 November 15, 2021 +.Dd December 5, 2023 .Dt CAP_NET 3 .Os .Sh NAME @@ -188,17 +188,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