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