From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Thu, 18 Nov 2010 08:37:39 +0000 (+0200)
Subject: Minor changes to allow squid compile with ssl enabled but ssl_crtd disabled
X-Git-Tag: take1~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5faa519fd470741f5bc1ccb4af80989e9d9d0f7;p=thirdparty%2Fsquid.git

Minor changes to allow squid compile with ssl enabled but ssl_crtd disabled
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 8f9de2bb52..421697e1ea 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -3460,7 +3460,7 @@ ConnStateData::getSslContextStart()
             debugs(33, 5, HERE << "SSL certificate for " << host << " haven't found in cache");
         }
 
-#ifdef USE_SSL_CRTD
+#if USE_SSL_CRTD
         debugs(33, 5, HERE << "Generating SSL certificate for " << host << " using ssl_crtd.");
         Ssl::CrtdMessage request_message;
         request_message.setCode(Ssl::CrtdMessage::code_new_certificate);
@@ -3473,7 +3473,7 @@ ConnStateData::getSslContextStart()
         return true;
 #else
         debugs(33, 5, HERE << "Generating SSL certificate for " << host);
-        dynCtx = generateSslContext(host, port->signingCert, port->signPkey);
+        dynCtx = Ssl::generateSslContext(host, port->signingCert, port->signPkey);
         return getSslContextDone(dynCtx, true);
 #endif //USE_SSL_CRTD
     }
diff --git a/src/ssl/Config.cc b/src/ssl/Config.cc
index 72d1acc84e..3880e32b8d 100644
--- a/src/ssl/Config.cc
+++ b/src/ssl/Config.cc
@@ -6,9 +6,9 @@
 
 Ssl::Config Ssl::TheConfig;
 
-Ssl::Config::Config():
+Ssl::Config::Config()
 #if USE_SSL_CRTD
-ssl_crtd(NULL)
+:ssl_crtd(NULL)
 #endif
 {
 }