From 04004719c6d031dde96bb9d8927241eea0701f2f Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Mon, 10 Jun 2019 14:10:56 +0100
Subject: Fix a misleading log message in the sslinfo module.

---
 src/modules/m_sslinfo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/modules/m_sslinfo.cpp')

diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 1b1ce9eaa..cc882be1b 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -313,7 +313,7 @@ class ModuleSSLInfo
 		else if (myclass->config->getBool("requiressl"))
 		{
 			ok = (cert != NULL);
-			ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Class requires any SSL cert. Client %s one.", (ok ? "has" : "does not have"));
+			ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Class requires SSL. Client %s using SSL.", (ok ? "is" : "is not"));
 		}
 
 		if (!ok)
-- 
cgit v1.3.1-10-gc9f91


From e86b4311c090d9f3d06c5762a978563acfd84039 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Sat, 29 Jun 2019 15:38:29 +0100
Subject: sslinfo: use the SSL certificate API to get user SSL certificates.

---
 src/modules/m_sslinfo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/modules/m_sslinfo.cpp')

diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index cc882be1b..a759718e6 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -303,7 +303,7 @@ class ModuleSSLInfo
 
 	ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE
 	{
-		ssl_cert* cert = SSLClientCert::GetCertificate(&user->eh);
+		ssl_cert* cert = cmd.sslapi.GetCertificate(user);
 		bool ok = true;
 		if (myclass->config->getString("requiressl") == "trusted")
 		{
-- 
cgit v1.3.1-10-gc9f91