From ec6955f28ba9423828ac24ef83caee09ffa6b52c Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Mon, 26 Nov 2018 15:15:18 +0000
Subject: Fix detecting secure clients connecting through HAProxy/WEBIRC.

---
 src/modules/m_jumpserver.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 682e353d2..fc13a831c 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -38,8 +38,11 @@ class CommandJumpserver : public Command
 	std::string reason;
 	int port;
 	int sslport;
+	UserCertificateAPI sslapi;
 
-	CommandJumpserver(Module* Creator) : Command(Creator, "JUMPSERVER", 0, 4)
+	CommandJumpserver(Module* Creator)
+		: Command(Creator, "JUMPSERVER", 0, 4)
+		, sslapi(Creator)
 	{
 		flags_needed = 'o';
 		syntax = "[<server> <port>[:<sslport>] <+/-an> <reason>]";
@@ -146,7 +149,7 @@ class CommandJumpserver : public Command
 
 	int GetPort(LocalUser* user)
 	{
-		int p = (SSLIOHook::IsSSL(&user->eh) ? sslport : port);
+		int p = (sslapi && sslapi->GetCertificate(user) ? sslport : port);
 		if (p == 0)
 			p = user->GetServerPort();
 		return p;
-- 
cgit v1.3.1-10-gc9f91