summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 11:32:42 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 11:32:42 +1100
commit9a7f201d45a5bc2c268ff35668a120487ac8e33c (patch)
treef1ddb7ee223bf12ff08db995468d2acedd5f3698
parent7d2ef02f1c79788e9b73d15a33019e09fe6bec76 (diff)
- jmc@cvs.openbsd.org 2006/02/13 10:21:25
[sshd.8] small tweaks for the ssh_known_hosts section;
-rw-r--r--ChangeLog5
-rw-r--r--sshd.88
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ec05ccba..0e20e59a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,9 @@
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;
+ - jmc@cvs.openbsd.org 2006/02/13 10:21:25
+ [sshd.8]
+ small tweaks for the ssh_known_hosts section;
20060313
- (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3995,4 +3998,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.4165 2006/03/15 00:32:06 djm Exp $
+$Id: ChangeLog,v 1.4166 2006/03/15 00:32:42 djm Exp $
diff --git a/sshd.8 b/sshd.8
index 4eb5321a..1db605c6 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.219 2006/02/13 10:16:39 jmc Exp $
+.\" $OpenBSD: sshd.8,v 1.220 2006/02/13 10:21:25 jmc Exp $
.Dd September 25, 1999
.Dt SSHD 8
.Os
@@ -521,7 +521,7 @@ and
files contain host public keys for all known hosts.
The global file should
be prepared by the administrator (optional), and the per-user file is
-maintained automatically: whenever the user connects from an unknown host
+maintained automatically: whenever the user connects from an unknown host,
its key is added to the per-user file.
.Pp
Each line in these files contains the following fields: hostnames,
@@ -529,7 +529,7 @@ bits, exponent, modulus, comment.
The fields are separated by spaces.
.Pp
Hostnames is a comma-separated list of patterns
-.Pf ( Ql \&*
+.Pf ( Ql *
and
.Ql \&?
act as
@@ -551,7 +551,7 @@ Only one hashed hostname may appear on a single line and none of the above
negation or wildcard operators may be applied.
.Pp
Bits, exponent, and modulus are taken directly from the RSA host key; they
-can be obtained, e.g., from
+can be obtained, for example, from
.Pa /etc/ssh/ssh_host_key.pub .
The optional comment field continues to the end of the line, and is not used.
.Pp