From: Thomas Markwalder <tmark@isc.org>
Date: Fri, 8 Nov 2019 19:09:35 +0000 (-0500)
Subject: [#19]  Corrections to SO_BINDTODEVICE definition
X-Git-Tag: v4_1_esv_r16b1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f78a41b766d7fe99e82775e5852b649f97639c36;p=thirdparty%2Fdhcp.git

[#19]  Corrections to SO_BINDTODEVICE definition

        Merges changes for #19,!14 into v4_1_esv
---

diff --git a/RELNOTES b/RELNOTES
index 7499c845b..e1561f4fe 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 0d1c05dbc..9fceaec9a 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