msg: remove last vestiges of the fakelag system. charybdis has never supported fakelag.

[solanum.git] / modules / m_dline.c

diff --git a/modules/m_dline.c b/modules/m_dline.c
index bb928ac4c92a02686dccfdaf6e6bf15b1c7632bd..59e0f88a332634f97c734f498f4e59a6d1894a36 100644 (file)
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -45,37 +45,36 @@
 #include "bandbi.h"
 #include "operhash.h"
 
-static int mo_dline(struct Client *, struct Client *, int, const char **);
-static int me_dline(struct Client *, struct Client *, int, const char **);
-static int mo_undline(struct Client *, struct Client *, int, const char **);
-static int me_undline(struct Client *, struct Client *, int, const char **);
+static int mo_dline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int me_dline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int mo_undline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int me_undline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message dline_msgtab = {
-       "DLINE", 0, 0, 0, MFLG_SLOW,
-       {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_dline, 3}, {mo_dline, 2}}
+       "DLINE", 0, 0, 0, 0,
+       {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_dline, 4}, {mo_dline, 2}}
 };
 
 struct Message undline_msgtab = {
-       "UNDLINE", 0, 0, 0, MFLG_SLOW,
-       {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_undline, 1}, {mo_undline, 2}}
+       "UNDLINE", 0, 0, 0, 0,
+       {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_undline, 2}, {mo_undline, 2}}
 };
 
 mapi_clist_av1 dline_clist[] = { &dline_msgtab, &undline_msgtab, NULL };
 
 DECLARE_MODULE_AV1(dline, NULL, NULL, dline_clist, NULL, NULL, "$Revision$");
 
-static int valid_comment(char *comment);
 static int remove_temp_dline(struct ConfItem *);
 static int apply_dline(struct Client *, const char *, int, char *);
 static int apply_undline(struct Client *, const char *);
 
 /* mo_dline()
- * 
+ *
  *   parv[1] - dline to add
  *   parv[2] - reason
  */
 static int
-mo_dline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_dline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        char def[] = "No Reason";
        const char *dlhost;
@@ -96,9 +95,15 @@ mo_dline(struct Client *client_p, struct Client *source_p, int parc, const char
 
        dlhost = parv[loc];
        rb_strlcpy(cidr_form_host, dlhost, sizeof(cidr_form_host));
-
        loc++;
 
+       /* would break the protocol */
+       if (*dlhost == ':')
+       {
+               sendto_one_notice(source_p, ":Invalid D-Line");
+               return 0;
+       }
+
        if(parc >= loc + 2 && !irccmp(parv[loc], "ON"))
        {
                if(!IsOperRemoteBan(source_p))
@@ -137,7 +142,7 @@ mo_dline(struct Client *client_p, struct Client *source_p, int parc, const char
  *      parv[1] = dline to remove
  */
 static int
-mo_undline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_undline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        const char *cidr;
        const char *target_server = NULL;
@@ -173,7 +178,7 @@ mo_undline(struct Client *client_p, struct Client *source_p, int parc, const cha
 }
 
 static int
-me_dline(struct Client *client_p, struct Client *source_p, int parc, const char **parv)
+me_dline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char **parv)
 {
        int tdline_time = atoi(parv[1]);
        /* Since this is coming over a server link, assume that the originating
@@ -195,7 +200,7 @@ me_dline(struct Client *client_p, struct Client *source_p, int parc, const char
 }
 
 static int
-me_undline(struct Client *client_p, struct Client *source_p, int parc, const char **parv)
+me_undline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char **parv)
 {
        if(!IsPerson(source_p))
                return 0;
@@ -218,7 +223,7 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char *
        int t = AF_INET, ty, b;
        const char *creason;
 
-       ty = parse_netmask(dlhost, (struct sockaddr *) &daddr, &b);
+       ty = parse_netmask(dlhost, &daddr, &b);
        if(ty == HM_HOST)
        {
                sendto_one(source_p, ":%s NOTICE %s :Invalid D-Line", me.name, source_p->name);
@@ -251,14 +256,6 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char *
                }
        }
 
-       if(!valid_comment(reason))
-       {
-               sendto_one(source_p,
-                          ":%s NOTICE %s :Invalid character '\"' in comment",
-                          me.name, source_p->name);
-               return 0;
-       }
-
        if(ConfigFileEntry.non_redundant_klines)
        {
                if((aconf = find_dline((struct sockaddr *) &daddr, t)) != NULL)
@@ -292,6 +289,9 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char *
        aconf->passwd = rb_strdup(reason);
        aconf->info.oper = operhash_add(get_oper_name(source_p));
 
+       if(strlen(reason) > BANREASONLEN)
+               reason[BANREASONLEN] = '\0';
+
        /* Look for an oper reason */
        if((oper_reason = strchr(reason, '|')) != NULL)
        {
@@ -403,25 +403,6 @@ apply_undline(struct Client *source_p, const char *cidr)
        return 0;
 }
 
-/*
- * valid_comment
- * inputs      - pointer to client
- *              - pointer to comment
- * output       - 0 if no valid comment, 1 if valid
- * side effects - NONE
- */
-static int
-valid_comment(char *comment)
-{
-       if(strchr(comment, '"'))
-               return 0;
-
-       if(strlen(comment) > BANREASONLEN)
-               comment[BANREASONLEN] = '\0';
-
-       return 1;
-}
-
 /* remove_temp_dline()
  *
  * inputs       - confitem to undline