From 933edf3875d5a329033d8a0415696b81488abcb8 Mon Sep 17 00:00:00 2001 From: brain Date: Thu, 1 Jun 2006 16:18:50 +0000 Subject: [PATCH] Fixed logic for OnWhois "is using SSL" numeric. Was broken: required the user to have the 'ssl' extensible AND be in the listen ports, so it didnt work on remote users which didnt have the listen port. Now properly checks to display by using: if(dest->GetExt("ssl") || (IS_LOCAL(dest) && isin(dest->port, listenports))) git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3984 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/extra/m_ssl_gnutls.cpp | 4 ++-- src/modules/extra/m_ssl_openssl.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 5be9e7bcc..a0695859e 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -201,7 +201,7 @@ class ModuleSSLGnuTLS : public Module { userrec* user = (userrec*)item; - if(user->GetExt("ssl") && IS_LOCAL(user) && isin(user->port, listenports)) + if(user->GetExt("ssl") && isin(user->port, listenports)) { // User is using SSL, they're a local user, and they're using one of *our* SSL ports. // Potentially there could be multiple SSL modules loaded at once on different ports. @@ -459,7 +459,7 @@ class ModuleSSLGnuTLS : public Module virtual void OnWhois(userrec* source, userrec* dest) { // Bugfix, only send this numeric for *our* SSL users - if(dest->GetExt("ssl") && isin(dest->port, listenports)) + if(dest->GetExt("ssl") || (IS_LOCAL(dest) && 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 b1d8af21c..d1fddba74 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -530,7 +530,7 @@ class ModuleSSLOpenSSL : public Module virtual void OnWhois(userrec* source, userrec* dest) { // Bugfix, only send this numeric for *our* SSL users - if(dest->GetExt("ssl") && isin(dest->port, listenports)) + if(dest->GetExt("ssl") || (IS_LOCAL(dest) && isin(dest->port, listenports))) { WriteServ(source->fd, "320 %s %s :is using a secure connection", source->nick, dest->nick); } -- 2.39.5