summaryrefslogtreecommitdiff
path: root/usr.sbin/ospf6d
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/ospf6d
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/ospf6d')
-rw-r--r--usr.sbin/ospf6d/control.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/ospf6d/control.c b/usr.sbin/ospf6d/control.c
index 4bf2c4be8e2..5404373cfb1 100644
--- a/usr.sbin/ospf6d/control.c
+++ b/usr.sbin/ospf6d/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.18 2012/04/11 08:33:53 deraadt Exp $ */
+/* $OpenBSD: control.c,v 1.19 2013/03/11 17:40:11 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -132,7 +132,8 @@ control_accept(int listenfd, short event, void *bula)
event_del(&control_state.ev);
evtimer_add(&control_state.evt, &evtpause);
- } else if (errno != EWOULDBLOCK && errno != EINTR)
+ } else if (errno != EWOULDBLOCK && errno != EINTR &&
+ errno != ECONNABORTED)
log_warn("control_accept: accept");
return;
}