diff options
author | Colin Watson <cjwatson@debian.org> | 2012-05-17 13:04:02 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-05-17 13:04:02 +0100 |
commit | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (patch) | |
tree | c59b4dbcc610f10700945f885adf3bddc2542c26 /sshd.0 | |
parent | 8241a65bf12ac53c1b7304bba7ce739aad80b8b8 (diff) | |
parent | b9bc38990c5eb5d99e28ca5af6d3491fd4a0060a (diff) |
merge 6.0p1
Diffstat (limited to 'sshd.0')
-rw-r--r-- | sshd.0 | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -369,7 +369,8 @@ AUTHORIZED_KEYS FILE FORMAT | |||
369 | specified by enclosing the address in square brackets. Multiple | 369 | specified by enclosing the address in square brackets. Multiple |
370 | permitopen options may be applied separated by commas. No | 370 | permitopen options may be applied separated by commas. No |
371 | pattern matching is performed on the specified hostnames, they | 371 | pattern matching is performed on the specified hostnames, they |
372 | must be literal domains or addresses. | 372 | must be literal domains or addresses. A port specification of * |
373 | matches any port. | ||
373 | 374 | ||
374 | principals="principals" | 375 | principals="principals" |
375 | On a cert-authority line, specifies allowed principals for | 376 | On a cert-authority line, specifies allowed principals for |
@@ -632,4 +633,4 @@ CAVEATS | |||
632 | System security is not improved unless rshd, rlogind, and rexecd are | 633 | System security is not improved unless rshd, rlogind, and rexecd are |
633 | disabled (thus completely disabling rlogin and rsh into the machine). | 634 | disabled (thus completely disabling rlogin and rsh into the machine). |
634 | 635 | ||
635 | OpenBSD 5.0 August 2, 2011 OpenBSD 5.0 | 636 | OpenBSD 5.0 September 23, 2011 OpenBSD 5.0 |