m_info: Correct description of general::client_exit like in example confs.

[solanum.git] / modules / m_dline.c

diff --git a/modules/m_dline.c b/modules/m_dline.c
index 5ac171b730f5fda4d0c79f12761ea39a4cfcd981..1330a123698aca5360dfe5ec27cb0df6125f424e 100644 (file)
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -43,6 +43,7 @@
 #include "parse.h"
 #include "modules.h"
 #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 **);
@@ -63,7 +64,6 @@ 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 *);
@@ -95,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))
@@ -213,8 +219,6 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char *
 {
        struct ConfItem *aconf;
        char *oper_reason;
-       char dlbuffer[IRCD_BUFSIZE];
-       const char *current_date;
        struct rb_sockaddr_storage daddr;
        int t = AF_INET, ty, b;
        const char *creason;
@@ -252,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)
@@ -285,11 +281,16 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char *
        }
 
        rb_set_time();
-       current_date = smalldate();
 
        aconf = make_conf();
        aconf->status = CONF_DLINE;
+       aconf->created = rb_current_time();
        aconf->host = rb_strdup(dlhost);
+       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)
@@ -303,10 +304,6 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char *
 
        if(tdline_time > 0)
        {
-               rb_snprintf(dlbuffer, sizeof(dlbuffer),
-                           "Temporary D-line %d min. - %s (%s)",
-                           (int) (tdline_time / 60), reason, current_date);
-               aconf->passwd = rb_strdup(dlbuffer);
                aconf->hold = rb_current_time() + tdline_time;
                add_temp_dline(aconf);
 
@@ -335,8 +332,6 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char *
        }
        else
        {
-               rb_snprintf(dlbuffer, sizeof(dlbuffer), "%s (%s)", reason, current_date);
-               aconf->passwd = rb_strdup(dlbuffer);
                add_conf_by_address(aconf->host, CONF_DLINE, NULL, NULL, aconf);
 
                bandb_add(BANDB_DLINE, source_p, aconf->host, NULL,
@@ -408,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