Fix "Secure ICAP" patch, revno.14055, to allow compile with openSSL disabled

diff --git a/src/adaptation/ServiceConfig.cc b/src/adaptation/ServiceConfig.cc
index 3b4338dc4da2aef4cef1275ff18cf2dcb8434ef9..f1dfbcd4a0fffd91b621f590851477254390a429 100644 (file)
--- a/src/adaptation/ServiceConfig.cc
+++ b/src/adaptation/ServiceConfig.cc
@@ -129,7 +129,7 @@ Adaptation::ServiceConfig::parse()
             onOverloadSet = true;
         } else if (strncmp(name, "ssl", 3) == 0 || strncmp(name, "tls-", 4) == 0) {
 #if !USE_OPENSSL
-            debugs(3, DBG_PARSE_NOTE(DBG_IMPORTANT), "WARNING: adaptation option '" << token << "' requires --with-openssl. ICAP service option ignored.");
+            debugs(3, DBG_PARSE_NOTE(DBG_IMPORTANT), "WARNING: adaptation option '" << name << "' requires --with-openssl. ICAP service option ignored.");
 #else
             // name prefix is "ssl" or "tls-"
             std::string tmp = name + (name[0] == 's' ? 3 : 4);

diff --git a/src/adaptation/icap/Xaction.h b/src/adaptation/icap/Xaction.h
index 2f2134e23ca8d0f0f9afdf67d693866cc166fe32..70092f2cfda8538b0656b67cef18037bad664798 100644 (file)
--- a/src/adaptation/icap/Xaction.h
+++ b/src/adaptation/icap/Xaction.h
@@ -17,7 +17,9 @@
 #include "HttpReply.h"
 #include "ipcache.h"
 #include "SBuf.h"
+#if USE_OPENSSL
 #include "ssl/PeerConnector.h"
+#endif
 
 class MemBuf;