1 files changed, 11 insertions, 5 deletions

diff --git a/monitor.c b/monitor.c
index 3f468dfff..b7463400e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.60 2004/06/22 05:05:45 dtucker Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.61 2004/07/17 05:31:41 dtucker Exp $");
 
 #include <openssl/dh.h>
 
@@ -79,6 +79,7 @@ extern u_char session_id[];
 extern Buffer input, output;
 extern Buffer auth_debug;
 extern int auth_debug_init;
+extern Buffer loginmsg;
 
 /* State exported from the child */
 
@@ -1230,10 +1231,6 @@ mm_answer_pty(int sock, Buffer *m)
 
         buffer_put_int(m, 1);
         buffer_put_cstring(m, s->tty);
-        mm_request_send(sock, MONITOR_ANS_PTY, m);
-
-        mm_send_fd(sock, s->ptyfd);
-        mm_send_fd(sock, s->ttyfd);
 
         /* We need to trick ttyslot */
         if (dup2(s->ttyfd, 0) == -1)
@@ -1244,6 +1241,15 @@ mm_answer_pty(int sock, Buffer *m)
         /* Now we can close the file descriptor again */
         close(0);
 
+        /* send messages generated by record_login */
+        buffer_put_string(m, buffer_ptr(&loginmsg), buffer_len(&loginmsg));
+        buffer_clear(&loginmsg);
+
+        mm_request_send(sock, MONITOR_ANS_PTY, m);
+
+        mm_send_fd(sock, s->ptyfd);
+        mm_send_fd(sock, s->ttyfd);
+
         /* make sure nothing uses fd 0 */
         if ((fd0 = open(_PATH_DEVNULL, O_RDONLY)) < 0)
                 fatal("%s: open(/dev/null): %s", __func__, strerror(errno));