[openssh-commits] [openssh] 05/11: Create replacement ifaddrs.h if needed.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 82fed5110fe09e9af258a8f5a2f92ffb397fff5b
Author: Darren Tucker <dtucker at dtucker.net>
AuthorDate: Fri Sep 5 17:31:15 2025 +1000

    Create replacement ifaddrs.h if needed.
    
    Remove #ifdef HAVE_IFADDRS_H wrapper.  ok djm@
---
 configure.ac | 3 +--
 readconf.c   | 4 +---
 sshconnect.c | 4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 417985751..6f48e5508 100644
--- a/configure.ac
+++ b/configure.ac
@@ -468,7 +468,6 @@ AC_CHECK_HEADERS([ \
 	glob.h \
 	ia.h \
 	iaf.h \
-	ifaddrs.h \
 	inttypes.h \
 	langinfo.h \
 	limits.h \
@@ -532,7 +531,7 @@ AC_CHECK_HEADERS([ \
 # the equivalent file.  This avoids having to wrap those includes in
 # '#ifdef HAVE_FOO_H'.  If we create any such headers, add the path to includes.
 compatincludes=no
-AC_CHECK_HEADERS([paths.h poll.h stdint.h util.h], [], [
+AC_CHECK_HEADERS([ifaddrs.h paths.h poll.h stdint.h util.h], [], [
     compatincludes="`pwd`/openbsd-compat/include"
     mkdir -p "$compatincludes"
     case "$ac_header" in
diff --git a/readconf.c b/readconf.c
index 0acc08ca1..d99205944 100644
--- a/readconf.c
+++ b/readconf.c
@@ -29,9 +29,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#ifdef HAVE_IFADDRS_H
-# include <ifaddrs.h>
-#endif
+#include <ifaddrs.h>
 #include <limits.h>
 #include <netdb.h>
 #include <paths.h>
diff --git a/sshconnect.c b/sshconnect.c
index 79ccbcc6b..97f65edc7 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -41,9 +41,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
-#ifdef HAVE_IFADDRS_H
-# include <ifaddrs.h>
-#endif
+#include <ifaddrs.h>
 
 #include "xmalloc.h"
 #include "hostfile.h"

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.