1 files changed, 4 insertions, 5 deletions

diff --git a/session.c b/session.c
index 74f5fe255..e52aed5a2 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.46 2001/01/04 22:41:03 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.48 2001/01/13 18:43:31 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -405,10 +405,6 @@ do_authenticated(struct passwd * pw)
 
                 case SSH_CMSG_EXEC_SHELL:
                 case SSH_CMSG_EXEC_CMD:
-                        /* Set interactive/non-interactive mode. */
-                        packet_set_interactive(have_pty || s->display != NULL,
-                            options.keepalives);
-
                         if (type == SSH_CMSG_EXEC_CMD) {
                                 command = packet_get_string(&dlen);
                                 debug("Exec command '%.500s'", command);
@@ -548,6 +544,8 @@ do_exec_no_pty(Session *s, const char *command, struct passwd * pw)
         if (pid < 0)
                 packet_disconnect("fork failed: %.100s", strerror(errno));
         s->pid = pid;
+        /* Set interactive/non-interactive mode. */
+        packet_set_interactive(s->display != NULL);
 #ifdef USE_PIPES
         /* We are the parent.  Close the child sides of the pipes. */
         close(pin[0]);
@@ -665,6 +663,7 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw)
         s->ptymaster = ptymaster;
 
         /* Enter interactive session. */
+        packet_set_interactive(1);
         if (compat20) {
                 session_set_fds(s, ptyfd, fdout, -1);
         } else {