From: serassio <>
Date: Sun, 25 Sep 2005 18:36:50 +0000 (+0000)
Subject: Bug #1378: Transparent proxy problem with IP Filter
X-Git-Tag: SQUID_3_0_PRE4~602
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08a746abcde095707de576616a4470bfb9cd0550;p=thirdparty%2Fsquid.git

Bug #1378: Transparent proxy problem with IP Filter

Incremental patch: fixed a compile warning.

Forward port of 2.5 patch.
---

diff --git a/src/IPInterception.cc b/src/IPInterception.cc
index 64f1832f15..ed00b7f48b 100644
--- a/src/IPInterception.cc
+++ b/src/IPInterception.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: IPInterception.cc,v 1.12 2005/09/12 14:20:02 serassio Exp $
+ * $Id: IPInterception.cc,v 1.13 2005/09/25 12:36:50 serassio Exp $
  *
  * DEBUG: section 89    NAT / IP Interception 
  * AUTHOR: Robert Collins
@@ -92,11 +92,14 @@ clientNatLookup(int fd, struct sockaddr_in me, struct sockaddr_in peer, struct s
 #if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027)
 
     struct ipfobj obj;
+#else
+
+    static int siocgnatl_cmd = SIOCGNATL & 0xff;
+
 #endif
 
     struct natlookup natLookup;
     static int natfd = -1;
-    static int siocgnatl_cmd = SIOCGNATL & 0xff;
     static time_t last_reported = 0;
     int x;