summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 11:32:06 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 11:32:06 +1100
commit7d2ef02f1c79788e9b73d15a33019e09fe6bec76 (patch)
treed973f573594befb9946cda49de3adef3a089c4d5
parent31bdc52325c8ba48f23fc7e0b32bfab67ebf47cb (diff)
- jmc@cvs.openbsd.org 2006/02/13 10:16:39
[sshd.8] no need to subsection the authorized_keys examples - instead, convert this to look like an actual file. also use proto 2 keys, and use IETF example addresses;
-rw-r--r--ChangeLog7
-rw-r--r--sshd.820
2 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 9928e171..ec05ccba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,11 @@
[sshd.8]
sort the list of options permissable w/ authorized_keys;
ok djm dtucker
+ - jmc@cvs.openbsd.org 2006/02/13 10:16:39
+ [sshd.8]
+ no need to subsection the authorized_keys examples - instead, convert
+ this to look like an actual file. also use proto 2 keys, and use IETF
+ example addresses;
20060313
- (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3990,4 +3995,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4164 2006/03/15 00:31:44 djm Exp $
+$Id: ChangeLog,v 1.4165 2006/03/15 00:32:06 djm Exp $
diff --git a/sshd.8 b/sshd.8
index 58bf9062..4eb5321a 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
.\" (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: sshd.8,v 1.218 2006/02/12 17:57:19 jmc Exp $
+.\" $OpenBSD: sshd.8,v 1.219 2006/02/13 10:16:39 jmc Exp $
.Dd September 25, 1999
.Dt SSHD 8
.Os
@@ -503,16 +503,16 @@ device on the server.
Without this option, the next available device will be used if
the client requests a tunnel.
.El
-.Ss Examples
-1024 33 12121...312314325 ylo@foo.bar
-.Pp
-from="*.niksula.hut.fi,!pc.niksula.hut.fi" 1024 35 23...2334 ylo@niksula
-.Pp
-command="dump /home",no-pty,no-port-forwarding 1024 33 23...2323 backup.hut.fi
.Pp
-permitopen="10.2.1.55:80",permitopen="10.2.1.56:25" 1024 33 23...2323
-.Pp
-tunnel="0",command="sh /etc/netstart tun0" ssh-rsa AAAA...== reyk@openbsd.org
+An example authorized_keys file:
+.Bd -literal
+# Comments allowed at start of line
+ssh-rsa AAAAB3Nza...LiPk== user@example.net
+from="*.sales.example.net,!pc.sales.example.net" ssh-rsa AAAAB2...19Q== john@example.net
+command="dump /home",no-pty,no-port-forwarding ssh-dss AAAAC3...51R== example.net
+permitopen="192.0.2.1:80",permitopen="192.0.2.2:25" ssh-dss AAAAB5...21S==
+tunnel="0",command="sh /etc/netstart tun0" ssh-rsa AAAA...== jane@example.net
+.Ed
.Sh SSH_KNOWN_HOSTS FILE FORMAT
The
.Pa /etc/ssh/ssh_known_hosts