summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2024-11-21 13:06:32 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2024-11-21 13:06:32 +0000
commit5eeda5072225febdb498941a3e2bdcda5694cb64 (patch)
tree28218498e931fe4aa019c05ea26f65af3ce84925 /sbin
parentae6903b9e32081b24fc1068760ef4df0be489658 (diff)
imsg_flush no longer returns EAGAIN. Simplify proc_flush_imsg() accordingly.
Issue spotted by op@
Diffstat (limited to 'sbin')
-rw-r--r--sbin/iked/proc.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sbin/iked/proc.c b/sbin/iked/proc.c
index 337063f76e8..29c74825fca 100644
--- a/sbin/iked/proc.c
+++ b/sbin/iked/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.44 2024/04/09 15:48:01 tobhe Exp $ */
+/* $OpenBSD: proc.c,v 1.45 2024/11/21 13:06:19 claudio Exp $ */
/*
* Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -860,10 +860,7 @@ proc_flush_imsg(struct privsep *ps, enum privsep_procid id, int n)
for (; n < m; n++) {
if ((ibuf = proc_ibuf(ps, id, n)) == NULL)
return (-1);
- do {
- ret = imsg_flush(ibuf);
- } while (ret == -1 && errno == EAGAIN);
- if (ret == -1)
+ if ((ret = imsg_flush(ibuf)) == -1)
break;
imsg_event_add(&ps->ps_ievs[id][n]);
}