Change the defaul nicklen back to 31. This is more efficient due to struct packing.

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

diff --git a/modules/m_whois.c b/modules/m_whois.c
index 8ce505c1b91b5b7d53bacc75698625f9a5731912..bc8b36b542c9da5e63408692cb18fdc7e4802f8d 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"
@@ -243,6 +242,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        int i;
        char *m;
        int showsecret = 0;
+       struct Metadata *md;
 
        if(ConfigFileEntry.secret_channels_in_whois && IsOperSpy(source_p))
                showsecret = 1;
@@ -317,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"))
+                       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"))
+                       sendto_one_numeric(source_p, 320, "%s :%s", target_p->name, md->value);
        }
 
        if(IsSSLClient(target_p))