From 44bbb1a68bcc2ee47eaa30aea2adefabe55b6807 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Thu, 28 Jan 2021 12:13:24 +0000
Subject: [PATCH] OpenBSD: Fix kqueue detection and one error.

---
 configure          | 5 +++--
 src/privsep-root.c | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 59673c86..c8f15749 100755
--- a/configure
+++ b/configure
@@ -1226,7 +1226,7 @@ if [ -z "$POLL" ]; then
 	cat <<EOF >_kqueue1.c
 #include <sys/event.h>
 #include <sys/fcntl.h>
-#include <sys/wait.h>
+#include <sys/time.h>
 int main(void) {
 	return kqueue1(O_CLOEXEC);
 }
@@ -1243,8 +1243,9 @@ fi
 if [ -z "$POLL" ]; then
 	printf "Testing for kqueue ... "
 	cat <<EOF >_kqueue.c
+#include <sys/types.h>
 #include <sys/event.h>
-#include <sys/wait.h>
+#include <sys/time.h>
 int main(void) {
 	return kqueue();
 }
diff --git a/src/privsep-root.c b/src/privsep-root.c
index cfdcbb2c..eb6087f5 100644
--- a/src/privsep-root.c
+++ b/src/privsep-root.c
@@ -788,7 +788,8 @@ ps_root_log(void *arg)
 {
 	struct dhcpcd_ctx *ctx = arg;
 
-	if (logreadfd(ctx->ps_log_fd) == -1)
+	/* OpenBSD reports connection reset when dhcpcd exits ... */
+	if (logreadfd(ctx->ps_log_fd) == -1 && errno != ECONNRESET)
 		logerr(__func__);
 }
 
-- 
2.47.2