From: Darren Tucker <dtucker@dtucker.net>
Date: Fri, 5 Sep 2025 08:05:15 +0000 (+1000)
Subject: Create replacement sys/un.h if needed.
X-Git-Tag: V_10_1_P1~110
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65dcdb56f5daee519ec824ae17e64412d2492f90;p=thirdparty%2Fopenssh-portable.git

Create replacement sys/un.h if needed.

Remove #ifdef HAVE_SYS_UN_H wrapper.  ok djm@
---

diff --git a/configure.ac b/configure.ac
index f165794a5..c75a90abe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -536,6 +536,7 @@ AC_CHECK_HEADERS([ \
     stdint.h \
     sys/stat.h \
     sys/time.h \
+    sys/un.h \
     time.h \
     util.h], [], [
 	compatincludes="`pwd`/openbsd-compat/include"
diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 5c0523fb3..21697ca88 100644
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -29,9 +29,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
-#ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
-#endif
 
 #include <errno.h>
 #include <string.h>
diff --git a/openbsd-compat/port-prngd.c b/openbsd-compat/port-prngd.c
index 6afa8f913..ac4f27082 100644
--- a/openbsd-compat/port-prngd.c
+++ b/openbsd-compat/port-prngd.c
@@ -26,9 +26,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#ifdef HAVE_SYS_UN_H
-# include <sys/un.h>
-#endif
+#include <sys/un.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/ssh-agent.c b/ssh-agent.c
index 36243f198..df241379c 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -42,9 +42,7 @@
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/time.h>
-#ifdef HAVE_SYS_UN_H
-# include <sys/un.h>
-#endif
+#include <sys/un.h>
 #include "openbsd-compat/sys-queue.h"
 
 #ifdef WITH_OPENSSL