diff options
author | Damien Miller <djm@mindrot.org> | 2000-07-12 21:20:23 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-07-12 21:20:23 +1000 |
commit | 055dc369837e1bde0f84a7ecfe669e4e44f10db9 (patch) | |
tree | 6888dabca77ebcdf418b7b25f6796aee5de01a08 | |
parent | 2e7ba69450e280ff5c3063eb6e6c65281da8d9ed (diff) |
Diff hunk which slipped thru
-rw-r--r-- | aux.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -1,5 +1,5 @@ | |||
1 | #include "includes.h" | 1 | #include "includes.h" |
2 | RCSID("$OpenBSD: aux.c,v 1.2 2000/05/17 09:47:59 markus Exp $"); | 2 | RCSID("$OpenBSD: aux.c,v 1.3 2000/06/18 17:13:41 markus Exp $"); |
3 | 3 | ||
4 | #include "ssh.h" | 4 | #include "ssh.h" |
5 | 5 | ||
@@ -22,6 +22,11 @@ void | |||
22 | set_nonblock(int fd) | 22 | set_nonblock(int fd) |
23 | { | 23 | { |
24 | int val; | 24 | int val; |
25 | if (isatty(fd)) { | ||
26 | /* do not mess with tty's */ | ||
27 | debug("no set_nonblock for tty fd %d", fd); | ||
28 | return; | ||
29 | } | ||
25 | val = fcntl(fd, F_GETFL, 0); | 30 | val = fcntl(fd, F_GETFL, 0); |
26 | if (val < 0) { | 31 | if (val < 0) { |
27 | error("fcntl(%d, F_GETFL, 0): %s", fd, strerror(errno)); | 32 | error("fcntl(%d, F_GETFL, 0): %s", fd, strerror(errno)); |