For anyone else who hits this in the future, the above patch works but only by
accident. A temporary patch until this is patched by upstream is below.
---
src/ssl/certificate_db.cc | 6 +++---
src/ssl/certificate_db.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ssl/certificate_db.cc b/src/ssl/certificate_db.cc
index 67e0ecc..5be089d 100644
--- a/src/ssl/certificate_db.cc
+++ b/src/ssl/certificate_db.cc
@@ -264,13 +264,13 @@ Ssl::CertificateDb::CertificateDb(std::string const &
aDb_path, size_t aMax_db_s
}
bool Ssl::CertificateDb::find(std::string const & host_name, Ssl::X509_Pointer
& cert, Ssl::EVP_PKEY_Pointer & pkey) {
- const Locker locker(dbLock, Here);
+ const Locker locker(dbLock, Here_db);
load();
return pure_find(host_name, cert, pkey);
}
bool Ssl::CertificateDb::purgeCert(std::string const & key) {
- const Locker locker(dbLock, Here);
+ const Locker locker(dbLock, Here_db);
load();
if (!db)
return false;
@@ -283,7 +283,7 @@ bool Ssl::CertificateDb::purgeCert(std::string const & key)
{
}
bool Ssl::CertificateDb::addCertAndPrivateKey(Ssl::X509_Pointer & cert,
Ssl::EVP_PKEY_Pointer & pkey, std::string const & useName) {
- const Locker locker(dbLock, Here);
+ const Locker locker(dbLock, Here_db);
load();
if (!db || !cert || !pkey)
return false;
diff --git a/src/ssl/certificate_db.h b/src/ssl/certificate_db.h
index d9793df..bae44d2 100644
--- a/src/ssl/certificate_db.h
+++ b/src/ssl/certificate_db.h
@@ -53,7 +53,7 @@ private:
};
/// convenience macro to pass source code location to Locker and others
-#define Here __FILE__, __LINE__
+#define Here_db __FILE__, __LINE__
/**
* Database class for storing SSL certificates and their private keys.
--
2.17.1
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1890790
Title:
Build Failure with --enable-ssl-crtd flag
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/squid3/+bug/1890790/+subscriptions
--
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
