sasl_usercloak: make the magic string more specific

[solanum.git] / modules / m_testline.c

diff --git a/modules/m_testline.c b/modules/m_testline.c
index 81358ae4a4e2ada7767407a498ac0b6c7a692e62..7aa27a8862e0ed0ccaa7fc2c5c4a751f847c00a5 100644 (file)
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -39,10 +39,11 @@
 #include "s_newconf.h"
 #include "reject.h"
 
-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 **);
 static const char testline_desc[] = "Provides the ability to test I/K/D/X lines and RESVs";
 
+static void mo_testline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mo_testgecos(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
 struct Message testline_msgtab = {
        "TESTLINE", 0, 0, 0, 0,
        {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_testline, 2}}
@@ -53,9 +54,10 @@ struct Message testgecos_msgtab = {
 };
 
 mapi_clist_av1 testline_clist[] = { &testline_msgtab, &testgecos_msgtab, NULL };
+
 DECLARE_MODULE_AV2(testline, NULL, NULL, testline_clist, NULL, NULL, NULL, NULL, testline_desc);
 
-static int
+static void
 mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct ConfItem *aconf;
@@ -93,7 +95,7 @@ mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
                else
                        sendto_one(source_p, form_str(RPL_NOTESTLINE),
                                        me.name, source_p->name, parv[1]);
-               return 0;
+               return;
        }
 
        if((p = strchr(mask, '!')))
@@ -103,7 +105,7 @@ mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
                mask = p;
 
                if(EmptyString(mask))
-                       return 0;
+                       return;
        }
 
        if((p = strchr(mask, '@')))
@@ -113,7 +115,7 @@ mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
                host = p;
 
                if(EmptyString(host))
-                       return 0;
+                       return;
        }
        else
                host = mask;
@@ -121,11 +123,9 @@ mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
        /* parses as an IP, check for a dline */
        if((type = parse_netmask(host, &ip, &host_mask)) != HM_HOST)
        {
-#ifdef RB_IPV6
                if(type == HM_IPV6)
                        aconf = find_dline((struct sockaddr *)&ip, AF_INET6);
                else
-#endif
                        aconf = find_dline((struct sockaddr *)&ip, AF_INET);
 
                if(aconf && aconf->status & CONF_DLINE)
@@ -140,7 +140,7 @@ mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
                                 (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
                                phost, reasonbuf);
 
-                       return 0;
+                       return;
                }
                /* Otherwise, aconf is an exempt{} */
                if(aconf == NULL &&
@@ -173,9 +173,7 @@ mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
        if((aconf = find_address_conf(host, NULL, user_trunc, notildeuser_trunc,
                                (type != HM_HOST) ? (struct sockaddr *)&ip : NULL,
                                (type != HM_HOST) ? (
-#ifdef RB_IPV6
                                 (type == HM_IPV6) ? AF_INET6 :
-#endif
                                  AF_INET) : 0, NULL)))
        {
                static char buf[HOSTLEN+USERLEN+2];
@@ -193,7 +191,7 @@ mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
                                (aconf->flags & CONF_FLAGS_TEMPORARY) ?
                                 (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
                                buf, reasonbuf);
-                       return 0;
+                       return;
                }
        }
 
@@ -210,7 +208,7 @@ mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
                 * --nenolod
                 */
                resv_p->port--;
-               return 0;
+               return;
        }
 
        /* no matching resv, we can print the I: if it exists */
@@ -220,16 +218,15 @@ mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
                                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;
+               return;
        }
 
        /* nothing matches.. */
        sendto_one(source_p, form_str(RPL_NOTESTLINE),
                        me.name, source_p->name, parv[1]);
-       return 0;
 }
 
-static int
+static void
 mo_testgecos(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct ConfItem *aconf;
@@ -238,7 +235,7 @@ mo_testgecos(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *so
        {
                sendto_one(source_p, form_str(RPL_NOTESTLINE),
                                me.name, source_p->name, parv[1]);
-               return 0;
+               return;
        }
 
        sendto_one(source_p, form_str(RPL_TESTLINE),
@@ -246,5 +243,4 @@ mo_testgecos(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *so
                        aconf->hold ? 'x' : 'X',
                        aconf->hold ? (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
                        aconf->host, aconf->passwd);
-       return 0;
 }