From 5941d59a9738a5246823e984518b8ac9fa7f9541 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Sat, 17 Mar 2018 01:06:24 +0100 Subject: [PATCH] unbreak el6 build --- pdns/lua-record.cc | 10 +++++++--- pdns/minicurl.cc | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pdns/lua-record.cc b/pdns/lua-record.cc index 8f21f83d9f..12e0b27d9e 100644 --- a/pdns/lua-record.cc +++ b/pdns/lua-record.cc @@ -28,6 +28,7 @@ pool of UeberBackends? */ +#ifdef CURLOPT_RESOLVE class IsUpOracle { private: @@ -178,7 +179,6 @@ void IsUpOracle::checkTCPThread(ComboAddress rem, opts_t opts) } } - void IsUpOracle::checkURLThread(ComboAddress rem, std::string url, opts_t opts) { setDown(rem, url, opts); @@ -212,9 +212,12 @@ void IsUpOracle::checkURLThread(ComboAddress rem, std::string url, opts_t opts) sleep(5); } } +#endif - +#ifdef CURLOPT_RESOLVE IsUpOracle g_up; +#endif + namespace { template bool doCompare(const T& var, const std::string& res, const C& cmp) @@ -608,7 +611,7 @@ std::vector> luaSynth(const std::string& code, cons return std::string("unknown"); }); - +#ifdef CURLOPT_RESOLVE lua.writeFunction("ifportup", [&bestwho](int port, const vector >& ips, const boost::optional> options) { vector candidates; std::unordered_map opts; @@ -687,6 +690,7 @@ std::vector> luaSynth(const std::string& code, cons return ret; }); +#endif diff --git a/pdns/minicurl.cc b/pdns/minicurl.cc index 99b6dfe40a..af67b834b6 100644 --- a/pdns/minicurl.cc +++ b/pdns/minicurl.cc @@ -33,6 +33,7 @@ static string extractHostFromURL(const std::string& url) return url.substr(pos, endpos-pos); } +#ifdef CURLOPT_RESOLVE void MiniCurl::setupURL(const std::string& str, const ComboAddress* rem, const ComboAddress* src) { if(rem) { @@ -66,6 +67,7 @@ void MiniCurl::setupURL(const std::string& str, const ComboAddress* rem, const C d_data.clear(); } + std::string MiniCurl::getURL(const std::string& str, const ComboAddress* rem, const ComboAddress* src) { setupURL(str, rem, src); @@ -95,3 +97,4 @@ std::string MiniCurl::postURL(const std::string& str, const std::string& postdat d_data.clear(); return ret; } +#endif \ No newline at end of file -- 2.47.2