[or-cvs] r15727: Backport: Patch from coderman: detect transparent proxy head (tor/branches/tor-0_2_0-patches)

[nickm at seul.org]

Author: nickm
Date: 2008-07-07 11:17:23 -0400 (Mon, 07 Jul 2008)
New Revision: 15727

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/configure.in
Log:
Backport: Patch from coderman: detect transparent proxy header correctly on some linux versions.

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-07-07 15:09:26 UTC (rev 15726)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-07-07 15:17:23 UTC (rev 15727)
@@ -33,6 +33,9 @@
     - 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.0.28-rc - 2008-06-13

Modified: tor/branches/tor-0_2_0-patches/configure.in
===================================================================
--- tor/branches/tor-0_2_0-patches/configure.in	2008-07-07 15:09:26 UTC (rev 15726)
+++ tor/branches/tor-0_2_0-patches/configure.in	2008-07-07 15:17:23 UTC (rev 15727)
@@ -335,6 +335,9 @@
 #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