- markus@cvs.openbsd.org 2002/03/04 13:10:46

     [misc.c]
     error-> debug, because O_NONBLOCK for /dev/null causes too many different
     errnos; ok stevesk@, deraadt@
     unused include

diff --git a/ChangeLog b/ChangeLog
index 5980ccf652f0a04035fa2bc98dcd108335d4fbf0..d9c50409eea5c9a4778af7ecbf528f3e83b201fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,10 @@
      thanks to wilfried@
    - markus@cvs.openbsd.org 2002/03/04 12:43:06
      [auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
+   - markus@cvs.openbsd.org 2002/03/04 13:10:46
+     [misc.c]
+     error-> debug, because O_NONBLOCK for /dev/null causes too many different 
+     errnos; ok stevesk@, deraadt@
      unused include
 
 20020226
@@ -7772,4 +7776,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1902 2002/03/05 01:45:56 mouring Exp $
+$Id: ChangeLog,v 1.1903 2002/03/05 01:48:09 mouring Exp $

diff --git a/misc.c b/misc.c
index 46cc4319898851df7896271a8f0e1d4495c1b356..9e5a5aba63121aaec458d21468742fffa2a76e31 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: misc.c,v 1.17 2002/02/26 20:03:51 stevesk Exp $       */
+/*     $OpenBSD: misc.c,v 1.18 2002/03/04 13:10:46 markus Exp $        */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.17 2002/02/26 20:03:51 stevesk Exp $");
+RCSID("$OpenBSD: misc.c,v 1.18 2002/03/04 13:10:46 markus Exp $");
 
 #include "misc.h"
 #include "log.h"
@@ -65,9 +65,8 @@ set_nonblock(int fd)
        debug("fd %d setting O_NONBLOCK", fd);
        val |= O_NONBLOCK;
        if (fcntl(fd, F_SETFL, val) == -1)
-               if (errno != ENODEV)
-                       error("fcntl(%d, F_SETFL, O_NONBLOCK): %s",
-                           fd, strerror(errno));
+               debug("fcntl(%d, F_SETFL, O_NONBLOCK): %s",
+                   fd, strerror(errno));
 }
 
 void
@@ -87,9 +86,8 @@ unset_nonblock(int fd)
        debug("fd %d clearing O_NONBLOCK", fd);
        val &= ~O_NONBLOCK;
        if (fcntl(fd, F_SETFL, val) == -1)
-               if (errno != ENODEV)
-                       error("fcntl(%d, F_SETFL, O_NONBLOCK): %s",
-                           fd, strerror(errno));
+               debug("fcntl(%d, F_SETFL, O_NONBLOCK): %s",
+                   fd, strerror(errno));
 }
 
 /* disable nagle on socket */