diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | sshd.8 | 20 |
2 files changed, 16 insertions, 11 deletions
@@ -89,6 +89,11 @@ | |||
89 | [sshd.8] | 89 | [sshd.8] |
90 | sort the list of options permissable w/ authorized_keys; | 90 | sort the list of options permissable w/ authorized_keys; |
91 | ok djm dtucker | 91 | ok djm dtucker |
92 | - jmc@cvs.openbsd.org 2006/02/13 10:16:39 | ||
93 | [sshd.8] | ||
94 | no need to subsection the authorized_keys examples - instead, convert | ||
95 | this to look like an actual file. also use proto 2 keys, and use IETF | ||
96 | example addresses; | ||
92 | 97 | ||
93 | 20060313 | 98 | 20060313 |
94 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) | 99 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) |
@@ -3990,4 +3995,4 @@ | |||
3990 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3995 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3991 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3996 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3992 | 3997 | ||
3993 | $Id: ChangeLog,v 1.4164 2006/03/15 00:31:44 djm Exp $ | 3998 | $Id: ChangeLog,v 1.4165 2006/03/15 00:32:06 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.218 2006/02/12 17:57:19 jmc Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.219 2006/02/13 10:16:39 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -503,16 +503,16 @@ device on the server. | |||
503 | Without this option, the next available device will be used if | 503 | Without this option, the next available device will be used if |
504 | the client requests a tunnel. | 504 | the client requests a tunnel. |
505 | .El | 505 | .El |
506 | .Ss Examples | ||
507 | 1024 33 12121...312314325 ylo@foo.bar | ||
508 | .Pp | ||
509 | from="*.niksula.hut.fi,!pc.niksula.hut.fi" 1024 35 23...2334 ylo@niksula | ||
510 | .Pp | ||
511 | command="dump /home",no-pty,no-port-forwarding 1024 33 23...2323 backup.hut.fi | ||
512 | .Pp | 506 | .Pp |
513 | permitopen="10.2.1.55:80",permitopen="10.2.1.56:25" 1024 33 23...2323 | 507 | An example authorized_keys file: |
514 | .Pp | 508 | .Bd -literal |
515 | tunnel="0",command="sh /etc/netstart tun0" ssh-rsa AAAA...== reyk@openbsd.org | 509 | # Comments allowed at start of line |
510 | ssh-rsa AAAAB3Nza...LiPk== user@example.net | ||
511 | from="*.sales.example.net,!pc.sales.example.net" ssh-rsa AAAAB2...19Q== john@example.net | ||
512 | command="dump /home",no-pty,no-port-forwarding ssh-dss AAAAC3...51R== example.net | ||
513 | permitopen="192.0.2.1:80",permitopen="192.0.2.2:25" ssh-dss AAAAB5...21S== | ||
514 | tunnel="0",command="sh /etc/netstart tun0" ssh-rsa AAAA...== jane@example.net | ||
515 | .Ed | ||
516 | .Sh SSH_KNOWN_HOSTS FILE FORMAT | 516 | .Sh SSH_KNOWN_HOSTS FILE FORMAT |
517 | The | 517 | The |
518 | .Pa /etc/ssh/ssh_known_hosts | 518 | .Pa /etc/ssh/ssh_known_hosts |