summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2000-12-20 20:00:34 +0000
committermarkus <markus@openbsd.org>2000-12-20 20:00:34 +0000
commit6551bfbdfc5c913669cdda1395c8a50c0907f09d (patch)
treefb7a07a78ff4b2c7bc6281dcb8bd9a4b3efdc4e3
parentfix prototypes; from stevesk@pobox.com (diff)
downloadwireguard-openbsd-6551bfbdfc5c913669cdda1395c8a50c0907f09d.tar.xz
wireguard-openbsd-6551bfbdfc5c913669cdda1395c8a50c0907f09d.zip
remove comments about HPUX and call error() if ioctl fails; from stevesk@pobox.com
-rw-r--r--usr.bin/ssh/pty.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.bin/ssh/pty.c b/usr.bin/ssh/pty.c
index b7430c3445b..25ab0077a36 100644
--- a/usr.bin/ssh/pty.c
+++ b/usr.bin/ssh/pty.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: pty.c,v 1.18 2000/12/13 06:36:05 deraadt Exp $");
+RCSID("$OpenBSD: pty.c,v 1.19 2000/12/20 20:00:34 markus Exp $");
#include <util.h>
#include "pty.h"
@@ -211,12 +211,8 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
/* Make it our controlling tty. */
#ifdef TIOCSCTTY
debug("Setting controlling tty using TIOCSCTTY.");
- /*
- * We ignore errors from this, because HPSUX defines TIOCSCTTY, but
- * returns EINVAL with these arguments, and there is absolutely no
- * documentation.
- */
- ioctl(*ttyfd, TIOCSCTTY, NULL);
+ if (ioctl(*ttyfd, TIOCSCTTY, NULL) < 0)
+ error("ioctl(TIOCSCTTY): %.100s", strerror(errno));
#endif /* TIOCSCTTY */
fd = open(ttyname, O_RDWR);
if (fd < 0)