From a2a3ed0010fc10a1c39404a3c3cddd3de27019b2 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 11 Sep 2004 23:09:53 +1000
Subject:  - (dtucker) [session.c] Bug #927: make .hushlogin silent again.  ok
 djm@

---
 ChangeLog | 3 ++-
 session.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0c0d2c6fc..268e0f9a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
    Bug #892: Send messages from failing PAM account modules to the client via
    SSH2_MSG_USERAUTH_BANNER messages.  Note that this will not happen with
    SSH2 kbdint authentication, which need to be dealt with separately.  ok djm@
+ - (dtucker) [session.c] Bug #927: make .hushlogin silent again.  ok djm@
 
 20040830
  - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.{c,h}] Bug #915: only
@@ -1729,4 +1730,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.3544 2004/09/11 13:07:03 dtucker Exp $
+$Id: ChangeLog,v 1.3545 2004/09/11 13:09:53 dtucker Exp $
diff --git a/session.c b/session.c
index 7a70b82e6..6844720d4 100644
--- a/session.c
+++ b/session.c
@@ -1434,7 +1434,7 @@ do_child(Session *s, const char *command)
 		 * generated messages, so if this in an interactive
 		 * login then display them too.
 		 */
-		if (command == NULL)
+		if (!check_quietlogin(s, command))
 			display_loginmsg();
 #endif /* HAVE_OSF_SIA */
 	}
-- 
cgit v1.2.3