ircd: implement EXTENDCHANS, based on ircd-seven (with some improvements from chatircd)

[solanum.git] / modules / m_testline.c

diff --git a/modules/m_testline.c b/modules/m_testline.c
index 46985bb33c5ed4aae7047077e65f22ed5d5d373f..c74edd639ebe1cd758c5a07457e59d4a8fbde958 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
  *
@@ -46,11 +46,11 @@ static int mo_testgecos(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}}
+       {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}}
+       {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_testgecos, 2}}
 };
 
 mapi_clist_av1 testline_clist[] = { &testline_msgtab, &testgecos_msgtab, NULL };
@@ -120,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)
@@ -137,8 +137,8 @@ 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,
                                (aconf->flags & CONF_FLAGS_TEMPORARY) ? 'd' : 'D',
-                               (aconf->flags & CONF_FLAGS_TEMPORARY) ? 
-                                (long) ((aconf->hold - rb_current_time()) / 60) : 0L, 
+                               (aconf->flags & CONF_FLAGS_TEMPORARY) ?
+                                (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
                                phost, reasonbuf);
 
                        return 0;
@@ -149,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");
        }
 
@@ -175,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)))
        {
@@ -184,14 +184,14 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
                if(aconf->status & CONF_KILL)
                {
                        get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
-                       rb_snprintf(buf, sizeof(buf), "%s@%s", 
+                       rb_snprintf(buf, sizeof(buf), "%s@%s",
                                        puser, phost);
                        rb_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;
@@ -218,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;