- (djm) Sync with OpenBSD:

[openssh.git] / util.c

diff --git a/util.c b/util.c
index 71808f14ddb2b790992276a2c1e30e891dc53090..1a591a6f0f51886f097aa662348589aaba5e4961 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: util.c,v 1.5 2000/09/07 20:27:55 deraadt Exp $        */
+/*     $OpenBSD: util.c,v 1.6 2000/10/27 07:32:19 markus Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: util.c,v 1.5 2000/09/07 20:27:55 deraadt Exp $");
+RCSID("$OpenBSD: util.c,v 1.6 2000/10/27 07:32:19 markus Exp $");
 
 #include "ssh.h"
 
@@ -48,18 +48,15 @@ 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));
                return;
        }
-       if (val & O_NONBLOCK)
+       if (val & O_NONBLOCK) {
+               debug("fd %d IS O_NONBLOCK", fd);
                return;
+       }
        debug("fd %d setting O_NONBLOCK", fd);
        val |= O_NONBLOCK;
        if (fcntl(fd, F_SETFL, val) == -1)