From 19bdc8559769ca66ada8f1c6fe8c43677513e10e Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 4 Oct 2009 16:38:26 +0000
Subject: [PATCH] Don't use AI_ADDRCONFIG on platforms that don't support it.
Compile fix for OpenBSD and earlier glibc versions.
Anonymously submitted in #2872591.
---
jbsockets.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/jbsockets.c b/jbsockets.c
index 15772f05..3d4b2964 100644
--- a/jbsockets.c
+++ b/jbsockets.c
@@ -1,4 +1,4 @@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.66 2009/09/06 15:22:31 fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.67 2009/09/10 14:53:34 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@ -169,7 +169,10 @@ jb_socket connect_to(const char *host, int portnum, struct client_state *csp)
memset((char *)&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
- hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICSERV; /* avoid service look-up */
+ hints.ai_flags = AI_NUMERICSERV; /* avoid service look-up */
+#ifdef AI_ADDRCONFIG
+ hints.ai_flags |= AI_ADDRCONFIG;
+#endif
if ((retval = getaddrinfo(host, service, &hints, &result)))
{
log_error(LOG_LEVEL_INFO,
@@ -703,7 +706,10 @@ int bind_port(const char *hostnam, int portnum, jb_socket *pfd)
hints.ai_family = AF_UNSPEC;
}
hints.ai_socktype = SOCK_STREAM;
- hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
+ hints.ai_flags = AI_PASSIVE;
+#ifdef AI_ADDRCONFIG
+ hints.ai_flags |= AI_ADDRCONFIG;
+#endif
hints.ai_protocol = 0; /* Realy any stream protocol or TCP only */
hints.ai_canonname = NULL;
hints.ai_addr = NULL;
--
2.49.0