- djm@cvs.openbsd.org 2004/06/30 08:36:59

     [session.c]
     unbreak TTY break, diagnosed by darren AT dazwin.com; ok markus@

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f6d02306..9b90db35d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
    - avsm@cvs.openbsd.org 2004/06/26 20:07:16
      [sshd.c]
      initialise some fd variables to -1, djm@ ok
+   - djm@cvs.openbsd.org 2004/06/30 08:36:59
+     [session.c]
+     unbreak TTY break, diagnosed by darren AT dazwin.com; ok markus@
 
 20040627
  - (tim) update README files.
@@ -1462,4 +1465,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3462 2004/06/30 12:40:20 djm Exp $
+$Id: ChangeLog,v 1.3463 2004/06/30 12:41:07 djm Exp $
diff --git a/session.c b/session.c
index 8720ae7be..cf2098931 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.176 2004/06/21 17:53:03 djm Exp $");
+RCSID("$OpenBSD: session.c,v 1.177 2004/06/30 08:36:59 djm Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -1920,15 +1920,16 @@ session_input_channel_req(Channel *c, const char *rtype)
                         success = session_auth_agent_req(s);
                 } else if (strcmp(rtype, "subsystem") == 0) {
                         success = session_subsystem_req(s);
-                } else if (strcmp(rtype, "break") == 0) {
-                        success = session_break_req(s);
                 } else if (strcmp(rtype, "env") == 0) {
                         success = session_env_req(s);
                 }
         }
         if (strcmp(rtype, "window-change") == 0) {
                 success = session_window_change_req(s);
+        } else if (strcmp(rtype, "break") == 0) {
+                success = session_break_req(s);
         }
+
         return success;
 }