upstream: some options are not first-match-wins. Mention that there

are exceptions at the start of the manpage and label some of them in the
option description.

OpenBSD-Commit-ID: 3b74728446fa6fc8742769eeb8c3674e233e84c4
This commit is contained in:
djm@openbsd.org 2023-03-03 04:36:20 +00:00 committed by Damien Miller
parent d1c1b3272e
commit 78571a5fe9
No known key found for this signature in database
1 changed files with 15 additions and 3 deletions

View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd_config.5,v 1.347 2023/01/18 06:55:32 jmc Exp $ .\" $OpenBSD: sshd_config.5,v 1.348 2023/03/03 04:36:20 djm Exp $
.Dd $Mdocdate: January 18 2023 $ .Dd $Mdocdate: March 3 2023 $
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -48,7 +48,7 @@ reads configuration data from
.Fl f .Fl f
on the command line). on the command line).
The file contains keyword-argument pairs, one per line. The file contains keyword-argument pairs, one per line.
For each keyword, the first obtained value will be used. Unless noted otherwise, for each keyword, the first obtained value will be used.
Lines starting with Lines starting with
.Ql # .Ql #
and empty lines are interpreted as comments. and empty lines are interpreted as comments.
@ -120,6 +120,9 @@ The allow/deny groups directives are processed in the following order:
See PATTERNS in See PATTERNS in
.Xr ssh_config 5 .Xr ssh_config 5
for more information on patterns. for more information on patterns.
This keyword may appear multiple times in
.Nm
with each instance appending to the list.
.It Cm AllowStreamLocalForwarding .It Cm AllowStreamLocalForwarding
Specifies whether StreamLocal (Unix-domain socket) forwarding is permitted. Specifies whether StreamLocal (Unix-domain socket) forwarding is permitted.
The available options are The available options are
@ -177,6 +180,9 @@ The allow/deny users directives are processed in the following order:
See PATTERNS in See PATTERNS in
.Xr ssh_config 5 .Xr ssh_config 5
for more information on patterns. for more information on patterns.
This keyword may appear multiple times in
.Nm
with each instance appending to the list.
.It Cm AuthenticationMethods .It Cm AuthenticationMethods
Specifies the authentication methods that must be successfully completed Specifies the authentication methods that must be successfully completed
for a user to be granted access. for a user to be granted access.
@ -629,6 +635,9 @@ The allow/deny groups directives are processed in the following order:
See PATTERNS in See PATTERNS in
.Xr ssh_config 5 .Xr ssh_config 5
for more information on patterns. for more information on patterns.
This keyword may appear multiple times in
.Nm
with each instance appending to the list.
.It Cm DenyUsers .It Cm DenyUsers
This keyword can be followed by a list of user name patterns, separated This keyword can be followed by a list of user name patterns, separated
by spaces. by spaces.
@ -647,6 +656,9 @@ The allow/deny users directives are processed in the following order:
See PATTERNS in See PATTERNS in
.Xr ssh_config 5 .Xr ssh_config 5
for more information on patterns. for more information on patterns.
This keyword may appear multiple times in
.Nm
with each instance appending to the list.
.It Cm DisableForwarding .It Cm DisableForwarding
Disables all forwarding features, including X11, Disables all forwarding features, including X11,
.Xr ssh-agent 1 , .Xr ssh-agent 1 ,