diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sshd.8 | 18 |
2 files changed, 16 insertions, 8 deletions
@@ -100,6 +100,10 @@ | |||
100 | - jmc@cvs.openbsd.org 2006/02/13 11:02:26 | 100 | - jmc@cvs.openbsd.org 2006/02/13 11:02:26 |
101 | [sshd.8] | 101 | [sshd.8] |
102 | turn this into an example ssh_known_hosts file; ok djm | 102 | turn this into an example ssh_known_hosts file; ok djm |
103 | - jmc@cvs.openbsd.org 2006/02/13 11:08:43 | ||
104 | [sshd.8] | ||
105 | - avoid nasty line split | ||
106 | - `*' does not need to be escaped | ||
103 | 107 | ||
104 | 20060313 | 108 | 20060313 |
105 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) | 109 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) |
@@ -4001,4 +4005,4 @@ | |||
4001 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4005 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4002 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4006 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4003 | 4007 | ||
4004 | $Id: ChangeLog,v 1.4167 2006/03/15 00:33:00 djm Exp $ | 4008 | $Id: ChangeLog,v 1.4168 2006/03/15 00:33:25 djm Exp $ |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: sshd.8,v 1.221 2006/02/13 11:02:26 jmc Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.222 2006/02/13 11:08:43 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -454,7 +454,7 @@ is enabled. | |||
454 | Specifies that in addition to public key authentication, the canonical name | 454 | Specifies that in addition to public key authentication, the canonical name |
455 | of the remote host must be present in the comma-separated list of | 455 | of the remote host must be present in the comma-separated list of |
456 | patterns | 456 | patterns |
457 | .Pf ( Ql \&* | 457 | .Pf ( Ql * |
458 | and | 458 | and |
459 | .Ql \&? | 459 | .Ql \&? |
460 | serve as wildcards). | 460 | serve as wildcards). |
@@ -505,13 +505,17 @@ the client requests a tunnel. | |||
505 | .El | 505 | .El |
506 | .Pp | 506 | .Pp |
507 | An example authorized_keys file: | 507 | An example authorized_keys file: |
508 | .Bd -literal | 508 | .Bd -literal -offset 3n |
509 | # Comments allowed at start of line | 509 | # Comments allowed at start of line |
510 | ssh-rsa AAAAB3Nza...LiPk== user@example.net | 510 | ssh-rsa AAAAB3Nza...LiPk== user@example.net |
511 | from="*.sales.example.net,!pc.sales.example.net" ssh-rsa AAAAB2...19Q== john@example.net | 511 | from="*.sales.example.net,!pc.sales.example.net" ssh-rsa |
512 | command="dump /home",no-pty,no-port-forwarding ssh-dss AAAAC3...51R== example.net | 512 | AAAAB2...19Q== john@example.net |
513 | permitopen="192.0.2.1:80",permitopen="192.0.2.2:25" ssh-dss AAAAB5...21S== | 513 | command="dump /home",no-pty,no-port-forwarding ssh-dss |
514 | tunnel="0",command="sh /etc/netstart tun0" ssh-rsa AAAA...== jane@example.net | 514 | AAAAC3...51R== example.net |
515 | permitopen="192.0.2.1:80",permitopen="192.0.2.2:25" ssh-dss | ||
516 | AAAAB5...21S== | ||
517 | tunnel="0",command="sh /etc/netstart tun0" ssh-rsa AAAA...== | ||
518 | jane@example.net | ||
515 | .Ed | 519 | .Ed |
516 | .Sh SSH_KNOWN_HOSTS FILE FORMAT | 520 | .Sh SSH_KNOWN_HOSTS FILE FORMAT |
517 | The | 521 | The |