Some clang static analyzer fixes.

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

diff --git a/modules/m_whois.c b/modules/m_whois.c
index 40a8d52e6d0b4d9481f502449314ba1d670fdd60..3fc8f127e9b74f77e4f573efc5612cf5d35e3152 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_whois.c 3536 2007-07-14 21:50:21Z jilles $
  */
 
 #include "stdinc.h"
@@ -43,6 +42,7 @@
 #include "modules.h"
 #include "hook.h"
 #include "s_newconf.h"
+#include "s_user.h"
 
 static void do_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 static void single_whois(struct Client *source_p, struct Client *target_p, int operspy);
@@ -69,7 +69,6 @@ DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision
 
 /*
  * m_whois
- *      parv[0] = sender prefix
  *      parv[1] = nickname masklist
  */
 static int
@@ -115,7 +114,6 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 /*
  * ms_whois
- *      parv[0] = sender prefix
  *      parv[1] = server to reply
  *      parv[2] = nickname to whois
  */
@@ -200,7 +198,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);
@@ -241,6 +239,13 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        hook_data_client hdata;
        int visible;
        int extra_space = 0;
+       int i;
+       char *m;
+       int showsecret = 0;
+       struct Metadata *md;
+
+       if(ConfigFileEntry.secret_channels_in_whois && IsOperSpy(source_p))
+               showsecret = 1;
 
        if(target_p->user == NULL)
        {
@@ -280,7 +285,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
                        visible = ShowChannel(source_p, chptr);
 
-                       if(visible || operspy)
+                       if(visible || operspy || showsecret)
                        {
                                if((cur_len + strlen(chptr->chname) + 3) > (BUFSIZE - 5))
                                {
@@ -290,7 +295,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                }
 
                                tlen = rb_sprintf(t, "%s%s%s ",
-                                               visible ? "" : "!",
+                                               visible ? "" : "*",
                                                find_channel_status(msptr, 1),
                                                chptr->chname);
                                t += tlen;
@@ -312,16 +317,45 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
        if(IsOper(target_p))
        {
-               sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
-                                  target_p->name,
-                                  IsService(target_p) ? ConfigFileEntry.servicestring :
-                                  (IsAdmin(target_p) ? GlobalSetOptions.adminstring :
-                                   GlobalSetOptions.operstring));
+               if((md = user_metadata_find(target_p, "OPERSTRING")) != NULL)
+                       sendto_one_numeric(source_p, 313, "%s :%s", target_p->name, md->value);
+               else
+                       sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
+                                       target_p->name,
+                                       IsService(target_p) ? ConfigFileEntry.servicestring :
+                                       (IsAdmin(target_p) ? GlobalSetOptions.adminstring :
+                                       GlobalSetOptions.operstring));
+               if((md = user_metadata_find(target_p, "SWHOIS")) != NULL)
+                       sendto_one_numeric(source_p, 320, "%s :%s", target_p->name, md->value);
        }
 
        if(IsSSLClient(target_p))
                sendto_one_numeric(source_p, RPL_WHOISSECURE, form_str(RPL_WHOISSECURE),
                                   target_p->name);
+       if((source_p == target_p || IsOper(source_p)) &&
+                       target_p->certfp != NULL)
+               sendto_one_numeric(source_p, RPL_WHOISCERTFP,
+                               form_str(RPL_WHOISCERTFP),
+                               target_p->name, target_p->certfp);
+
+       if(IsSetBot(target_p))
+               sendto_one_numeric(source_p, RPL_WHOISBOT,
+                               form_str(RPL_WHOISBOT),
+                               target_p->name);
+       if(IsOper(source_p))
+       {
+               m = buf;
+               *m++ = '+';
+
+               for (i = 0; i < 128; i++) /* >= 127 is extended ascii */
+                       if (target_p->umodes & user_modes[i])
+                               *m++ = (char) i;
+                               *m = '\0';
+
+               sendto_one_numeric(source_p, RPL_WHOISMODES,
+                               form_str(RPL_WHOISMODES),
+                               target_p->name, buf);
+       }
 
        if(MyClient(target_p))
        {