2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f2233fb9b..0914bf05b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -84,6 +84,10 @@
      [dh.c]
      fix a cast
      ok djm@ markus@
+   - djm@cvs.openbsd.org 2009/10/06 04:46:40
+     [session.c]
+     bz#1596: fflush(NULL) before exec() to ensure that everying (motd
+     in particular) has made it out before the streams go away.
 
 20091002
  - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps.
diff --git a/session.c b/session.c
index f4a363543..d55419fbd 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.246 2009/04/17 19:23:06 stevesk Exp $ */
+/* $OpenBSD: session.c,v 1.247 2009/10/06 04:46:40 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1799,6 +1799,8 @@ do_child(Session *s, const char *command)
                 exit(sftp_server_main(i, argv, s->pw));
         }
 
+        fflush(NULL);
+
         if (options.use_login) {
                 launch_login(pw, hostname);
                 /* NEVERREACHED */