Only send 320 numeric if the SSL user is on our port

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3068 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 4 insertions, 2 deletions

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 7ab3b7027..12ecf18eb 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -448,7 +448,8 @@ class ModuleSSLGnuTLS : public Module
 	// :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection
 	virtual void OnWhois(userrec* source, userrec* dest)
 	{
-		if(dest->GetExt("ssl"))
+		// Bugfix, only send this numeric for *our* SSL users
+		if(dest->GetExt("ssl") && isin(dest->port, listenports))
 		{
 			WriteServ(source->fd, "320 %s %s :is using a secure connection", source->nick, dest->nick);
 		}
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index a4a41cbdd..134efbe0c 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -528,7 +528,8 @@ class ModuleSSLOpenSSL : public Module
 	// :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection
 	virtual void OnWhois(userrec* source, userrec* dest)
 	{
-		if(dest->GetExt("ssl"))
+		// Bugfix, only send this numeric for *our* SSL users
+		if(dest->GetExt("ssl") && isin(dest->port, listenports))
 		{
 			WriteServ(source->fd, "320 %s %s :is using a secure connection", source->nick, dest->nick);
 		}