Import of OpenSSH 3.7p1

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

diff --git a/openssh/ttymodes.c b/openssh/ttymodes.c
index 5cc13dcd5e0627176598c888198fdfa6be86c142..c32e213a4399c67cb2e2089ba0a2d262887cbc9e 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.19 2003/04/08 20:21:29 itojun Exp $");
 
 #include "packet.h"
 #include "log.h"
@@ -267,7 +267,7 @@ tty_make_modes(int fd, struct termios *tiop)
 
        if (tiop == NULL) {
                if (tcgetattr(fd, &tio) == -1) {
-                       log("tcgetattr: %.100s", strerror(errno));
+                       logit("tcgetattr: %.100s", strerror(errno));
                        goto end;
                }
        } else
@@ -341,7 +341,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
         * modes, they will initially have reasonable values.
         */
        if (tcgetattr(fd, &tio) == -1) {
-               log("tcgetattr: %.100s", strerror(errno));
+               logit("tcgetattr: %.100s", strerror(errno));
                failure = -1;
        }
 
@@ -420,7 +420,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
                                         * left in the packet; hopefully there is nothing
                                         * more coming after the mode data.
                                         */
-                                       log("parse_tty_modes: unknown opcode %d", opcode);
+                                       logit("parse_tty_modes: unknown opcode %d", opcode);
                                        goto set;
                                }
                        } else {
@@ -436,7 +436,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
                                        (void) packet_get_int();
                                        break;
                                } else {
-                                       log("parse_tty_modes: unknown opcode %d", opcode);
+                                       logit("parse_tty_modes: unknown opcode %d", opcode);
                                        goto set;
                                }
                        }
@@ -446,7 +446,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
 set:
        if (*n_bytes_ptr != n_bytes) {
                *n_bytes_ptr = n_bytes;
-               log("parse_tty_modes: n_bytes_ptr != n_bytes: %d %d",
+               logit("parse_tty_modes: n_bytes_ptr != n_bytes: %d %d",
                    *n_bytes_ptr, n_bytes);
                return;         /* Don't process bytes passed */
        }
@@ -455,5 +455,5 @@ set:
 
        /* Set the new modes for the terminal. */
        if (tcsetattr(fd, TCSANOW, &tio) == -1)
-               log("Setting tty modes failed: %.100s", strerror(errno));
+               logit("Setting tty modes failed: %.100s", strerror(errno));
 }