]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Diff hunk which slipped thru V_2_1_1_P3
authorDamien Miller <djm@mindrot.org>
Wed, 12 Jul 2000 11:20:23 +0000 (21:20 +1000)
committerDamien Miller <djm@mindrot.org>
Wed, 12 Jul 2000 11:20:23 +0000 (21:20 +1000)
aux.c

diff --git a/aux.c b/aux.c
index 899142da7167129e21c3fe0075f082fc8ad43970..63f7dd41aa5478dd5c8067eb6155df04109ff3a5 100644 (file)
--- a/aux.c
+++ b/aux.c
@@ -1,5 +1,5 @@
 #include "includes.h"
-RCSID("$OpenBSD: aux.c,v 1.2 2000/05/17 09:47:59 markus Exp $");
+RCSID("$OpenBSD: aux.c,v 1.3 2000/06/18 17:13:41 markus Exp $");
 
 #include "ssh.h"
 
@@ -22,6 +22,11 @@ void
 set_nonblock(int fd)
 {
        int val;
+       if (isatty(fd)) {
+               /* do not mess with tty's */
+               debug("no set_nonblock for tty fd %d", fd);
+               return;
+       }
        val = fcntl(fd, F_GETFL, 0);
        if (val < 0) {
                error("fcntl(%d, F_GETFL, 0): %s", fd, strerror(errno));