]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Patch from coderman: detect transparent proxy header correctly on some linux versions.
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Jul 2008 15:09:26 +0000 (15:09 +0000)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Jul 2008 15:09:26 +0000 (15:09 +0000)
svn:r15726

ChangeLog
configure.in

index 9ea244bf479dcecf9d124616f751312e424b0d56..eaa8781ad716a2d1b8cecab811a9b6f7d693ed25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,9 @@ Changes in version 0.2.1.3-alpha - 2008-07-xx
     - When opening /dev/null in finish_daemonize(), do not pass the
       O_CREAT flag.  Fortify was complaining, and correctly so.  Fixes
       bug 742; fix from Michael Scherer.  Bugfix on 0.0.2pre19.
+    - Correctly detect transparent proxy support on Linux hosts that
+      require in.h to be included before netfilter_ipv4.h.  Patch from
+      coderman.
 
 
 Changes in version 0.2.1.2-alpha - 2008-06-20
index 3c55f0620028dc62ab7f814dd1e0100d7af12dbb..c266e31b5e1a287d1c621a6ca03243166d745bfd 100644 (file)
@@ -349,6 +349,9 @@ AC_CHECK_HEADERS(linux/netfilter_ipv4.h,
 #endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
 #endif])
 
 if test x$transparent = xtrue ; then