From ef7c4e52d5d840607f9ca3a302a4cbb81053eccf Mon Sep 17 00:00:00 2001 From: "jmc@openbsd.org" Date: Wed, 14 Jul 2021 06:46:38 +0000 Subject: [PATCH] upstream: reorder SessionType; ok djm OpenBSD-Commit-ID: c7dd0b39e942b1caf4976a0b1cf0fed33d05418c --- ssh_config.5 | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ssh_config.5 b/ssh_config.5 index ee06aacdb..fecca39d2 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" 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 $ -.Dd $Mdocdate: July 13 2021 $ +.\" $OpenBSD: ssh_config.5,v 1.357 2021/07/14 06:46:38 jmc Exp $ +.Dd $Mdocdate: July 14 2021 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -1263,21 +1263,6 @@ The argument to this keyword must be or .Cm no (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 Specifies the number of password prompts before giving up. 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. The default 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 Directly specify one or more environment variables and their contents to be sent to the server. -- 2.47.3