summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd.86
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e116c9f9..b1711743a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
4 [channels.c] 4 [channels.c]
5 avoid possible hijacking of x11-forwarded connections (back out 1.183) 5 avoid possible hijacking of x11-forwarded connections (back out 1.183)
6 CVE-2008-1483; ok djm@ 6 CVE-2008-1483; ok djm@
7 - jmc@cvs.openbsd.org 2008/03/27 22:37:57
8 [sshd.8]
9 remove trailing whitespace;
7 10
820080327 1120080327
9 - (dtucker) Cache selinux status earlier so we know if it's enabled after a 12 - (dtucker) Cache selinux status earlier so we know if it's enabled after a
@@ -3832,4 +3835,4 @@
3832 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3835 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3833 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3836 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3834 3837
3835$Id: ChangeLog,v 1.4898 2008/04/02 21:43:57 djm Exp $ 3838$Id: ChangeLog,v 1.4899 2008/04/03 09:52:51 djm Exp $
diff --git a/sshd.8 b/sshd.8
index cc44e5471..750d64c3e 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,8 +34,8 @@
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.240 2008/03/26 21:28:14 djm Exp $ 37.\" $OpenBSD: sshd.8,v 1.241 2008/03/27 22:37:57 jmc Exp $
38.Dd $Mdocdate: March 26 2008 $ 38.Dd $Mdocdate: March 27 2008 $
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -532,7 +532,7 @@ option.
532.It Cm no-pty 532.It Cm no-pty
533Prevents tty allocation (a request to allocate a pty will fail). 533Prevents tty allocation (a request to allocate a pty will fail).
534.It Cm no-user-rc 534.It Cm no-user-rc
535Disables execution of 535Disables execution of
536.Pa ~/.ssh/rc . 536.Pa ~/.ssh/rc .
537.It Cm no-X11-forwarding 537.It Cm no-X11-forwarding
538Forbids X11 forwarding when this key is used for authentication. 538Forbids X11 forwarding when this key is used for authentication.