diff svr-chansession.c @ 1154:b1fabf797bd3

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.
author Guilhem Moulin <guilhem@fripost.org>
date Wed, 21 Oct 2015 22:08:47 +0800
parents aaf576b27a10
children a23386821e9f
line wrap: on
line diff
--- a/svr-chansession.c	Wed Oct 21 22:05:50 2015 +0800
+++ b/svr-chansession.c	Wed Oct 21 22:08:47 2015 +0800
@@ -814,7 +814,7 @@
 		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") */