Amos requested changes

diff --git a/src/AclRegs.cc b/src/AclRegs.cc
index 564f071d2ad0198cb11c55263dc16f929b28ced7..c84ff9bef2089f5131b94804d224c64f9f16aca7 100644 (file)
--- a/src/AclRegs.cc
+++ b/src/AclRegs.cc
@@ -149,8 +149,8 @@ ACL::Prototype ACLCertificate::UserRegistryProtoype(&ACLCertificate::UserRegistr
 ACLStrategised<X509 *> ACLCertificate::UserRegistryEntry_(new ACLCertificateData (Ssl::GetX509UserAttribute, "*"), ACLCertificateStrategy::Instance(), "user_cert");
 ACL::Prototype ACLCertificate::CARegistryProtoype(&ACLCertificate::CARegistryEntry_, "ca_cert");
 ACLStrategised<X509 *> ACLCertificate::CARegistryEntry_(new ACLCertificateData (Ssl::GetX509CAAttribute, "*"), ACLCertificateStrategy::Instance(), "ca_cert");
-ACL::Prototype ACLServerCertificate::X509FingerprintRegistryProtoype(&ACLServerCertificate::X509FingerprintRegistryEntry_, "server_ssl_cert_fingerprint");
-ACLStrategised<X509 *> ACLServerCertificate::X509FingerprintRegistryEntry_(new ACLCertificateData(Ssl::GetX509Fingerprint, "-sha1", true), ACLServerCertificateStrategy::Instance(), "server_ssl_cert_fingerprint");
+ACL::Prototype ACLServerCertificate::X509FingerprintRegistryProtoype(&ACLServerCertificate::X509FingerprintRegistryEntry_, "server_cert_fingerprint");
+ACLStrategised<X509 *> ACLServerCertificate::X509FingerprintRegistryEntry_(new ACLCertificateData(Ssl::GetX509Fingerprint, "-sha1", true), ACLServerCertificateStrategy::Instance(), "server_cert_fingerprint");
 #endif
 
 #if USE_SQUID_EUI

diff --git a/src/acl/CertificateData.cc b/src/acl/CertificateData.cc
index e312091f5748abb2effbe56bf3b863cb77799f93..6a4a935441431480b592f0edd3bec29012f1a306 100644 (file)
--- a/src/acl/CertificateData.cc
+++ b/src/acl/CertificateData.cc
@@ -88,7 +88,7 @@ ACLCertificateData::match(X509 *cert)
         return 0;
 
     char const *value = sslAttributeCall(cert, attribute);
-    debugs(28, 6, HERE << (attribute ? attribute : "value") << "=" << value);
+    debugs(28, 6, (attribute ? attribute : "value") << "=" << value);
     if (value == NULL)
         return 0;
 
@@ -127,7 +127,7 @@ ACLCertificateData::parse()
             if (attributeIsOptional)
                 return;
 
-            debugs(28, DBG_CRITICAL, "required attribute argument missing");
+            debugs(28, DBG_CRITICAL, "FATAL: required attribute argument missing");
             self_destruct();
         }
 
@@ -145,14 +145,14 @@ ACLCertificateData::parse()
             }
 
             if (!valid) {
-                debugs(28, DBG_CRITICAL, "Unknown option. Supported option(s) are: " << validAttributesStr);
+                debugs(28, DBG_CRITICAL, "FATAL: Unknown option. Supported option(s) are: " << validAttributesStr);
                 self_destruct();
             }
             
             /* an acl must use consistent attributes in all config lines */
             if (attribute) {
                 if (strcasecmp(newAttribute, attribute) != 0) {
-                    debugs(28, DBG_CRITICAL, "An acl must use consistent attributes in all config lines (" << newAttribute << "!=" << attribute << ").");
+                    debugs(28, DBG_CRITICAL, "FATAL: An acl must use consistent attributes in all config lines (" << newAttribute << "!=" << attribute << ").");
                     self_destruct();
                 }
             } else

diff --git a/src/acl/ServerCertificate.cc b/src/acl/ServerCertificate.cc
index 043df0e9de7dbb6f8dd00c3ba619bf2a8eb864c8..29e43450e72633984c7decda4a1af9a76335ec1e 100644 (file)
--- a/src/acl/ServerCertificate.cc
+++ b/src/acl/ServerCertificate.cc
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  */
 
 #include "squid.h"
@@ -10,13 +8,12 @@
 #include "acl/ServerCertificate.h"
 #include "acl/Checklist.h"
 #include "acl/CertificateData.h"
-#include "fde.h"
 #include "client_side.h"
+#include "fde.h"
 #include "ssl/ServerBump.h"
 
-
 int
-ACLServerCertificateStrategy::match (ACLData<MatchType> * &data, ACLFilledChecklist *checklist)
+ACLServerCertificateStrategy::match(ACLData<MatchType> * &data, ACLFilledChecklist *checklist)
 {
     X509 *cert = NULL;
     if (checklist->serverCert.get())

diff --git a/src/acl/ServerCertificate.h b/src/acl/ServerCertificate.h
index 6edbe86061c9fd170a203d96ce9e265a1125621f..84e245d3e14036a6ca94fc448ac13661f3e5f78b 100644 (file)
--- a/src/acl/ServerCertificate.h
+++ b/src/acl/ServerCertificate.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  */
 
 #ifndef SQUID_ACLSERVERCERTIFICATE_H
@@ -14,7 +13,6 @@
 /// \ingroup ACLAPI
 class ACLServerCertificateStrategy : public ACLStrategy<X509 *>
 {
-
 public:
     virtual int match (ACLData<MatchType> * &, ACLFilledChecklist *);
     static ACLServerCertificateStrategy *Instance();

diff --git a/src/acl/StringData.h b/src/acl/StringData.h
index aa6b534c564a727958198e6896af8b3339d71596..b036ffa385327a5287e301a0ecd48902ba51d8da 100644 (file)
--- a/src/acl/StringData.h
+++ b/src/acl/StringData.h
@@ -52,7 +52,7 @@ public:
     void parse();
     bool empty() const;
     virtual ACLData<char const *> *clone() const;
-    /// Insert custom values
+    /// Insert a string data value
     void insert(const char *);
 
     SplayNode<char *> *values;

diff --git a/src/cf.data.pre b/src/cf.data.pre
index c464d12fc2934358c12611c69a321951b0d1b40b..a018bdf7f61ceaa12e897a888d64fe90515af24f 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -913,7 +913,7 @@ IF USE_SSL
          # NOTE: The ssl_error ACL is only supported with sslproxy_cert_error,
          # sslproxy_cert_sign, and sslproxy_cert_adapt options.
 
-       acl aclname server_ssl_cert_fingerprint [-sha1] fingerprint
+       acl aclname server_cert_fingerprint [-sha1] fingerprint
          # match against server SSL certificate fingerprint [fast]
          #
          # The fingerprint is the digest of the DER encoded version