summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2019-11-08 14:09:35 -0500
committerThomas Markwalder <tmark@isc.org>2019-11-08 14:09:35 -0500
commitf78a41b766d7fe99e82775e5852b649f97639c36 (patch)
treee15274e5d1da969efe2f3c9c96c1d47a4ba7295d
parent9050875357d4dbeda7f9262f27ce94fa9e814e43 (diff)
downloadisc-dhcp-19-v4_1_esv-have_so_bindtodevice-referenced-before-it-has-a-chance-to-be-defined.tar.gz
Merges changes for #19,!14 into v4_1_esv
-rw-r--r--RELNOTES4
-rw-r--r--includes/osdep.h8
2 files changed, 8 insertions, 4 deletions
diff --git a/RELNOTES b/RELNOTES
index 7499c845..e1561f4f 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -78,6 +78,10 @@ dhcp-users@lists.isc.org.
Thanks to Brett Neumeier for bringing the matter to our attention.
[Gitlab #15]
+- Fixed define flags when using SO_BINDTODEVICE. Thanks to Joe LeVeque for
+ reporting the issue.
+ [ISC-Bugs #19]
+
Changes since 4.1-ESV-R15
- Corrected dhclient command line parsing for --dad-wait-time that causes
diff --git a/includes/osdep.h b/includes/osdep.h
index 0d1c05db..9fceaec9 100644
--- a/includes/osdep.h
+++ b/includes/osdep.h
@@ -135,6 +135,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,
@@ -260,10 +264,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