summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-03-01 21:17:09 +1100
committerDamien Miller <djm@mindrot.org>2005-03-01 21:17:09 +1100
commit70a908ec89b8bd5feb14abed5957ebb063796e94 (patch)
tree483bdabbce7da402c51b57203590ccd7f84d58f9
parent64e8d44fbd556c7a78bba1d8ff3bee5b07b2440d (diff)
- jmc@cvs.openbsd.org 2005/02/25 10:55:13
[sshd.8] add /etc/motd and $HOME/.hushlogin to FILES; from michael knudsen;
-rw-r--r--ChangeLog6
-rw-r--r--sshd.816
2 files changed, 20 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 67c993667..67ce8f8df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@
11 turn on ssh batch mode when in sftp batch mode, patch from 11 turn on ssh batch mode when in sftp batch mode, patch from
12 jdmossh AT nand.net; 12 jdmossh AT nand.net;
13 ok markus@ 13 ok markus@
14 - jmc@cvs.openbsd.org 2005/02/25 10:55:13
15 [sshd.8]
16 add /etc/motd and $HOME/.hushlogin to FILES;
17 from michael knudsen;
14 18
1520050226 1920050226
16 - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c] 20 - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c]
@@ -2187,4 +2191,4 @@
2187 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2191 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2188 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2192 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2189 2193
2190$Id: ChangeLog,v 1.3669 2005/03/01 10:16:47 djm Exp $ 2194$Id: ChangeLog,v 1.3670 2005/03/01 10:17:09 djm Exp $
diff --git a/sshd.8 b/sshd.8
index 2ac7b7274..9d30369c9 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.203 2004/12/06 11:41:03 dtucker Exp $ 37.\" $OpenBSD: sshd.8,v 1.204 2005/02/25 10:55:13 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -652,6 +652,20 @@ These files should be writable only by root/the owner.
652should be world-readable, and 652should be world-readable, and
653.Pa $HOME/.ssh/known_hosts 653.Pa $HOME/.ssh/known_hosts
654can, but need not be, world-readable. 654can, but need not be, world-readable.
655.It Pa /etc/motd
656See
657.Xr motd 5 .
658.It Pa $HOME/.hushlogin
659This file is used to suppress printing the last login time and
660.Pa /etc/motd ,
661if
662.Cm PrintLastLog
663and
664.Cm PrintMotd ,
665respectively,
666are enabled.
667It does not suppress printing of the banner specified by
668.Cm Banner .
655.It Pa /etc/nologin 669.It Pa /etc/nologin
656If this file exists, 670If this file exists,
657.Nm 671.Nm