summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshtty.c
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2008-05-19 15:45:08 +0000
committerDamien Miller <djm@cvs.openbsd.org>2008-05-19 15:45:08 +0000
commit598ef7150f30391faa91b0547abd92cfe1f53987 (patch)
treebdca53ff2b27164841bfdb80501be6f2a85c3396 /usr.bin/ssh/sshtty.c
parentfa807a50f99bead557768de9606d5a2fafb88292 (diff)
Fix sending tty modes when stdin is not a tty (bz#1199). Previously
we would send the modes corresponding to a zeroed struct termios, whereas we should have been sending an empty list of modes. Based on patch from daniel.ritz AT alcatel.ch; ok dtucker@ markus@
Diffstat (limited to 'usr.bin/ssh/sshtty.c')
-rw-r--r--usr.bin/ssh/sshtty.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshtty.c b/usr.bin/ssh/sshtty.c
index 5245817f44f..9df9aa219e4 100644
--- a/usr.bin/ssh/sshtty.c
+++ b/usr.bin/ssh/sshtty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshtty.c,v 1.12 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: sshtty.c,v 1.13 2008/05/19 15:45:07 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -45,10 +45,10 @@
static struct termios _saved_tio;
static int _in_raw_mode = 0;
-struct termios
+struct termios *
get_saved_tio(void)
{
- return _saved_tio;
+ return _in_raw_mode ? &_saved_tio : NULL;
}
void