summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd.88
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ec6e615d..9229652e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 move the options description up the page, and a few additional tweaks 9 move the options description up the page, and a few additional tweaks
10 whilst in here; 10 whilst in here;
11 ok markus 11 ok markus
12 - jmc@cvs.openbsd.org 2006/01/25 09:07:22
13 [sshd.8]
14 move subsections to full sections;
12 15
1320060129 1620060129
14 - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the 17 - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the
@@ -3734,4 +3737,4 @@
3734 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3737 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3735 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3738 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3736 3739
3737$Id: ChangeLog,v 1.4096 2006/01/31 10:45:53 djm Exp $ 3740$Id: ChangeLog,v 1.4097 2006/01/31 10:46:20 djm Exp $
diff --git a/sshd.8 b/sshd.8
index 3ca929d50..15c7651ba 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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.212 2006/01/25 09:04:34 jmc Exp $ 37.\" $OpenBSD: sshd.8,v 1.213 2006/01/25 09:07:22 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -233,7 +233,7 @@ This implementation of
233supports both SSH protocol version 1 and 2 simultaneously. 233supports both SSH protocol version 1 and 2 simultaneously.
234.Nm 234.Nm
235works as follows: 235works as follows:
236.Ss SSH protocol version 1 236.Sh SSH PROTOCOL VERSION 1
237Each host has a host-specific RSA key 237Each host has a host-specific RSA key
238(normally 2048 bits) used to identify the host. 238(normally 2048 bits) used to identify the host.
239Additionally, when 239Additionally, when
@@ -301,7 +301,7 @@ are disabled (thus completely disabling
301and 301and
302.Xr rsh 302.Xr rsh
303into the machine). 303into the machine).
304.Ss SSH protocol version 2 304.Sh SSH PROTOCOL VERSION 2
305Version 2 works similarly: 305Version 2 works similarly:
306Each host has a host-specific key (RSA or DSA) used to identify the host. 306Each host has a host-specific key (RSA or DSA) used to identify the host.
307However, when the daemon starts, it does not generate a server key. 307However, when the daemon starts, it does not generate a server key.
@@ -320,7 +320,7 @@ Protocol version 2 provides a public key based
320user (PubkeyAuthentication) or 320user (PubkeyAuthentication) or
321client host (HostbasedAuthentication) authentication method, 321client host (HostbasedAuthentication) authentication method,
322conventional password authentication and challenge response based methods. 322conventional password authentication and challenge response based methods.
323.Ss Command execution and data forwarding 323.Sh COMMAND EXECUTION AND DATA FORWARDING
324If the client successfully authenticates itself, a dialog for 324If the client successfully authenticates itself, a dialog for
325preparing the session is entered. 325preparing the session is entered.
326At this time the client may request 326At this time the client may request