swrap: Check if the in_pktinfo structure is available.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c
index f5a7858d5c36bd4e1e1c6cd7ac3aacda2f0ce7ac..56d1d966a0aa32b706d07dd12108f8953c5e2f64 100644 (file)
--- a/lib/socket_wrapper/socket_wrapper.c
+++ b/lib/socket_wrapper/socket_wrapper.c
@@ -3053,7 +3053,7 @@ static int swrap_msghdr_add_pktinfo(struct socket_info *si,
 {
        /* Add packet info */
        switch (si->pktinfo) {
-#ifdef IP_PKTINFO
+#if defined(IP_PKTINFO) && defined(HAVE_STRUCT_IN_PKTINFO)
        case AF_INET: {
                struct sockaddr_in *sin;
                struct in_pktinfo pkt;

diff --git a/lib/socket_wrapper/wscript b/lib/socket_wrapper/wscript
index 53dace41db61e3cabe6f8d13d5ce42d832df648c..60b4ca89d1ce54f90e2a87248f20c75530e89300 100644 (file)
--- a/lib/socket_wrapper/wscript
+++ b/lib/socket_wrapper/wscript
@@ -48,6 +48,11 @@ def configure(conf):
                                     headers='sys/types.h sys/socket.h',
                                     define='HAVE_STRUCT_MSGHDR_MSG_CONTROL')
 
+        conf.CHECK_STRUCTURE_MEMBER('struct in_pktinfo',
+                                    'ipi_addr',
+                                    headers='sys/types.h sys/socket.h netinet/in.h',
+                                    define='HAVE_STRUCT_IN_PKTINFO')
+
         conf.CHECK_STRUCTURE_MEMBER('struct in6_pktinfo',
                                     'ipi6_addr',
                                     headers='sys/types.h sys/socket.h netinet/in.h',