summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2024-12-04 15:37:55 +0100
committerDamien Miller <djm@mindrot.org>2024-12-04 15:38:33 +0100
commit73d782693144262570d3585b62f16b183170c014 (patch)
tree9baaa3c31a74f2068ba62745f7901c3f263d8b38
parentupstream: don't screw up ssh-keygen -l output when the file (diff)
downloadopenssh-73d782693144262570d3585b62f16b183170c014.tar.xz
openssh-73d782693144262570d3585b62f16b183170c014.zip
upstream: sync the list of options accepted by -o with ssh_config.5
prompted by bz3455 OpenBSD-Commit-ID: 0ecbfa70aea6c769bcc259defe07182edf461f57
-rw-r--r--ssh.134
1 files changed, 22 insertions, 12 deletions
diff --git a/ssh.1 b/ssh.1
index 710d3d4e6..697f4e42a 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.1,v 1.443 2024/07/18 01:47:27 djm Exp $
-.Dd $Mdocdate: July 18 2024 $
+.\" $OpenBSD: ssh.1,v 1.444 2024/12/04 14:37:55 djm Exp $
+.Dd $Mdocdate: December 4 2024 $
.Dt SSH 1
.Os
.Sh NAME
@@ -509,24 +509,27 @@ For full details of the options listed below, and their possible values, see
.It AddressFamily
.It BatchMode
.It BindAddress
+.It BindInterface
+.It CASignatureAlgorithms
.It CanonicalDomains
.It CanonicalizeFallbackLocal
.It CanonicalizeHostname
.It CanonicalizeMaxDots
.It CanonicalizePermittedCNAMEs
-.It CASignatureAlgorithms
.It CertificateFile
+.It ChannelTimeout
.It CheckHostIP
.It Ciphers
.It ClearAllForwardings
.It Compression
-.It ConnectionAttempts
.It ConnectTimeout
+.It ConnectionAttempts
.It ControlMaster
.It ControlPath
.It ControlPersist
.It DynamicForward
.It EnableEscapeCommandline
+.It EnableSSHKeysign
.It EscapeChar
.It ExitOnForwardFailure
.It FingerprintHash
@@ -535,21 +538,23 @@ For full details of the options listed below, and their possible values, see
.It ForwardX11
.It ForwardX11Timeout
.It ForwardX11Trusted
-.It GatewayPorts
-.It GlobalKnownHostsFile
.It GSSAPIAuthentication
.It GSSAPIDelegateCredentials
+.It GatewayPorts
+.It GlobalKnownHostsFile
.It HashKnownHosts
.It Host
-.It HostbasedAcceptedAlgorithms
-.It HostbasedAuthentication
.It HostKeyAlgorithms
.It HostKeyAlias
+.It HostbasedAcceptedAlgorithms
+.It HostbasedAuthentication
.It Hostname
+.It IPQoS
.It IdentitiesOnly
.It IdentityAgent
.It IdentityFile
-.It IPQoS
+.It IgnoreUnknown
+.It Include
.It KbdInteractiveAuthentication
.It KbdInteractiveDevices
.It KexAlgorithms
@@ -557,14 +562,15 @@ For full details of the options listed below, and their possible values, see
.It LocalCommand
.It LocalForward
.It LogLevel
+.It LogVerbose
.It MACs
-.It Match
.It NoHostAuthenticationForLocalhost
.It NumberOfPasswordPrompts
+.It ObscureKeystrokeTiming
+.It PKCS11Provider
.It PasswordAuthentication
.It PermitLocalCommand
.It PermitRemoteOpen
-.It PKCS11Provider
.It Port
.It PreferredAuthentications
.It ProxyCommand
@@ -577,16 +583,20 @@ For full details of the options listed below, and their possible values, see
.It RemoteForward
.It RequestTTY
.It RequiredRSASize
+.It RevokedHostKeys
+.It SecurityKeyProvider
.It SendEnv
-.It ServerAliveInterval
.It ServerAliveCountMax
+.It ServerAliveInterval
.It SessionType
.It SetEnv
.It StdinNull
.It StreamLocalBindMask
.It StreamLocalBindUnlink
.It StrictHostKeyChecking
+.It SyslogFacility
.It TCPKeepAlive
+.It Tag
.It Tunnel
.It TunnelDevice
.It UpdateHostKeys