m_oper: receive ircd-seven-style opernames

[solanum.git] / modules / m_userhost.c

diff --git a/modules/m_userhost.c b/modules/m_userhost.c
index b1e58aeaf1a85d0f88887a33587f65af012d5a1b..6b0a9ac1f0a17272056cd2c5954402f309df5df5 100644 (file)
--- a/modules/m_userhost.c
+++ b/modules/m_userhost.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_userhost.c 254 2005-09-21 23:35:12Z nenolod $
  */
 
 #include "stdinc.h"
@@ -35,26 +33,31 @@
 #include "parse.h"
 #include "modules.h"
 #include "s_conf.h"
+#include "s_newconf.h"
+
+static const char userhost_desc[] =
+       "Provides the USERHOST command to show a user's host";
 
 static char buf[BUFSIZE];
 
-static int m_userhost(struct Client *, struct Client *, int, const char **);
+static void m_userhost(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message userhost_msgtab = {
-       "USERHOST", 0, 0, 0, MFLG_SLOW,
+       "USERHOST", 0, 0, 0, 0,
        {mg_unreg, {m_userhost, 2}, mg_ignore, mg_ignore, mg_ignore, {m_userhost, 2}}
 };
 
 mapi_clist_av1 userhost_clist[] = { &userhost_msgtab, NULL };
-DECLARE_MODULE_AV1(userhost, NULL, NULL, userhost_clist, NULL, NULL, "$Revision: 254 $");
+
+DECLARE_MODULE_AV2(userhost, NULL, NULL, userhost_clist, NULL, NULL, NULL, NULL, userhost_desc);
 
 /*
  * m_userhost added by Darren Reed 13/8/91 to aid clients and reduce
  * the need for complicated requests like WHOIS. It returns user/host
  * information only (no spurious AWAY labels or channels).
  */
-static int
-m_userhost(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_userhost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Client *target_p;
        char response[NICKLEN * 2 + USERLEN + HOSTLEN + 30];
@@ -83,7 +86,7 @@ m_userhost(struct Client *client_p, struct Client *source_p, int parc, const cha
                        {
                                rl = sprintf(response, "%s%s=%c%s@%s ",
                                                target_p->name,
-                                               IsOper(target_p) ? "*" : "",
+                                               SeesOper(target_p, source_p) ? "*" : "",
                                                (target_p->user->away) ? '-' : '+',
                                                target_p->username,
                                                target_p->sockhost);
@@ -92,7 +95,7 @@ m_userhost(struct Client *client_p, struct Client *source_p, int parc, const cha
                        {
                                rl = sprintf(response, "%s%s=%c%s@%s ",
                                                target_p->name,
-                                               IsOper(target_p) ? "*" : "",
+                                               SeesOper(target_p, source_p) ? "*" : "",
                                                (target_p->user->away) ? '-' : '+',
                                                target_p->username, target_p->host);
                        }
@@ -109,6 +112,4 @@ m_userhost(struct Client *client_p, struct Client *source_p, int parc, const cha
        }
 
        sendto_one(source_p, "%s", buf);
-
-       return 0;
 }