Generating cflags bufs dynamically: one for RPL_MYINFO and one for

[irc/rqf/shadowircd.git] / modules / m_kline.c

diff --git a/modules/m_kline.c b/modules/m_kline.c
index 29fba0d60975f285a3e6fce1d20a75dc5efff2db..fd9a20592c85453e281acb53c3b167afa1189a09 100644 (file)
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -29,14 +29,13 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 #include "hash.h"
 #include "s_serv.h"
@@ -174,7 +173,7 @@ mo_kline(struct Client *client_p, struct Client *source_p,
        if(already_placed_kline(source_p, user, host, tkline_time))
                return 0;
 
-       set_time();
+       rb_set_time();
        current_date = smalldate();
        aconf = make_conf();
        aconf->status = CONF_KILL;
@@ -554,11 +553,11 @@ find_user_host(struct Client *source_p, const char *userhost, char *luser, char
        {
                *(hostp++) = '\0';      /* short and squat */
                if(*userhost)
-                       strlcpy(luser, userhost, USERLEN + 1);  /* here is my user */
+                       rb_strlcpy(luser, userhost, USERLEN + 1);       /* here is my user */
                else
                        strcpy(luser, "*");
                if(*hostp)
-                       strlcpy(lhost, hostp, HOSTLEN + 1);     /* here is my host */
+                       rb_strlcpy(lhost, hostp, HOSTLEN + 1);  /* here is my host */
                else
                        strcpy(lhost, "*");
                }
@@ -568,11 +567,14 @@ find_user_host(struct Client *source_p, const char *userhost, char *luser, char
                 * its a nick, which support was removed for.
                 */
                if(strchr(userhost, '.') == NULL && strchr(userhost, ':') == NULL)
+               {
+                       sendto_one_notice(source_p, ":K-Line must be a user@host or host");
                        return 0;
+               }
 
                luser[0] = '*'; /* no @ found, assume its *@somehost */
                luser[1] = '\0';
-               strlcpy(lhost, userhost, HOSTLEN + 1);
+               rb_strlcpy(lhost, userhost, HOSTLEN + 1);
        }
 
        return 1;
@@ -587,8 +589,9 @@ find_user_host(struct Client *source_p, const char *userhost, char *luser, char
 static int
 valid_user_host(struct Client *source_p, const char *luser, const char *lhost)
 {
-       /* # is invalid, as is '!' (n!u@h kline) */
-       if(strchr(lhost, '#') || strchr(luser, '#') || strchr(luser, '!'))
+       /* # is invalid, as are '!' (n!u@h kline) and '@' (u@@h kline) */
+       if(strchr(lhost, '#') || strchr(luser, '#') || strchr(luser, '!') ||
+                       strchr(lhost, '@'))
        {
                sendto_one_notice(source_p, ":Invalid K-Line");
                return 0;
@@ -701,7 +704,7 @@ already_placed_kline(struct Client *source_p, const char *luser, const char *lho
                bits = 0;
                if((t = parse_netmask(lhost, (struct sockaddr *)&iphost, &bits)) != HM_HOST)
                {
-#ifdef IPV6
+#ifdef RB_IPV6
                        if(t == HM_IPV6)
                                t = AF_INET6;
                        else