Author: Kev <klmitch@mit.edu>

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

diff --git a/ircd/m_userip.c b/ircd/m_userip.c
index 4fa321d02fe77dfa8daab53ef194298c7ee4d984..0f66e7b8fd43d47f934b30cef9220b1d2e23a364 100644 (file)
--- a/ircd/m_userip.c
+++ b/ircd/m_userip.c
@@ -79,14 +79,8 @@
  *            note:   it is guaranteed that parv[0]..parv[parc-1] are all
  *                    non-NULL pointers.
  */
-#if 0
-/*
- * No need to include handlers.h here the signatures must match
- * and we don't need to force a rebuild of all the handlers everytime
- * we add a new one to the list. --Bleep
- */
-#include "handlers.h"
-#endif /* 0 */
+#include "config.h"
+
 #include "client.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
@@ -100,7 +94,8 @@
 static void userip_formatter(struct Client* cptr, struct MsgBuf* mb)
 {
   assert(IsUser(cptr));
-  msgq_append(0, mb, "%s%s=%c%s@%s", cli_name(cptr), IsAnOper(cptr) ? "*" : "",
+  msgq_append(0, mb, "%s%s=%c%s@%s", cli_name(cptr),
+             HasPriv(cptr, PRIV_DISPLAY) ? "*" : "",
              cli_user(cptr)->away ? '-' : '+', cli_user(cptr)->username,
              ircd_ntoa((const char*) &(cli_ip(cptr))));
 }
@@ -118,46 +113,3 @@ int m_userip(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   send_user_info(sptr, parv[1], RPL_USERIP, userip_formatter); 
   return 0;
 }
-
-
-#if 0
-/*
- * m_userip added by Carlo Wood 3/8/97.
- *
- * The same as USERHOST, but with the IP-number instead of the hostname.
- */
-int m_userip(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
-{
-  char *s;
-  int i, j = 5;
-  char *p = 0, *sbuf;
-  struct Client *acptr;
-
-  if (parc < 2)
-    return need_more_params(sptr, "USERIP");
-
-  sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]); /* XXX DEAD */
-  for (i = j, s = ircd_strtok(&p, parv[1], " "); i && s;
-      s = ircd_strtok(&p, (char *)0, " "), i--)
-    if ((acptr = FindUser(s)))
-    {
-      if (i < j)
-        *sbuf++ = ' ';
-      sbuf = sprintf_irc(sbuf, "%s%s=%c%s@%s", acptr->name,
-          IsAnOper(acptr) ? "*" : "", (acptr->user->away) ? '-' : '+',
-          acptr->user->username, ircd_ntoa((const char*) &acptr->ip));
-    }
-    else
-    {
-      if (i < j)
-        sendbufto_one(sptr); /* XXX DEAD */
-      sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], s); /* XXX DEAD */
-      sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]); /* XXX DEAD */
-      j = i - 1;
-    }
-  if (i < j)
-    sendbufto_one(sptr); /* XXX DEAD */
-  return 0;
-}
-#endif /* 0 */
-