BOPM/TCM do not need the ability to global kill, so remove it from server_bot

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

diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index 36a83894319b3c6bf029542e5d7177b116a27463..1b5748e56cdcd4c0d286201be882427da226661b 100644 (file)
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -32,10 +32,9 @@
  * };
  * Possible flags:
  *   encrypted - password is encrypted (recommended)
- *   kline_exempt - k/g lines on the cgiirc ip are ignored
- *   gline_exempt - glines on the cgiirc ip are ignored
+ *   kline_exempt - klines on the cgiirc ip are ignored
  * dlines are checked on the cgiirc ip (of course).
- * k/d/g/x lines, auth blocks, user limits, etc are checked using the
+ * k/d/x lines, auth blocks, user limits, etc are checked using the
  * real host/ip.
  * The password should be specified unencrypted in webirc_password in
  * cgiirc.config
@@ -43,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 */
@@ -90,7 +89,7 @@ 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."))
@@ -108,7 +107,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];
 
@@ -119,17 +118,16 @@ 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, k/glines will be checked on registration */
+       /* 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)))
        {