From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Wed, 25 Mar 2009 11:14:33 +0000 (+0200)
Subject: The defines ENABLE_SSL, ENABLE_ARP_ACL, ENABLE_IDENT are never defined.
X-Git-Tag: SQUID_3_2_0_1~1101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d65855ce034ff40d86dd136ffde09bbe0125161;p=thirdparty%2Fsquid.git

The defines ENABLE_SSL, ENABLE_ARP_ACL, ENABLE_IDENT are never defined.
The correct defines are USE_SSL, USE_ARP_ACL and USE_IDENT respectivelly
---

diff --git a/src/AclRegs.cc b/src/AclRegs.cc
index 1d000cb4e1..85c8b260ca 100644
--- a/src/AclRegs.cc
+++ b/src/AclRegs.cc
@@ -6,7 +6,7 @@
 */
 
 #include "acl/Acl.h"
-#ifdef ENABLE_ARP_ACL
+#ifdef USE_ARP_ACL
 #include "acl/Arp.h"
 #endif
 #include "acl/Asn.h"
@@ -24,7 +24,7 @@
 #include "acl/HttpRepHeader.h"
 #include "acl/HttpReqHeader.h"
 #include "acl/HttpStatus.h"
-#ifdef ENABLE_IDENT
+#ifdef USE_IDENT
 #include "acl/Ident.h"
 #endif
 #include "acl/IntRange.h"
@@ -47,7 +47,7 @@
 #include "acl/SourceAsn.h"
 #include "acl/SourceDomain.h"
 #include "acl/SourceIp.h"
-#ifdef ENABLE_SSL
+#ifdef USE_SSL
 #include "acl/SslErrorData.h"
 #include "acl/SslError.h"
 #include "acl/CertificateData.h"
@@ -117,7 +117,7 @@ ACLStrategised<char const *> ACLUrlPath::RegistryEntry_(new ACLRegexData, ACLUrl
 ACL::Prototype ACLUrlPort::RegistryProtoype(&ACLUrlPort::RegistryEntry_, "port");
 ACLStrategised<int> ACLUrlPort::RegistryEntry_(new ACLIntRange, ACLUrlPortStrategy::Instance(), "port");
 
-#ifdef ENABLE_SSL
+#ifdef USE_SSL
     ACL::Prototype ACLSslError::RegistryProtoype(&ACLSslError::RegistryEntry_, "ssl_error");
     ACLStrategised<int> ACLSslError::RegistryEntry_(new ACLSslErrorData, ACLSslErrorStrategy::Instance(), "ssl_error");
     ACL::Prototype ACLCertificate::UserRegistryProtoype(&ACLCertificate::UserRegistryEntry_, "user_cert");
@@ -126,12 +126,12 @@ ACLStrategised<int> ACLUrlPort::RegistryEntry_(new ACLIntRange, ACLUrlPortStrate
     ACLStrategised<SSL *> ACLCertificate::CARegistryEntry_(new ACLCertificateData (sslGetCAAttribute), ACLCertificateStrategy::Instance(), "ca_cert");
 #endif
 
-#ifdef ENABLE_ARP_ACL
+#ifdef USE_ARP_ACL
     ACL::Prototype ACLARP::RegistryProtoype(&ACLARP::RegistryEntry_, "arp");
     ACLARP ACLARP::RegistryEntry_("arp");
 #endif
 
-#ifdef ENABLE_IDENT
+#ifdef USE_IDENT
     ACL::Prototype ACLIdent::UserRegistryProtoype(&ACLIdent::UserRegistryEntry_, "ident");
     ACLIdent ACLIdent::UserRegistryEntry_(new ACLUserData, "ident");
     ACL::Prototype ACLIdent::RegexRegistryProtoype(&ACLIdent::RegexRegistryEntry_, "ident_regex" );