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 8f9de2bb529aeceb0385459e21fe491e31ee54ad..421697e1eac890df4fac88249c4fec660898fa6c 100644 (file)
--- 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 72d1acc84e46b9f67eefb83694bb99cbfba2dd70..3880e32b8dc154c0a3630da0366cd947197c3446 100644 (file)
--- 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
 {
 }