From 2f32154e572febaa7a903fcc93828cae4ed0e38d Mon Sep 17 00:00:00 2001 From: Christos Tsantilas Date: Wed, 6 May 2015 17:58:01 +0300 Subject: [PATCH] Fix "Secure ICAP" patch, revno.14055, to allow compile with openSSL disabled --- src/adaptation/ServiceConfig.cc | 2 +- src/adaptation/icap/Xaction.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/adaptation/ServiceConfig.cc b/src/adaptation/ServiceConfig.cc index 3b4338dc4d..f1dfbcd4a0 100644 --- 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 2f2134e23c..70092f2cfd 100644 --- 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; -- 2.47.2