X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=ssh.c;h=72f142f5426ebe3e90255edab50c7f3ee854dac4;hb=0598df92173fece3b32cdf7bd857556454b741bd;hp=58e72f5083856effe9fd9fdc51bf3b31cfed8072;hpb=fceaa2e4a738c7dc7074608a2ee7f35d17d44699;p=PuTTY.git

diff --git a/ssh.c b/ssh.c
index 58e72f50..72f142f5 100644
--- a/ssh.c
+++ b/ssh.c
@@ -4618,6 +4618,8 @@ static void do_ssh1_connection(Ssh ssh, unsigned char *in, int inlen,
      */
     {
 	char *cmd = ssh->cfg.remote_cmd_ptr;
+
+	if (!cmd) cmd = ssh->cfg.remote_cmd;
 	
 	if (ssh->cfg.ssh_subsys && ssh->cfg.remote_cmd_ptr2) {
 	    cmd = ssh->cfg.remote_cmd_ptr2;
@@ -7323,6 +7325,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
 	} else {
 	    subsys = ssh->cfg.ssh_subsys;
 	    cmd = ssh->cfg.remote_cmd_ptr;
+	    if (!cmd) cmd = ssh->cfg.remote_cmd;
 	}
 
 	s->pktout = ssh2_pkt_init(SSH2_MSG_CHANNEL_REQUEST);