buildsystem: honor $DESTDIR in install-data-hook

[solanum.git] / modules / m_testline.c

diff --git a/modules/m_testline.c b/modules/m_testline.c
index 698b080ed39c75845922e8330f04e872536606fc..891d4486709c04e0b903a70bde8691eedd38eb1f 100644 (file)
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -1,5 +1,5 @@
 /* modules/m_testline.c
- * 
+ *
  *  Copyright (C) 2004 Lee Hardy <lee@leeh.co.uk>
  *  Copyright (C) 2004-2005 ircd-ratbox development team
  *
@@ -41,23 +41,23 @@
 #include "s_newconf.h"
 #include "reject.h"
 
-static int mo_testline(struct Client *, struct Client *, int, const char **);
-static int mo_testgecos(struct Client *, struct Client *, int, const char **);
+static int mo_testline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int mo_testgecos(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message testline_msgtab = {
-       "TESTLINE", 0, 0, 0, MFLG_SLOW,
-       {mg_unreg, mg_ignore, mg_ignore, mg_ignore, mg_ignore, {mo_testline, 2}}
+       "TESTLINE", 0, 0, 0, 0,
+       {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_testline, 2}}
 };
 struct Message testgecos_msgtab = {
-       "TESTGECOS", 0, 0, 0, MFLG_SLOW,
-       {mg_unreg, mg_ignore, mg_ignore, mg_ignore, mg_ignore, {mo_testgecos, 2}}
+       "TESTGECOS", 0, 0, 0, 0,
+       {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_testgecos, 2}}
 };
 
 mapi_clist_av1 testline_clist[] = { &testline_msgtab, &testgecos_msgtab, NULL };
 DECLARE_MODULE_AV1(testline, NULL, NULL, testline_clist, NULL, NULL, "$Revision: 3303 $");
 
 static int
-mo_testline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct ConfItem *aconf;
        struct ConfItem *resv_p;
@@ -71,6 +71,8 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
        int host_mask;
        int type;
        int duration;
+       char *puser, *phost, *reason, *operreason;
+       char reasonbuf[BUFSIZE];
 
        mask = LOCAL_COPY(parv[1]);
 
@@ -83,7 +85,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
                                        me.name, source_p->name,
                                        resv_p->hold ? 'q' : 'Q',
                                        resv_p->hold ? (long) ((resv_p->hold - rb_current_time()) / 60) : 0L,
-                                       resv_p->name, resv_p->passwd);
+                                       resv_p->host, resv_p->passwd);
                        /* this is a false positive, so make sure it isn't counted in stats q
                         * --nenolod
                         */
@@ -118,7 +120,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
                host = mask;
 
        /* parses as an IP, check for a dline */
-       if((type = parse_netmask(host, (struct sockaddr *)&ip, &host_mask)) != HM_HOST)
+       if((type = parse_netmask(host, &ip, &host_mask)) != HM_HOST)
        {
 #ifdef RB_IPV6
                if(type == HM_IPV6)
@@ -129,12 +131,15 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 
                if(aconf && aconf->status & CONF_DLINE)
                {
+                       get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
+                       snprintf(reasonbuf, sizeof(reasonbuf), "%s%s%s", reason,
+                               operreason ? "|" : "", operreason ? operreason : "");
                        sendto_one(source_p, form_str(RPL_TESTLINE),
                                me.name, source_p->name,
                                (aconf->flags & CONF_FLAGS_TEMPORARY) ? 'd' : 'D',
-                               (aconf->flags & CONF_FLAGS_TEMPORARY) ? 
-                                (long) ((aconf->hold - rb_current_time()) / 60) : 0L, 
-                               aconf->host, aconf->passwd);
+                               (aconf->flags & CONF_FLAGS_TEMPORARY) ?
+                                (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
+                               phost, reasonbuf);
 
                        return 0;
                }
@@ -144,14 +149,14 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
                        sendto_one(source_p, form_str(RPL_TESTLINE),
                                        me.name, source_p->name,
                                        '!',
-                                       duration / 60,
+                                       duration / 60L,
                                        host, "Reject cache");
                if(aconf == NULL &&
                                (duration = is_throttle_ip((struct sockaddr *)&ip)))
                        sendto_one(source_p, form_str(RPL_TESTLINE),
                                        me.name, source_p->name,
                                        '!',
-                                       duration / 60,
+                                       duration / 60L,
                                        host, "Throttled");
        }
 
@@ -170,7 +175,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
                                (type != HM_HOST) ? (struct sockaddr *)&ip : NULL,
                                (type != HM_HOST) ? (
 #ifdef RB_IPV6
-                                (type == HM_IPV6) ? AF_INET6 : 
+                                (type == HM_IPV6) ? AF_INET6 :
 #endif
                                  AF_INET) : 0, NULL)))
        {
@@ -178,17 +183,15 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 
                if(aconf->status & CONF_KILL)
                {
-                       char *puser, *phost, *reason, *operreason;
-                       char reasonbuf[BUFSIZE];
                        get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
-                       rb_snprintf(buf, sizeof(buf), "%s@%s", 
+                       snprintf(buf, sizeof(buf), "%s@%s",
                                        puser, phost);
-                       rb_snprintf(reasonbuf, sizeof(reasonbuf), "%s%s%s", reason,
+                       snprintf(reasonbuf, sizeof(reasonbuf), "%s%s%s", reason,
                                operreason ? "|" : "", operreason ? operreason : "");
                        sendto_one(source_p, form_str(RPL_TESTLINE),
                                me.name, source_p->name,
                                (aconf->flags & CONF_FLAGS_TEMPORARY) ? 'k' : 'K',
-                               (aconf->flags & CONF_FLAGS_TEMPORARY) ? 
+                               (aconf->flags & CONF_FLAGS_TEMPORARY) ?
                                 (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
                                buf, reasonbuf);
                        return 0;
@@ -202,7 +205,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
                                me.name, source_p->name,
                                resv_p->hold ? 'q' : 'Q',
                                resv_p->hold ? (long) ((resv_p->hold - rb_current_time()) / 60) : 0L,
-                               resv_p->name, resv_p->passwd);
+                               resv_p->host, resv_p->passwd);
 
                /* this is a false positive, so make sure it isn't counted in stats q
                 * --nenolod
@@ -215,7 +218,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
        if(aconf && aconf->status & CONF_CLIENT)
        {
                sendto_one_numeric(source_p, RPL_STATSILINE, form_str(RPL_STATSILINE),
-                               aconf->name, EmptyString(aconf->spasswd) ? "<NULL>" : aconf->spasswd,
+                               aconf->info.name, EmptyString(aconf->spasswd) ? "<NULL>" : aconf->spasswd,
                                show_iline_prefix(source_p, aconf, aconf->user),
                                aconf->host, aconf->port, aconf->className);
                return 0;
@@ -228,7 +231,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 }
 
 static int
-mo_testgecos(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_testgecos(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct ConfItem *aconf;
 
@@ -243,6 +246,6 @@ mo_testgecos(struct Client *client_p, struct Client *source_p, int parc, const c
                        me.name, source_p->name,
                        aconf->hold ? 'x' : 'X',
                        aconf->hold ? (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
-                       aconf->name, aconf->passwd);
+                       aconf->host, aconf->passwd);
        return 0;
 }