summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/dvmrpd/control.c4
-rw-r--r--usr.sbin/ldpd/control.c4
-rw-r--r--usr.sbin/ospf6d/control.c4
-rw-r--r--usr.sbin/ospfd/control.c4
-rw-r--r--usr.sbin/ripd/control.c4
5 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/dvmrpd/control.c b/usr.sbin/dvmrpd/control.c
index 0bfd1e5311b..a2d3c3a7c7f 100644
--- a/usr.sbin/dvmrpd/control.c
+++ b/usr.sbin/dvmrpd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.18 2013/11/26 11:32:30 henning Exp $ */
+/* $OpenBSD: control.c,v 1.19 2014/07/11 16:43:33 krw Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -229,7 +229,7 @@ control_dispatch_imsg(int fd, short event, void *bula)
}
}
if (event & EV_WRITE) {
- if (msgbuf_write(&c->iev.ibuf.w) == -1 && errno != EAGAIN) {
+ if (msgbuf_write(&c->iev.ibuf.w) <= 0 && errno != EAGAIN) {
control_close(fd);
return;
}
diff --git a/usr.sbin/ldpd/control.c b/usr.sbin/ldpd/control.c
index d17e945e2be..7a16254619d 100644
--- a/usr.sbin/ldpd/control.c
+++ b/usr.sbin/ldpd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.13 2013/11/26 11:59:38 henning Exp $ */
+/* $OpenBSD: control.c,v 1.14 2014/07/11 16:43:33 krw Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -209,7 +209,7 @@ control_dispatch_imsg(int fd, short event, void *bula)
}
}
if (event & EV_WRITE) {
- if (msgbuf_write(&c->iev.ibuf.w) == -1 && errno != EAGAIN) {
+ if (msgbuf_write(&c->iev.ibuf.w) <= 0 && errno != EAGAIN) {
control_close(fd);
return;
}
diff --git a/usr.sbin/ospf6d/control.c b/usr.sbin/ospf6d/control.c
index 190b8215589..7251ba63080 100644
--- a/usr.sbin/ospf6d/control.c
+++ b/usr.sbin/ospf6d/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.21 2013/11/13 20:49:49 benno Exp $ */
+/* $OpenBSD: control.c,v 1.22 2014/07/11 16:43:33 krw Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -228,7 +228,7 @@ control_dispatch_imsg(int fd, short event, void *bula)
}
}
if (event & EV_WRITE) {
- if (msgbuf_write(&c->iev.ibuf.w) == -1 && errno != EAGAIN) {
+ if (msgbuf_write(&c->iev.ibuf.w) <= 0 && errno != EAGAIN) {
control_close(fd);
return;
}
diff --git a/usr.sbin/ospfd/control.c b/usr.sbin/ospfd/control.c
index 27344950c24..1cade9b7969 100644
--- a/usr.sbin/ospfd/control.c
+++ b/usr.sbin/ospfd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.39 2013/11/13 20:43:00 benno Exp $ */
+/* $OpenBSD: control.c,v 1.40 2014/07/11 16:43:33 krw Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -230,7 +230,7 @@ control_dispatch_imsg(int fd, short event, void *bula)
}
}
if (event & EV_WRITE) {
- if (msgbuf_write(&c->iev.ibuf.w) == -1 && errno != EAGAIN) {
+ if (msgbuf_write(&c->iev.ibuf.w) <= 0 && errno != EAGAIN) {
control_close(fd);
return;
}
diff --git a/usr.sbin/ripd/control.c b/usr.sbin/ripd/control.c
index 73a80851057..2a6f6aa4f9d 100644
--- a/usr.sbin/ripd/control.c
+++ b/usr.sbin/ripd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.19 2013/11/19 22:25:32 benno Exp $ */
+/* $OpenBSD: control.c,v 1.20 2014/07/11 16:43:33 krw Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -228,7 +228,7 @@ control_dispatch_imsg(int fd, short event, void *bula)
}
}
if (event & EV_WRITE) {
- if (msgbuf_write(&c->iev.ibuf.w) == -1 && errno != EAGAIN) {
+ if (msgbuf_write(&c->iev.ibuf.w) <= 0 && errno != EAGAIN) {
control_close(fd);
return;
}