diff svr-chansession.c @ 1173:d734fe76b72f coverity

merge
author Matt Johnston <matt@ucc.asn.au>
date Mon, 23 Nov 2015 23:04:48 +0800
parents b1fabf797bd3
children a23386821e9f
line wrap: on
line diff
--- a/svr-chansession.c	Fri Aug 07 21:26:03 2015 +0800
+++ b/svr-chansession.c	Mon Nov 23 23:04:48 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") */