The man2html from jbasney on pkilab2 works whereas the standard one doesn't.

[gssapi-openssh.git] / openssh / ttymodes.c

diff --git a/openssh/ttymodes.c b/openssh/ttymodes.c
index 5cc13dcd5e0627176598c888198fdfa6be86c142..c0bb0b1f898cf7db1d62923a18eda4584c7eec1d 100644 (file)
--- a/openssh/ttymodes.c
+++ b/openssh/ttymodes.c
@@ -43,7 +43,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ttymodes.c,v 1.18 2002/06/19 00:27:55 deraadt Exp $");
+RCSID("$OpenBSD: ttymodes.c,v 1.14 2001/06/24 17:18:31 markus Exp $");
 
 #include "packet.h"
 #include "log.h"
@@ -307,6 +307,7 @@ end:
        else
                packet_put_raw(buffer_ptr(&buf), buffer_len(&buf));
        buffer_free(&buf);
+       return;
 }
 
 /*
@@ -395,23 +396,23 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
 
                default:
                        debug("Ignoring unsupported tty mode opcode %d (0x%x)",
-                           opcode, opcode);
+                             opcode, opcode);
                        if (!compat20) {
                                /*
                                 * SSH1:
                                 * Opcodes 1 to 127 are defined to have
                                 * a one-byte argument.
-                                * Opcodes 128 to 159 are defined to have
-                                * an integer argument.
-                                */
+                                * Opcodes 128 to 159 are defined to have
+                                * an integer argument.
+                                */
                                if (opcode > 0 && opcode < 128) {
                                        n_bytes += 1;
                                        (void) packet_get_char();
                                        break;
                                } else if (opcode >= 128 && opcode < 160) {
-                                       n_bytes += 4;
-                                       (void) packet_get_int();
-                                       break;
+                                       n_bytes += 4;
+                                       (void) packet_get_int();
+                                       break;
                                } else {
                                        /*
                                         * It is a truly undefined opcode (160 to 255).
@@ -421,8 +422,9 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
                                         * more coming after the mode data.
                                         */
                                        log("parse_tty_modes: unknown opcode %d", opcode);
+                                       packet_integrity_check(0, 1, SSH_CMSG_REQUEST_PTY);
                                        goto set;
-                               }
+                               }
                        } else {
                                /*
                                 * SSH2:
@@ -439,7 +441,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
                                        log("parse_tty_modes: unknown opcode %d", opcode);
                                        goto set;
                                }
-                       }
+                       }
                }
        }
 
@@ -456,4 +458,5 @@ set:
        /* Set the new modes for the terminal. */
        if (tcsetattr(fd, TCSANOW, &tio) == -1)
                log("Setting tty modes failed: %.100s", strerror(errno));
+       return;
 }