summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRazvan Becheriu <razvan@isc.org>2019-07-18 12:14:20 +0300
committerRazvan Becheriu <razvan@isc.org>2019-09-06 18:39:45 +0300
commitb402cd22b030c4bcfbba19d1f67dde599fdc1703 (patch)
tree44ee43410ae4b1c73234d1ac7f32ef2154a5cc01
parent230d8be619cb4ad8f73cf26a33c1469088afe106 (diff)
downloadisc-dhcp-19-have_so_bindtodevice-referenced-before-it-has-a-chance-to-be-defined.tar.gz
-rw-r--r--RELNOTES4
-rw-r--r--includes/osdep.h11
2 files changed, 7 insertions, 8 deletions
diff --git a/RELNOTES b/RELNOTES
index a21b8506..04aa0c2c 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -89,8 +89,8 @@ by Eric Young (eay@cryptsoft.com).
Changes since 4.4.1 (New Features)
-- Fixed define flags when using HAVE_SO_BINDTODEVICE and SO_BINDTODEVICE.
- Thanks to Joe LeVeque for reporting the issue.
+- Fixed define flags when using SO_BINDTODEVICE. Thanks to Joe LeVeque for
+ reporting the issue.
[ISC-Bugs #19,!14 git TBD]
- A new configuration parameter, ping-cltt-secs (v4 operation only), has
diff --git a/includes/osdep.h b/includes/osdep.h
index 9279c638..3ee70bc0 100644
--- a/includes/osdep.h
+++ b/includes/osdep.h
@@ -138,6 +138,10 @@
# define USE_UPF_RECEIVE
#endif
+#if defined (SO_BINDTODEVICE) && !defined (HAVE_SO_BINDTODEVICE)
+# define HAVE_SO_BINDTODEVICE
+#endif
+
/* Porting::
If you add support for sending packets directly out an interface,
@@ -149,8 +153,7 @@
#if defined (USE_BPF_SEND) || defined (USE_NIT_SEND) || \
defined (USE_DLPI_SEND) || defined (USE_UPF_SEND) || \
defined (USE_LPF_SEND) || \
- (defined (USE_SOCKET_SEND) && (defined (HAVE_SO_BINDTODEVICE) || \
- defined (SO_BINDTODEVICE)))
+ (defined (USE_SOCKET_SEND) && defined (HAVE_SO_BINDTODEVICE))
# define USE_SOCKET_FALLBACK
# define USE_FALLBACK
#endif
@@ -264,10 +267,6 @@
# define HAVE_ARPHRD_METRICOM
#endif
-#if defined (SO_BINDTODEVICE) && !defined (HAVE_SO_BINDTODEVICE)
-# define HAVE_SO_BINDTODEVICE
-#endif
-
#if defined (AF_LINK) && !defined (HAVE_AF_LINK)
# define HAVE_AF_LINK
#endif