Date: Thu, 7 Dec 2023 09:55:28 +0800 From: Zhenlei Huang <zlei@FreeBSD.org> To: Alan Somers <asomers@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org>, li-Wen Hsu <lwhsu@freebsd.org> Subject: Re: git: 6b96125afdf2 - main - cap_net.3: remove a copypasta Message-ID: <44E8C9F3-84DD-4E51-B2A4-FB56E2A08F30@FreeBSD.org> In-Reply-To: <202312061652.3B6GqOuf068349@gitrepo.freebsd.org> References: <202312061652.3B6GqOuf068349@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On Dec 7, 2023, at 12:52 AM, Alan Somers <asomers@freebsd.org> wrote: >=20 > The branch main has been updated by asomers: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D6b96125afdf245ae61dd82b59891ad0d= 6aab0066 >=20 > commit 6b96125afdf245ae61dd82b59891ad0d6aab0066 > Author: Alan Somers <asomers@FreeBSD.org> > AuthorDate: 2023-12-05 23:23:29 +0000 > Commit: Alan Somers <asomers@FreeBSD.org> > CommitDate: 2023-12-06 16:51:37 +0000 >=20 > cap_net.3: remove a copypasta >=20 > 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. >=20 > [skip ci] I guess we can 'skip ci' implicitly for document or typo changes. >=20 > 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(-) >=20 > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?44E8C9F3-84DD-4E51-B2A4-FB56E2A08F30>