From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Thu, 13 Dec 2012 21:51:36 +0000 (+0200)
Subject: SSL server certificate validator implementation: remove more "#if 1 //USE_SSL_CERT_VA... 
X-Git-Tag: SQUID_3_4_0_1~447
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1024eeeaf10442560a3ce4837e545db23204d759;p=thirdparty%2Fsquid.git

SSL server certificate validator implementation: remove more "#if 1 //USE_SSL_CERT_VALIDATOR" conditionals
---

diff --git a/src/forward.h b/src/forward.h
index 4c0e945103..e269703141 100644
--- a/src/forward.h
+++ b/src/forward.h
@@ -9,7 +9,7 @@
 #include "fde.h"
 #include "HttpStatusCode.h"
 #include "ip/Address.h"
-#if USE_SSL //&& USE_SSL_CERT_VALIDATOR
+#if USE_SSL
 #include "ssl/support.h"
 #endif
 
@@ -20,7 +20,7 @@ typedef RefCount<AccessLogEntry> AccessLogEntryPointer;
 class ErrorState;
 class HttpRequest;
 
-#if USE_SSL //&& USE_SSL_CERT_VALIDATOR
+#if USE_SSL
 namespace Ssl
 {
 class ErrorDetail;
@@ -84,7 +84,7 @@ public:
     /** return a ConnectionPointer to the current server connection (may or may not be open) */
     Comm::ConnectionPointer const & serverConnection() const { return serverConn; };
 
-#if USE_SSL //&& USE_SSL_CERT_VALIDATOR
+#if USE_SSL
     /// Callback function called when squid receive message from cert validator helper
     static void sslCrtvdHandleReplyWrapper(void *data, const HelperReply &reply);
     /// Process response from cert validator helper
diff --git a/src/ssl/Config.h b/src/ssl/Config.h
index e3a99a4605..6fa5daedd5 100644
--- a/src/ssl/Config.h
+++ b/src/ssl/Config.h
@@ -14,10 +14,8 @@ public:
     /// The number of processes spawn for ssl_crtd.
     HelperChildConfig ssl_crtdChildren;
 #endif
-#if 1 // USE_SSL_CERT_VALIDATOR
     char *ssl_crt_validator;
     HelperChildConfig ssl_crt_validator_Children;
-#endif
     Config();
     ~Config();
 private:
diff --git a/src/ssl/helper.h b/src/ssl/helper.h
index 0ed3115efc..cc51ec8208 100644
--- a/src/ssl/helper.h
+++ b/src/ssl/helper.h
@@ -28,7 +28,6 @@ private:
 };
 #endif
 
-#if 1 // USE_SSL_CERT_VALIDATOR
 class CertValidationHelper
 {
 public:
@@ -43,7 +42,6 @@ private:
 
     helper * ssl_crt_validator; ///< helper for management of ssl_crtd.
 };
-#endif // USE_SSL_CERT_VALIDATOR
 
 } //namespace Ssl
 #endif // SQUID_SSL_HELPER_H