From: Thomas Markwalder <tmark@isc.org>
Date: Mon, 7 Mar 2016 14:07:43 +0000 (-0500)
Subject: [master] Fixed mulitply defined get_hw_addr issue
X-Git-Tag: v4_3_4b1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be3ee1b92bd76a68c8921ca2e37505d268758fb1;p=thirdparty%2Fdhcp.git

[master] Fixed mulitply defined get_hw_addr issue

includes/osdep.h - altered setting of USE_DLPI_HWADDR, it
is no longer defined under Solaris when --enable-ipv4-pktinfo
is specified.
---

diff --git a/includes/osdep.h b/includes/osdep.h
index 5ae0c35a7..f2b14f3c1 100644
--- a/includes/osdep.h
+++ b/includes/osdep.h
@@ -100,7 +100,7 @@
 #ifdef USE_SOCKETS
 #  define USE_SOCKET_SEND
 #  define USE_SOCKET_RECEIVE
-#  if defined(HAVE_DLPI)
+#  if defined(HAVE_DLPI) && !defined(sun) && !defined(USE_V4_PKTINFO)
 #    define USE_DLPI_HWADDR
 #  elif defined(HAVE_LPF)
 #    define USE_LPF_HWADDR