From nobody Thu Dec 9 09:17:59 2021 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 D6AE718E192A; Thu, 9 Dec 2021 09:17:59 +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 4J8pNR4JbWz3NHg; Thu, 9 Dec 2021 09:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6FD6F23FDB; Thu, 9 Dec 2021 09:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B99Hx1g074027; Thu, 9 Dec 2021 09:17:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B99Hx6r074026; Thu, 9 Dec 2021 09:17:59 GMT (envelope-from git) Date: Thu, 9 Dec 2021 09:17:59 GMT Message-Id: <202112090917.1B99Hx6r074026@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: b834c56a1807 - stable/13 - inetd.8: Sort options 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b834c56a1807b04442d77af820ae6126ab6f81c3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639041479; 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=me+dowFZakvHpjSl+W/09Lso4+qhVCoxwewJMTKrF0M=; b=GptFqBy3Ju+uwSUMKN3O0pFKZ4K44QqLI0UHyFcXLcqf+ZazBUNJjFCVfluYo/NqvwDn7L bzug3qKevEDsC/cgqFegb8LcA2o2pcb/ZcUtkPAhi8qrCqgmwN6Lr9uMWhNnXKn9lqCX3X 3bkU/OXPXF5zFQo6Z9EKufi6t/MX/Mfgq8BdJuDsmZMAUUp70xlx0Lt/U3C4b8+asz9yPh 18BWrvrsy/U252V5CfjHrizFXaiWBavjgK68Z61esHdCENqxK2M2JnHRGr1WzRBUDbeGh9 VDKXFz00I+FFvGWebLqiAM5fMBhAvm8XrMco+ZJvBJ64pY42NvGL9GpSbimwlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639041479; a=rsa-sha256; cv=none; b=YfLBI4wa+nq+3NolCyBOj6ET04gXPR8GjxyQ2+kKlUULEzWbMeolE0IpMyzveWYT+lg1uq r1oqL9TzkqmaB453YkE+0GqlRRz7u6+D2LZLRrFYuriYq6BQKBBL1KLU5FfT/U+OvAJoXe SnZT4jW72WtCrd5vVOa4rl1a3s82lco2qQnU7r4QP4d3z0QZJvX3RxYZ+G6ECdj0EcAYry ZpoZzHFkReEyZzRdixfkHLLYJ2ItDqNZ060J0XH9uIaxkhrwxEckPOai/lGnebQPP2zXdG zaDg9eEJPXC3cCyCbYkWJtcaDqgfInqLWZBkTLnSg2EnE/1fJyoSjgEVgXdJ+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=b834c56a1807b04442d77af820ae6126ab6f81c3 commit b834c56a1807b04442d77af820ae6126ab6f81c3 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-12-06 20:56:42 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-12-09 09:17:55 +0000 inetd.8: Sort options While here: - Cluster flags without arguments together. - Simplify the synopsis of the -a flag. There is no need to distinguish between address and hostname there. - Add a missing argument to the -a flag in the description section. - Fix some typos. MFC after: 3 days (cherry picked from commit 593ad024e4ed04e4c875446e5277d82e3111848f) --- usr.sbin/inetd/inetd.8 | 139 ++++++++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 71 deletions(-) diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8 index ed784564ace7..053db7fb817e 100644 --- a/usr.sbin/inetd/inetd.8 +++ b/usr.sbin/inetd/inetd.8 @@ -37,17 +37,14 @@ .Dq super-server .Sh SYNOPSIS .Nm -.Op Fl d -.Op Fl l -.Op Fl w -.Op Fl W -.Op Fl c Ar maximum +.Op Fl dlWw +.Op Fl a Ar address .Op Fl C Ar rate -.Op Fl a Ar address | hostname +.Op Fl c Ar maximum .Op Fl p Ar filename .Op Fl R Ar rate .Op Fl s Ar maximum -.Op Ar configuration file +.Op Ar configuration_file .Sh DESCRIPTION The .Nm @@ -74,40 +71,7 @@ reducing load on the system. .Pp The following options are available: .Bl -tag -width indent -.It Fl d -Turn on debugging. -.It Fl l -Turn on logging of successful connections. -.It Fl w -Turn on TCP Wrapping for external services. -See the -.Sx "IMPLEMENTATION NOTES" -section for more information on TCP Wrappers support. -.It Fl W -Turn on TCP Wrapping for internal services which are built in to -.Nm . -.It Fl c Ar maximum -Specify the default maximum number of -simultaneous invocations of each service; -the default is unlimited. -May be overridden on a per-service basis with the "max-child" -parameter. -.It Fl C Ar rate -Specify the default maximum number of times a service can be invoked -from a single IP address in one minute; the default is unlimited. -May be overridden on a per-service basis with the -"max-connections-per-ip-per-minute" parameter. -.It Fl R Ar rate -Specify the maximum number of times a service can be invoked -in one minute; the default is 256. -A rate of 0 allows an unlimited number of invocations. -.It Fl s Ar maximum -Specify the default maximum number of -simultaneous invocations of each service from a single IP address; -the default is unlimited. -May be overridden on a per-service basis with the "max-child-per-ip" -parameter. -.It Fl a +.It Fl a Ar address Specify one specific IP address to bind to. Alternatively, a hostname can be specified, in which case the IPv4 or IPv6 address @@ -139,8 +103,41 @@ See the explanation of the .Pa /etc/inetd.conf .Em protocol field below. +.It Fl C Ar rate +Specify the default maximum number of times a service can be invoked +from a single IP address in one minute; the default is unlimited. +May be overridden on a per-service basis with the +"max-connections-per-ip-per-minute" parameter. +.It Fl c Ar maximum +Specify the default maximum number of +simultaneous invocations of each service; +the default is unlimited. +May be overridden on a per-service basis with the "max-child" +parameter. +.It Fl d +Turn on debugging. +.It Fl l +Turn on logging of successful connections. .It Fl p Specify an alternate file in which to store the process ID. +.It Fl R Ar rate +Specify the maximum number of times a service can be invoked +in one minute; the default is 256. +A rate of 0 allows an unlimited number of invocations. +.It Fl s Ar maximum +Specify the default maximum number of +simultaneous invocations of each service from a single IP address; +the default is unlimited. +May be overridden on a per-service basis with the "max-child-per-ip" +parameter. +.It Fl W +Turn on TCP Wrapping for internal services which are built in to +.Nm . +.It Fl w +Turn on TCP Wrapping for external services. +See the +.Sx "IMPLEMENTATION NOTES" +section for more information on TCP Wrappers support. .El .Pp Upon execution, @@ -468,6 +465,26 @@ If the real service is disabled, return this username for every request. This is primarily useful when running this service on a NAT machine. +.It Fl F +Same as +.Fl f +but without the restriction that the username in +.Pa .fakeid +must not match an existing user. +.It Fl f +If the file +.Pa .fakeid +exists in the home directory of the identified user, report the username +found in that file instead of the real username. +If the username found in +.Pa .fakeid +is that of an existing user, +then the real username is reported. +If the +.Fl i +flag is also given then the username in +.Pa .fakeid +is checked against existing user IDs instead. .It Fl g Instead of returning the user's name to the ident requester, @@ -483,38 +500,8 @@ but also any fallback name, or .Pa .noident files. -.It Fl t Xo -.Ar sec Ns Op . Ns Ar usec -.Xc -Specify a timeout for the service. -The default timeout is 10.0 seconds. -.It Fl r -Offer a real -.Dq auth -service, as per RFC 1413. -All the remaining flags apply only in this case. .It Fl i Return numeric user IDs instead of usernames. -.It Fl f -If the file -.Pa .fakeid -exists in the home directory of the identified user, report the username -found in that file instead of the real username. -If the username found in -.Pa .fakeid -is that of an existing user, -then the real username is reported. -If the -.Fl i -flag is also given then the username in -.Pa .fakeid -is checked against existing user IDs instead. -.It Fl F -same as -.Fl f -but without the restriction that the username in -.Pa .fakeid -must not match an existing user. .It Fl n If the file .Pa .noident @@ -528,6 +515,16 @@ Use .Ar osname instead of the name of the system as reported by .Xr uname 3 . +.It Fl r +Offer a real +.Dq auth +service, as per RFC 1413. +All the remaining flags apply only in this case. +.It Fl t Xo +.Ar sec Ns Op Cm \&. Ns Ar usec +.Xc +Specify a timeout for the service. +The default timeout is 10.0 seconds. .El .Pp The