burst_TS6(): assume users have a UID

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

diff --git a/modules/m_kline.c b/modules/m_kline.c
index c455700299aa878a391135c5ca35f2821faadd76..2f888237325da5dfc3bfca6d780f42ba25133624 100644 (file)
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -492,7 +492,7 @@ static void
 apply_kline(struct Client *source_p, struct ConfItem *aconf,
            const char *reason, const char *oper_reason, const char *current_date)
 {
-       add_conf_by_address(aconf->host, CONF_KILL, aconf->user, aconf);
+       add_conf_by_address(aconf->host, CONF_KILL, aconf->user, NULL, aconf);
        write_confitem(KLINE_TYPE, source_p, aconf->user, aconf->host,
                       reason, oper_reason, current_date, 0);
 }
@@ -589,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;
@@ -715,7 +716,7 @@ already_placed_kline(struct Client *source_p, const char *luser, const char *lho
                else
                        piphost = NULL;
 
-               aconf = find_conf_by_address(lhost, NULL, NULL, (struct sockaddr *)piphost, CONF_KILL, t, luser);
+               aconf = find_conf_by_address(lhost, NULL, NULL, (struct sockaddr *)piphost, CONF_KILL, t, luser, NULL);
                if (aconf != NULL)
                {
                        /* The above was really a lookup of a single IP,