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 333c86a6e446fa64533c6e1262f2a6112ce855b3..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"
@@ -242,6 +241,11 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        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)
        {
@@ -281,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))
                                {
@@ -291,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;
@@ -313,11 +317,16 @@ 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))