Add some ircd-seven love to CREDITS.

[irc/rqf/shadowircd.git] / extensions / m_webirc.c

diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index 24fe2978e461715c854696207f59d4bd9e9386f9..1ddb63496a85b3190da818fe07013698a388b8a4 100644 (file)
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -27,7 +27,7 @@
  * auth {
  *   user = "webirc@<cgiirc ip>"; # if identd used, put ident username instead
  *   password = "<password>"; # encryption possible
- *   spoof = "webirc."
+ *   spoof = "webirc.";
  *   class = "users";
  * };
  * Possible flags:
@@ -42,7 +42,7 @@
 
 #include "stdinc.h"
 #include "client.h"            /* client struct */
-#include "irc_string.h"
+#include "match.h"
 #include "hostmask.h"
 #include "send.h"              /* sendto_one */
 #include "numeric.h"           /* ERR_xxx */
@@ -67,7 +67,6 @@ DECLARE_MODULE_AV1(webirc, NULL, NULL, webirc_clist, NULL, NULL, "$Revision: 207
 
 /*
  * mr_webirc - webirc message handler
- *      parv[0] = sender prefix
  *      parv[1] = password
  *      parv[2] = fake username (we ignore this)
  *     parv[3] = fake hostname 
@@ -89,10 +88,10 @@ mr_webirc(struct Client *client_p, struct Client *source_p, int parc, const char
                                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);
+                               client_p->localClient->ip.ss_family, NULL);
        if (aconf == NULL || !(aconf->status & CONF_CLIENT))
                return 0;
-       if (!IsConfDoSpoofIp(aconf) || irccmp(aconf->name, "webirc."))
+       if (!IsConfDoSpoofIp(aconf) || irccmp(aconf->info.name, "webirc."))
        {
                /* XXX */
                sendto_one(source_p, "NOTICE * :Not a CGI:IRC auth block");
@@ -107,7 +106,7 @@ mr_webirc(struct Client *client_p, struct Client *source_p, int parc, const char
        if (EmptyString(parv[1]))
                encr = "";
        else if (IsConfEncrypted(aconf))
-               encr = crypt(parv[1], aconf->passwd);
+               encr = rb_crypt(parv[1], aconf->passwd);
        else
                encr = parv[1];
 
@@ -118,15 +117,14 @@ mr_webirc(struct Client *client_p, struct Client *source_p, int parc, const char
        }
 
 
-       strlcpy(source_p->sockhost, parv[4], sizeof(source_p->sockhost));
+       rb_strlcpy(source_p->sockhost, parv[4], sizeof(source_p->sockhost));
 
        if(strlen(parv[3]) <= HOSTLEN)
-               strlcpy(source_p->host, parv[3], sizeof(source_p->host));
+               rb_strlcpy(source_p->host, parv[3], sizeof(source_p->host));
        else
-               strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
+               rb_strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
        
-       del_unknown_ip(source_p);
-       inetpton_sock(parv[4], (struct sockaddr *)&source_p->localClient->ip);
+       rb_inet_pton_sock(parv[4], (struct sockaddr *)&source_p->localClient->ip);
 
        /* Check dlines now, klines will be checked on registration */
        if((aconf = find_dline((struct sockaddr *)&source_p->localClient->ip,