ircd/authd: remove rb_free no longer needed.

[solanum.git] / extensions / m_webirc.c

diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index 5985eec7ab7b2368f7038a79468f7fddc3ede6b8..99f66b5b6fca20198ae4253ddd762bd5dcba2802 100644 (file)
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -53,7 +53,9 @@
 #include "s_conf.h"
 #include "reject.h"
 
-static int mr_webirc(struct MsgBuf *msgbuf_p, struct Client *, struct Client *, int, const char **);
+static const char webirc_desc[] = "Adds support for the WebIRC system";
+
+static void mr_webirc(struct MsgBuf *msgbuf_p, struct Client *, struct Client *, int, const char **);
 
 struct Message webirc_msgtab = {
        "WEBIRC", 0, 0, 0, 0,
@@ -61,7 +63,8 @@ struct Message webirc_msgtab = {
 };
 
 mapi_clist_av1 webirc_clist[] = { &webirc_msgtab, NULL };
-DECLARE_MODULE_AV1(webirc, NULL, NULL, webirc_clist, NULL, NULL, "$Revision: 20702 $");
+
+DECLARE_MODULE_AV2(webirc, NULL, NULL, webirc_clist, NULL, NULL, NULL, NULL, webirc_desc);
 
 /*
  * mr_webirc - webirc message handler
@@ -70,7 +73,7 @@ DECLARE_MODULE_AV1(webirc, NULL, NULL, webirc_clist, NULL, NULL, "$Revision: 207
  *     parv[3] = fake hostname
  *     parv[4] = fake ip
  */
-static int
+static void
 mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct ConfItem *aconf;
@@ -82,26 +85,26 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
                        sizeof(source_p->sockhost))
        {
                sendto_one(source_p, "NOTICE * :Invalid IP");
-               return 0;
+               return;
        }
 
        aconf = find_address_conf(client_p->host, client_p->sockhost,
                                IsGotId(client_p) ? client_p->username : "webirc",
                                IsGotId(client_p) ? client_p->username : "webirc",
                                (struct sockaddr *) &client_p->localClient->ip,
-                               client_p->localClient->ip.ss_family, NULL);
+                               GET_SS_FAMILY(&client_p->localClient->ip), NULL);
        if (aconf == NULL || !(aconf->status & CONF_CLIENT))
-               return 0;
+               return;
        if (!IsConfDoSpoofIp(aconf) || irccmp(aconf->info.name, "webirc."))
        {
                /* XXX */
                sendto_one(source_p, "NOTICE * :Not a CGI:IRC auth block");
-               return 0;
+               return;
        }
        if (EmptyString(aconf->passwd))
        {
                sendto_one(source_p, "NOTICE * :CGI:IRC auth blocks must have a password");
-               return 0;
+               return;
        }
 
        if (EmptyString(parv[1]))
@@ -114,13 +117,13 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
        if (encr == NULL || strcmp(encr, aconf->passwd))
        {
                sendto_one(source_p, "NOTICE * :CGI:IRC password incorrect");
-               return 0;
+               return;
        }
 
        if (rb_inet_pton_sock(parv[4], (struct sockaddr *)&addr) <= 0)
        {
                sendto_one(source_p, "NOTICE * :Invalid IP");
-               return 0;
+               return;
        }
 
        if (*parv[4] == ':')
@@ -142,15 +145,14 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 
        /* Check dlines now, klines will be checked on registration */
        if((aconf = find_dline((struct sockaddr *)&source_p->localClient->ip,
-                              source_p->localClient->ip.ss_family)))
+                              GET_SS_FAMILY(&source_p->localClient->ip))))
        {
                if(!(aconf->status & CONF_EXEMPTDLINE))
                {
                        exit_client(client_p, source_p, &me, "D-lined");
-                       return 0;
+                       return;
                }
        }
 
        sendto_one(source_p, "NOTICE * :CGI:IRC host/IP set to %s %s", parv[3], parv[4]);
-       return 0;
 }