From dc01a8edd466d77efbb318608095fd756c68239d Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Wed, 21 Oct 2015 22:08:47 +0800 Subject: [PATCH] Don't display the MOTD when an explicit command is run. (possibly via authorized_keys(5) restrictions), even when a pseudo-terminal has been allocated for the session. In other words, only display the MOTD when the server starts the user's default shell. --- svr-chansession.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svr-chansession.c b/svr-chansession.c index e44299e..bfaf7f6 100644 --- a/svr-chansession.c +++ b/svr-chansession.c @@ -814,7 +814,7 @@ static int ptycommand(struct Channel *channel, struct ChanSess *chansess) { login_free_entry(li); #ifdef DO_MOTD - if (svr_opts.domotd) { + if (svr_opts.domotd && !chansess->cmd) { /* don't show the motd if ~/.hushlogin exists */ /* 12 == strlen("/.hushlogin\0") */