[tor-commits] [tor/release-0.2.7] Include netinet/in.h (if detected) in check for net/pfvar.h

[arma@xxxxxxxxxxxxxx]

commit 232ccc18c40f0d0302b2e21b0f67885c548f8e63
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Nov 25 09:27:52 2015 -0500

    Include netinet/in.h (if detected) in check for net/pfvar.h
    
    Patch from rubiate; fixes bug 17551.
---
 changes/bug17551 |    4 ++++
 configure.ac     |    3 +++
 2 files changed, 7 insertions(+)

diff --git a/changes/bug17551 b/changes/bug17551
new file mode 100644
index 0000000..27e4679
--- /dev/null
+++ b/changes/bug17551
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+    - When checking for net/pfvar.h, include netinet/in.h if possible.
+      This fixes transparent proxy detection on OpenBSD. Fixes bug
+      17551; bugfix on 0.1.2.1-alpha. Patch from "rubiate".
diff --git a/configure.ac b/configure.ac
index 06d03ae..3236a81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -971,6 +971,9 @@ AC_CHECK_HEADERS(net/pfvar.h, net_pfvar_found=1, net_pfvar_found=0,
 #endif
 #ifdef HAVE_NET_IF_H
 #include <net/if.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
 #endif])
 
 AC_CHECK_HEADERS(linux/if.h,[],[],



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits