summaryrefslogtreecommitdiff
path: root/usr.sbin/ldpd/packet.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2013-03-11 17:40:12 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2013-03-11 17:40:12 +0000
commit039b61c058ed96cb3a888f9dee21bca7997f0a39 (patch)
treee836c8501a7ce9ead08db116a7d3413b4c79e0ff /usr.sbin/ldpd/packet.c
parent11f71752a566cd212ee320890884ad5c2b6dcc64 (diff)
handle ECONNABORTED errors from accept(). In many code blocks they can be
ignored silently and without aborting, much like EINTR and EWOULDBLOCK are. ok's from various maintainers of these directories...
Diffstat (limited to 'usr.sbin/ldpd/packet.c')
-rw-r--r--usr.sbin/ldpd/packet.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/ldpd/packet.c b/usr.sbin/ldpd/packet.c
index 5a5880d162f..1d3ca1ff953 100644
--- a/usr.sbin/ldpd/packet.c
+++ b/usr.sbin/ldpd/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.16 2012/04/12 17:33:43 claudio Exp $ */
+/* $OpenBSD: packet.c,v 1.17 2013/03/11 17:40:11 deraadt Exp $ */
/*
* Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -268,7 +268,8 @@ session_accept(int fd, short event, void *bula)
*/
if (errno == ENFILE || errno == EMFILE) {
accept_pause();
- } else if (errno != EWOULDBLOCK && errno != EINTR)
+ } else if (errno != EWOULDBLOCK && errno != EINTR &&
+ errno != ECONNABORTED)
log_debug("sess_recv_packet: accept error: %s",
strerror(errno));
return;