summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-11-25 09:27:52 -0500
committerNick Mathewson <nickm@torproject.org>2015-11-25 09:27:52 -0500
commit232ccc18c40f0d0302b2e21b0f67885c548f8e63 (patch)
treeb5ad25cb76d4c63389e343d1e699377c55b4c5bc
parent273b267fa234c5a26c9beaacede42a496c880e05 (diff)
downloadtor-232ccc18c40f0d0302b2e21b0f67885c548f8e63.tar.gz
tor-232ccc18c40f0d0302b2e21b0f67885c548f8e63.zip
Include netinet/in.h (if detected) in check for net/pfvar.h
Patch from rubiate; fixes bug 17551.
-rw-r--r--changes/bug175514
-rw-r--r--configure.ac3
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug17551 b/changes/bug17551
new file mode 100644
index 0000000000..27e467979e
--- /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 06d03ae5c6..3236a812f3 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,[],[],