- (djm) Sync with OpenBSD:

   - markus@cvs.openbsd.org  2000/10/16 15:46:32
     [ssh.1]
     fixes from pekkas@netcore.fi
   - markus@cvs.openbsd.org  2000/10/17 14:28:11
     [atomicio.c]
     return number of characters processed; ok deraadt@
   - markus@cvs.openbsd.org  2000/10/18 12:04:02
     [atomicio.c]
     undo
   - markus@cvs.openbsd.org  2000/10/18 12:23:02
     [scp.c]
     replace atomicio(read,...) with read(); ok deraadt@
   - markus@cvs.openbsd.org  2000/10/18 12:42:00
     [session.c]
     restore old record login behaviour
   - deraadt@cvs.openbsd.org 2000/10/19 10:41:13
     [auth-skey.c]
     fmt string problem in unused code
   - provos@cvs.openbsd.org  2000/10/19 10:45:16
     [sshconnect2.c]
     don't reference freed memory. okay deraadt@
   - markus@cvs.openbsd.org  2000/10/21 11:04:23
     [canohost.c]
     typo, eramore@era-t.ericsson.se; ok niels@
   - markus@cvs.openbsd.org  2000/10/23 13:31:55
     [cipher.c]
     non-alignment dependent swap_bytes(); from
     simonb@wasabisystems.com/netbsd
   - markus@cvs.openbsd.org  2000/10/26 12:38:28
     [compat.c]
     add older vandyke products
   - markus@cvs.openbsd.org  2000/10/27 01:32:19
     [channels.c channels.h clientloop.c serverloop.c session.c]
     [ssh.c util.c]
     enable non-blocking IO on channels, and tty's (except for the
     client ttys).
   - markus@cvs.openbsd.org  2000/10/27 01:48:22
     channels.c channels.h clientloop.c
     deny agent/x11 forwarding unless requested; thanks to jwl@pobox.com

1 files changed, 5 insertions, 8 deletions

diff --git a/util.c b/util.c
index 71808f14d..1a591a6f0 100644
--- 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)