summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2002-03-04 13:10:47 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2002-03-04 13:10:47 +0000
commit4a5e465d9d0e05e8610486c17b583074734a3ebc (patch)
tree3627ebb6b1331c6331dd3bb87935cf374a28488b /usr.bin/ssh
parentc4e5be3a682e41e988603e2a405d9ad3db7564de (diff)
error-> debug, because O_NONBLOCK for /dev/null causes too many different errnos; ok stevesk@, deraadt@
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/misc.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/usr.bin/ssh/misc.c b/usr.bin/ssh/misc.c
index e9b6d61d65f..9d820710eb8 100644
--- a/usr.bin/ssh/misc.c
+++ b/usr.bin/ssh/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 */