From nobody Sat Jan 20 01:51:52 2024 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 4TGzxP0fc3z57tpB; Sat, 20 Jan 2024 01:51:53 +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 4TGzxP0CJ4z4cyt; Sat, 20 Jan 2024 01:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705715513; 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=FnDxcn1ORAYdHl7sAZrpYjwvcdsN3ul19sjrN5QiK0I=; b=u6U3h0B2KBoO8SeRJk//PYE4JVn1dA0G6XFMmpmsMlM3GbfW9dxOJ3ISMUJPF5gOEYXzXb ucxgRQPBcdjcd5XA9wr0zmxjArFBSTpv8UGJS2W5yzRO9j/6c5s1yva4kiPx3CyT32jVqb aA0/pfkDa9GRk38EsjBadUqTDM58gdTdorDwgPJOThzGjP6wphl+R7U5wdypOJsbchhy5f Pmlz0gJ3P9CV6rP8ImnN3oF6amG+G6wHw1CJwdTy+78Q55WAsXrgslaXaETmtdgkvTBU4+ hBxDMAUuiIAo36YGTyTjnR4TsaQE/Qc/NpMVnBASWwjVolMiXT/eOMg0wwXgyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705715513; 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=FnDxcn1ORAYdHl7sAZrpYjwvcdsN3ul19sjrN5QiK0I=; b=RaMjdVfkfEqRPRbJ9BjwFtdiX+RvTPof4aJo53vKUPiBc0qXX5+orFdQza0YT+icZyejLn 33oKDG3RpsegPqKMaSdpOq8yiwoPKY4LKdo4iZsmH15JVfkcW/YVEIQ8Nn19X+8EKbigJm XkUfeEybgyHOzSoVxPoXpho48OPruXoa82jgsTzK71ZtIXfyjQzgRU/UeXGj7yXZO8l9cz whDic9YHaFLVoRvZJnE6tbF4LdL//0SluDcDEKN8P9cBFE9JGPGCUmbv1zLGvjRFwlYJIh HjmdemIjw/nB7BkIL6lEbu0JVEODJdi9Qo6ciT53NUMF6vQf/FSL0/o1/rib+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705715513; a=rsa-sha256; cv=none; b=cnF/MV+tBmSC0zXNwbJyXw7kpMjGXnVDJlRyfDycUB8iYYYxVMfHxXbNNHWP3puFmNiGaV BWR6FFndUEByE1gqgg3FHWKpJLa3EEioB02T3DBZAAovdruflMVN0++p3ddwQQ4d+jTG+o 3vEFSOHy79XjOBfTRrLpwA9NxPuK5ZjKh7g/L1+st5hRm2L4NdgvMn4mKgnwCNg0/1A2R/ MuWdhLWRpP/4RPTqLAAbGtAhDv2dtBt+wnyuxB104G5oK/KfmddGn18wPcFVSYgl9YdqNb Y8UzkJ+plVj3Vo0p0dOY/UwPSnpZmNFGhNNOuce9gsCbBXKK6KQV5AxvfocKWw== 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 4TGzxN6Nm5zFbs; Sat, 20 Jan 2024 01:51:52 +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 40K1pqgL070333; Sat, 20 Jan 2024 01:51:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40K1pq2B070330; Sat, 20 Jan 2024 01:51:52 GMT (envelope-from git) Date: Sat, 20 Jan 2024 01:51:52 GMT Message-Id: <202401200151.40K1pq2B070330@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: e016face1e26 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: e016face1e2667611063b57a0e914603820bbf82 Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=e016face1e2667611063b57a0e914603820bbf82 commit e016face1e2667611063b57a0e914603820bbf82 Author: Alan Somers AuthorDate: 2023-12-05 23:23:29 +0000 Commit: Alan Somers CommitDate: 2024-01-20 01:51:41 +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 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