summaryrefslogtreecommitdiffstats
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 67c99366..67ce8f8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@
turn on ssh batch mode when in sftp batch mode, patch from
jdmossh AT nand.net;
ok markus@
+ - jmc@cvs.openbsd.org 2005/02/25 10:55:13
+ [sshd.8]
+ add /etc/motd and $HOME/.hushlogin to FILES;
+ from michael knudsen;
20050226
- (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c]
@@ -2187,4 +2191,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3669 2005/03/01 10:16:47 djm Exp $
+$Id: ChangeLog,v 1.3670 2005/03/01 10:17:09 djm Exp $
diff --git a/sshd.8 b/sshd.8
index 2ac7b727..9d30369c 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
.\" (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.203 2004/12/06 11:41:03 dtucker Exp $
+.\" $OpenBSD: sshd.8,v 1.204 2005/02/25 10:55:13 jmc Exp $
.Dd September 25, 1999
.Dt SSHD 8
.Os
@@ -652,6 +652,20 @@ These files should be writable only by root/the owner.
should be world-readable, and
.Pa $HOME/.ssh/known_hosts
can, but need not be, world-readable.
+.It Pa /etc/motd
+See
+.Xr motd 5 .
+.It Pa $HOME/.hushlogin
+This file is used to suppress printing the last login time and
+.Pa /etc/motd ,
+if
+.Cm PrintLastLog
+and
+.Cm PrintMotd ,
+respectively,
+are enabled.
+It does not suppress printing of the banner specified by
+.Cm Banner .
.It Pa /etc/nologin
If this file exists,
.Nm