diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd.8 | 8 |
2 files changed, 8 insertions, 5 deletions
@@ -94,6 +94,9 @@ | |||
94 | no need to subsection the authorized_keys examples - instead, convert | 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 | 95 | this to look like an actual file. also use proto 2 keys, and use IETF |
96 | example addresses; | 96 | example addresses; |
97 | - jmc@cvs.openbsd.org 2006/02/13 10:21:25 | ||
98 | [sshd.8] | ||
99 | small tweaks for the ssh_known_hosts section; | ||
97 | 100 | ||
98 | 20060313 | 101 | 20060313 |
99 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) | 102 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) |
@@ -3995,4 +3998,4 @@ | |||
3995 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3998 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3996 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3999 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3997 | 4000 | ||
3998 | $Id: ChangeLog,v 1.4165 2006/03/15 00:32:06 djm Exp $ | 4001 | $Id: ChangeLog,v 1.4166 2006/03/15 00:32:42 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.219 2006/02/13 10:16:39 jmc Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.220 2006/02/13 10:21:25 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -521,7 +521,7 @@ and | |||
521 | files contain host public keys for all known hosts. | 521 | files contain host public keys for all known hosts. |
522 | The global file should | 522 | The global file should |
523 | be prepared by the administrator (optional), and the per-user file is | 523 | be prepared by the administrator (optional), and the per-user file is |
524 | maintained automatically: whenever the user connects from an unknown host | 524 | maintained automatically: whenever the user connects from an unknown host, |
525 | its key is added to the per-user file. | 525 | its key is added to the per-user file. |
526 | .Pp | 526 | .Pp |
527 | Each line in these files contains the following fields: hostnames, | 527 | Each line in these files contains the following fields: hostnames, |
@@ -529,7 +529,7 @@ bits, exponent, modulus, comment. | |||
529 | The fields are separated by spaces. | 529 | The fields are separated by spaces. |
530 | .Pp | 530 | .Pp |
531 | Hostnames is a comma-separated list of patterns | 531 | Hostnames is a comma-separated list of patterns |
532 | .Pf ( Ql \&* | 532 | .Pf ( Ql * |
533 | and | 533 | and |
534 | .Ql \&? | 534 | .Ql \&? |
535 | act as | 535 | act as |
@@ -551,7 +551,7 @@ Only one hashed hostname may appear on a single line and none of the above | |||
551 | negation or wildcard operators may be applied. | 551 | negation or wildcard operators may be applied. |
552 | .Pp | 552 | .Pp |
553 | Bits, exponent, and modulus are taken directly from the RSA host key; they | 553 | Bits, exponent, and modulus are taken directly from the RSA host key; they |
554 | can be obtained, e.g., from | 554 | can be obtained, for example, from |
555 | .Pa /etc/ssh/ssh_host_key.pub . | 555 | .Pa /etc/ssh/ssh_host_key.pub . |
556 | The optional comment field continues to the end of the line, and is not used. | 556 | The optional comment field continues to the end of the line, and is not used. |
557 | .Pp | 557 | .Pp |