upstream: reorder SessionType; ok djm

OpenBSD-Commit-ID: c7dd0b39e942b1caf4976a0b1cf0fed33d05418c
This commit is contained in:
jmc@openbsd.org 2021-07-14 06:46:38 +00:00 committed by Damien Miller
parent 8aa2f9aeb5
commit ef7c4e52d5

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: ssh_config.5,v 1.356 2021/07/13 23:48:36 djm Exp $ .\" $OpenBSD: ssh_config.5,v 1.357 2021/07/14 06:46:38 jmc Exp $
.Dd $Mdocdate: July 13 2021 $ .Dd $Mdocdate: July 14 2021 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -1263,21 +1263,6 @@ The argument to this keyword must be
or or
.Cm no .Cm no
(the default). (the default).
.It Cm SessionType
May be used to either request invocation of a subsystem on the remote system,
or to prevent the execution of a remote command at all.
The latter is useful for just forwarding ports.
The argument to this keyword must be
.Cm none
(same as the
.Fl N
option),
.Cm subsystem
(same as the
.Fl s
option) or
.Cm default
(shell or command execution).
.It Cm NumberOfPasswordPrompts .It Cm NumberOfPasswordPrompts
Specifies the number of password prompts before giving up. Specifies the number of password prompts before giving up.
The argument to this keyword must be an integer. The argument to this keyword must be an integer.
@ -1667,6 +1652,21 @@ will send a message through the encrypted
channel to request a response from the server. channel to request a response from the server.
The default The default
is 0, indicating that these messages will not be sent to the server. is 0, indicating that these messages will not be sent to the server.
.It Cm SessionType
May be used to either request invocation of a subsystem on the remote system,
or to prevent the execution of a remote command at all.
The latter is useful for just forwarding ports.
The argument to this keyword must be
.Cm none
(same as the
.Fl N
option),
.Cm subsystem
(same as the
.Fl s
option) or
.Cm default
(shell or command execution).
.It Cm SetEnv .It Cm SetEnv
Directly specify one or more environment variables and their contents to Directly specify one or more environment variables and their contents to
be sent to the server. be sent to the server.