From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Thu, 17 Sep 2009 01:10:07 +0000 (-0600)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_1_0_14~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e174ac1bac80a3804dc450689cee133e045dc40;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/helpers/external_acl/ldap_group/squid_ldap_group.c b/helpers/external_acl/ldap_group/squid_ldap_group.c
index ee8588c295..afdb8d491a 100644
--- a/helpers/external_acl/ldap_group/squid_ldap_group.c
+++ b/helpers/external_acl/ldap_group/squid_ldap_group.c
@@ -233,7 +233,7 @@ main(int argc, char **argv)
         case 'd':
         case 'g':
         case 'S':
-	case 'K':
+        case 'K':
             break;
         default:
             if (strlen(argv[1]) > 2) {
diff --git a/src/cbdata.h b/src/cbdata.h
index 5a85b08fad..5c4b0320e5 100644
--- a/src/cbdata.h
+++ b/src/cbdata.h
@@ -336,7 +336,7 @@ extern cbdata_type cbdataInternalAddType(cbdata_type type, const char *label, in
 
 /**
  * \ingroup CBDATAAPI
- * 
+ *
  * This needs to be defined LAST in teh class definition. It plays with private/public states in C++.
  */
 #define CBDATA_CLASS2(type)	\
diff --git a/src/ip/IpIntercept.cc b/src/ip/IpIntercept.cc
index 9f2edeb2cb..4bd3b8b156 100644
--- a/src/ip/IpIntercept.cc
+++ b/src/ip/IpIntercept.cc
@@ -446,12 +446,12 @@ IpIntercept::ProbeForTproxy(IpAddress &test)
 #if LINUX_TPROXY2
 
 #if USE_IPV6
-        /* TPROXYv2 is not IPv6 capable. Force wildcard sockets to IPv4. Die on IPv6 IPs */
-        debugs(3, DBG_IMPORTANT, "Disabling IPv6 on port " << test << " (TPROXYv2 interception enabled)");
-        if ( test.IsIPv6() && !test.SetIPv4() ) {
-            debugs(3, DBG_CRITICAL, "IPv6 requires TPROXYv4 support. You only have TPROXYv2 for " << test );
-            return false;
-        }
+    /* TPROXYv2 is not IPv6 capable. Force wildcard sockets to IPv4. Die on IPv6 IPs */
+    debugs(3, DBG_IMPORTANT, "Disabling IPv6 on port " << test << " (TPROXYv2 interception enabled)");
+    if ( test.IsIPv6() && !test.SetIPv4() ) {
+        debugs(3, DBG_CRITICAL, "IPv6 requires TPROXYv4 support. You only have TPROXYv2 for " << test );
+        return false;
+    }
 #endif /* USE_IPV6 */
     return true;
 
@@ -473,8 +473,8 @@ IpIntercept::ProbeForTproxy(IpAddress &test)
         tmp.GetSockAddr(tmp_ip6);
 
         if ( (tmp_sock = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP)) >= 0 &&
-            setsockopt(tmp_sock, SOL_IP, IP_TRANSPARENT, (char *)&tos, sizeof(int)) == 0 &&
-            bind(tmp_sock, (struct sockaddr*)&tmp_ip6, sizeof(struct sockaddr_in6)) == 0 ) {
+                setsockopt(tmp_sock, SOL_IP, IP_TRANSPARENT, (char *)&tos, sizeof(int)) == 0 &&
+                bind(tmp_sock, (struct sockaddr*)&tmp_ip6, sizeof(struct sockaddr_in6)) == 0 ) {
 
             debugs(3, 3, "IPv6 TPROXY support detected. Using.");
             close(tmp_sock);
@@ -502,8 +502,8 @@ IpIntercept::ProbeForTproxy(IpAddress &test)
         tmp.GetSockAddr(tmp_ip4);
 
         if ( (tmp_sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) >= 0 &&
-            setsockopt(tmp_sock, SOL_IP, IP_TRANSPARENT, (char *)&tos, sizeof(int)) == 0 &&
-            bind(tmp_sock, (struct sockaddr*)&tmp_ip4, sizeof(struct sockaddr_in)) == 0 ) {
+                setsockopt(tmp_sock, SOL_IP, IP_TRANSPARENT, (char *)&tos, sizeof(int)) == 0 &&
+                bind(tmp_sock, (struct sockaddr*)&tmp_ip4, sizeof(struct sockaddr_in)) == 0 ) {
 
             debugs(3, 3, "IPv4 TPROXY support detected. Using.");
             close(tmp_sock);
diff --git a/src/ip/IpIntercept.h b/src/ip/IpIntercept.h
index 0121194fa7..21ad9ac28b 100644
--- a/src/ip/IpIntercept.h
+++ b/src/ip/IpIntercept.h
@@ -39,7 +39,7 @@ public:
      * Test system networking calls for TPROXY support.
      * Detects IPv6 and IPv4 level of support matches the address being listened on
      * and if the compiled v2/v4 is usable as far down as a bind()ing.
-     * 
+     *
      * \param test    Address set on the http(s)_port being checked.
      * \retval true   TPROXY is available.
      * \retval false  TPROXY is not available.