Author: Kev <klmitch@mit.edu>

[ircu2.10.12-pk.git] / ircd / m_whois.c

diff --git a/ircd/m_whois.c b/ircd/m_whois.c
index 45ac83bf6367142c9cc12b6b1f08a1cb8c8d85c6..5dda1a572a2edd3279c7e48ad4967595eb739e58 100644 (file)
--- a/ircd/m_whois.c
+++ b/ircd/m_whois.c
@@ -85,7 +85,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
-#include "ircd_policy.h"
+#include "ircd_features.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "match.h"
@@ -183,12 +183,11 @@ static void do_whois(struct Client* sptr, struct Client *acptr, int parc)
         send_reply(sptr, RPL_WHOISCHANNELS, name, buf);
   }
 
-#ifdef HEAD_IN_SAND_WHOIS_SERVERNAME
-  if (!IsAnOper(sptr) && sptr != acptr)
-    send_reply(sptr, RPL_WHOISSERVER, name, "*.undernet.org",
-              "The Undernet Underworld");
+  if (feature_bool(FEAT_HIS_WHOIS_SERVERNAME) && !IsAnOper(sptr) &&
+      sptr != acptr)
+    send_reply(sptr, RPL_WHOISSERVER, name, feature_str(FEAT_HIS_SERVERNAME),
+               feature_str(FEAT_HIS_SERVERINFO));
   else
-#endif
     send_reply(sptr, RPL_WHOISSERVER, name, cli_name(a2cptr),
               cli_info(a2cptr));
 
@@ -200,16 +199,20 @@ static void do_whois(struct Client* sptr, struct Client *acptr, int parc)
     if (IsAnOper(acptr) && (HasPriv(acptr, PRIV_DISPLAY) ||
                            HasPriv(sptr, PRIV_SEE_OPERS)))
        send_reply(sptr, RPL_WHOISOPERATOR, name);
-   
+
+    if (IsAccount(acptr))
+      send_reply(sptr, RPL_WHOISACCOUNT, name, user->account);
+
+    if (HasHiddenHost(acptr) && (IsAnOper(sptr) || acptr == sptr))
+      send_reply(sptr, RPL_WHOISACTUALLY, name, user->username,
+                 user->realhost, ircd_ntoa((const char*) &(cli_ip(acptr))));
+    
     /* Hint: if your looking to add more flags to a user, eg +h, here's
      *       probably a good place to add them :)
      */
      
-    if (MyConnect(acptr)
-#ifdef HEAD_IN_SAND_WHOIS_IDLETIME
-       && (sptr == acptr || IsAnOper(sptr) || parc >= 3)
-#endif
-       )
+    if (MyConnect(acptr) && (!feature_bool(FEAT_HIS_WHOIS_IDLETIME) ||
+                             (sptr == acptr || IsAnOper(sptr) || parc >= 3)))
        send_reply(sptr, RPL_WHOISIDLE, name, CurrentTime - user->last, 
                   cli_firsttime(acptr));
   }
@@ -350,24 +353,31 @@ int m_whois(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 
   if (parc > 2)
   {
-    struct Client *acptr;
     /* For convenience: Accept a nickname as first parameter, by replacing
      * it with the correct servername - as is needed by hunt_server().
      * This is the secret behind the /whois nick nick trick.
      */
-#if HEAD_IN_SAND_REMOTE
-    /* If remote queries are disabled, then use the *second* parameter of
-     * of whois, so /whois nick nick still works.
-     */
-    acptr = FindUser(parv[2]);
-#else
-    acptr = FindUser(parv[1]);
-#endif
-    if (acptr)
-      parv[1] = cli_name(cli_user(acptr)->server);
+    if (feature_int(FEAT_HIS_REMOTE))
+    {
+      /* If remote queries are disabled, then use the *second* parameter of
+       * of whois, so /whois nick nick still works.
+       */
+      if (!IsAnOper(sptr))
+      {
+        if (!FindUser(parv[2]))
+        {
+          send_reply(sptr, ERR_NOSUCHNICK, parv[2]);
+          send_reply(sptr, RPL_ENDOFWHOIS, parv[2]);
+          return 0;
+        }
+        parv[1] = parv[2];
+      }
+    }
+
     if (hunt_server_cmd(sptr, CMD_WHOIS, cptr, 0, "%C :%s", 1, parc, parv) !=
-        HUNTED_ISME)
-      return 0;
+       HUNTED_ISME)
+    return 0;
+    
     parv[1] = parv[2];
   }
 
@@ -434,14 +444,6 @@ int ms_whois(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 
   if (parc > 2)
   {
-    struct Client *acptr;
-    /* For convenience: Accept a nickname as first parameter, by replacing
-     * it with the correct servername - as is needed by hunt_server().
-     * This is the secret behind the /whois nick nick trick.
-     */
-    acptr = FindUser(parv[1]);
-    if (acptr)
-      parv[1] = cli_name(cli_user(acptr)->server);
     if (hunt_server_cmd(sptr, CMD_WHOIS, cptr, 0, "%C :%s", 1, parc, parv) !=
         HUNTED_ISME)
       return 0;
@@ -482,3 +484,4 @@ int ms_whois(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 
   return 0;
 }
+