sync code with last fixes and improvements from OpenBSD
This commit is contained in:
parent
f57be82572
commit
58b04bcee7
468 changed files with 9958 additions and 7882 deletions
|
@ -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.380 2023/03/27 03:56:11 dtucker Exp $
|
||||
.Dd $Mdocdate: March 27 2023 $
|
||||
.\" $OpenBSD: ssh_config.5,v 1.383 2023/07/17 05:36:14 jsg Exp $
|
||||
.Dd $Mdocdate: July 17 2023 $
|
||||
.Dt SSH_CONFIG 5
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
@ -141,8 +141,10 @@ The available criteria keywords are:
|
|||
.Cm canonical ,
|
||||
.Cm final ,
|
||||
.Cm exec ,
|
||||
.Cm localnetwork ,
|
||||
.Cm host ,
|
||||
.Cm originalhost ,
|
||||
.Cm Tag ,
|
||||
.Cm user ,
|
||||
and
|
||||
.Cm localuser .
|
||||
|
@ -195,6 +197,17 @@ accept the tokens described in the
|
|||
.Sx TOKENS
|
||||
section.
|
||||
.Pp
|
||||
The
|
||||
.Cm localnetwork
|
||||
keyword matches the addresses of active local network interfaces against the
|
||||
supplied list of networks in CIDR format.
|
||||
This may be convenient for varying the effective configuration on devices that
|
||||
roam between networks.
|
||||
Note that network address is not a trustworthy criteria in many
|
||||
situations (e.g. when the network is automatically configured using DHCP)
|
||||
and so caution should be applied if using it to control security-sensitive
|
||||
configuration.
|
||||
.Pp
|
||||
The other keywords' criteria must be single entries or comma-separated
|
||||
lists and may use the wildcard and negation operators described in the
|
||||
.Sx PATTERNS
|
||||
|
@ -211,6 +224,15 @@ The
|
|||
.Cm originalhost
|
||||
keyword matches against the hostname as it was specified on the command-line.
|
||||
The
|
||||
.Cm tagged
|
||||
keyword matches a tag name specified by a prior
|
||||
.Cm Tag
|
||||
directive or on the
|
||||
.Xr ssh 1
|
||||
command-line using the
|
||||
.Fl P
|
||||
flag.
|
||||
The
|
||||
.Cm user
|
||||
keyword matches against the target username on the remote host.
|
||||
The
|
||||
|
@ -1875,6 +1897,10 @@ To disable TCP keepalive messages, the value should be set to
|
|||
See also
|
||||
.Cm ServerAliveInterval
|
||||
for protocol-level keepalives.
|
||||
.It Cm Tag
|
||||
Specify a configuration tag name that may be later used by a
|
||||
.Cm Match
|
||||
directive to select a block of configuration.
|
||||
.It Cm Tunnel
|
||||
Request
|
||||
.Xr tun 4
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue