X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/c6d7203732eda798315564a0f293f7fcc3d7a766..43946961df9e7703c8877e4bbd9181507422429d:/modules/m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index c2a00ef5..54c71a1d 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -35,8 +35,7 @@
 #include "s_conf.h"
 #include "s_serv.h"
 #include "send.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "s_conf.h"
 #include "logger.h"
 #include "msg.h"
@@ -190,9 +189,9 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
 		nick++;
 	}
 
-	if(MyClient(source_p))
-		target_p = find_named_person(nick);
-	else
+	if(MyClient(source_p))
+		target_p = find_named_person(nick);
+	else
 		target_p = find_person(nick);
 
 	if(target_p != NULL)
@@ -327,6 +326,10 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 				    GlobalSetOptions.operstring));
 	}
 
+	if(IsSSLClient(target_p))
+		sendto_one_numeric(source_p, RPL_WHOISSECURE, form_str(RPL_WHOISSECURE),
+				   target_p->name);
+
 	if(MyClient(target_p))
 	{
 		if (IsDynSpoof(target_p) && (IsOper(source_p) || source_p == target_p))
@@ -350,9 +353,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 				   target_p->name, 
 				   rb_current_time() - target_p->localClient->last, 
 				   target_p->localClient->firsttime);
-
-		sendto_one_notice(source_p, ":%ld %ld", target_p->localClient->last, 
-				   target_p->localClient->firsttime);
 	}
 	else
 	{
@@ -373,7 +373,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 					   target_p->name, target_p->sockhost);
 			
 		}
-	
 	}
 
 	hdata.client = source_p;