Show libratbox version info to opers in /info.

[irc/rqf/shadowircd.git] / modules / m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index c2a00ef5b1cd74230b5ba05e8321d5e8862c97d3..085e4d64d00a73556310a07d88d20514fdb1408e 100644 (file)
--- 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))\r
-               target_p = find_named_person(nick);\r
-       else\r
+       if(MyClient(source_p))
+               target_p = find_named_person(nick);
+       else
                target_p = find_person(nick);
 
        if(target_p != NULL)
@@ -201,7 +200,7 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
                {
                        char buffer[BUFSIZE];
 
-                       snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
+                       rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
                                target_p->name, target_p->username,
                                target_p->host, target_p->servptr->name);
                        report_operspy(source_p, "WHOIS", buffer);
@@ -240,16 +239,9 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        char *t;
        int tlen;
        hook_data_client hdata;
-       char *name;
-       char quest[] = "?";
        int visible;
        int extra_space = 0;
 
-       if(target_p->name[0] == '\0')
-               name = quest;
-       else
-               name = target_p->name;
-
        if(target_p->user == NULL)
        {
                s_assert(0);
@@ -327,6 +319,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 +346,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 +366,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                           target_p->name, target_p->sockhost);
                        
                }
-       
        }
 
        hdata.client = source_p;