aboutsummaryrefslogtreecommitdiff
path: root/ssh_config.0
diff options
context:
space:
mode:
Diffstat (limited to 'ssh_config.0')
-rw-r--r--ssh_config.029
1 files changed, 18 insertions, 11 deletions
diff --git a/ssh_config.0 b/ssh_config.0
index 053cabc49314..aaf8b1482ad5 100644
--- a/ssh_config.0
+++ b/ssh_config.0
@@ -55,11 +55,12 @@ DESCRIPTION
Match keyword are satisfied. Match conditions are specified
using one or more criteria or the single token all which always
matches. The available criteria keywords are: canonical, final,
- exec, localnetwork, host, originalhost, Tag, user, and localuser.
- The all criteria must appear alone or immediately after canonical
- or final. Other criteria may be combined arbitrarily. All
- criteria but all, canonical, and final require an argument.
- Criteria may be negated by prepending an exclamation mark (M-bM-^@M-^X!M-bM-^@M-^Y).
+ exec, localnetwork, host, originalhost, tagged, user, and
+ localuser. The all criteria must appear alone or immediately
+ after canonical or final. Other criteria may be combined
+ arbitrarily. All criteria but all, canonical, and final require
+ an argument. Criteria may be negated by prepending an
+ exclamation mark (M-bM-^@M-^X!M-bM-^@M-^Y).
The canonical keyword matches only when the configuration file is
being re-parsed after hostname canonicalization (see the
@@ -226,17 +227,23 @@ DESCRIPTION
ChannelTimeout
Specifies whether and how quickly ssh(1) should close inactive
channels. Timeouts are specified as one or more M-bM-^@M-^\type=intervalM-bM-^@M-^]
- pairs separated by whitespace, where the M-bM-^@M-^\typeM-bM-^@M-^] must be a channel
- type name (as described in the table below), optionally
- containing wildcard characters.
+ pairs separated by whitespace, where the M-bM-^@M-^\typeM-bM-^@M-^] must be the
+ special keyword M-bM-^@M-^\globalM-bM-^@M-^] or a channel type name from the list
+ below, optionally containing wildcard characters.
The timeout value M-bM-^@M-^\intervalM-bM-^@M-^] is specified in seconds or may use
any of the units documented in the TIME FORMATS section. For
- example, M-bM-^@M-^\session=5mM-bM-^@M-^] would cause the interactive session to
+ example, M-bM-^@M-^\session=5mM-bM-^@M-^] would cause interactive sessions to
terminate after five minutes of inactivity. Specifying a zero
value disables the inactivity timeout.
- The available channel types include:
+ The special timeout M-bM-^@M-^\globalM-bM-^@M-^] applies to all active channels,
+ taken together. Traffic on any active channel will reset the
+ timeout, but when the timeout expires then all open channels will
+ be closed. Note that this global timeout is not matched by
+ wildcards and must be specified explicitly.
+
+ The available channel type names include:
agent-connection
Open connections to ssh-agent(1).
@@ -1415,4 +1422,4 @@ AUTHORS
created OpenSSH. Markus Friedl contributed the support for SSH protocol
versions 1.5 and 2.0.
-OpenBSD 7.3 October 12, 2023 OpenBSD 7.3
+OpenBSD 7.5 February 21, 2024 OpenBSD 7.5