summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/botserv.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/botserv.c b/src/botserv.c
index b73961c59..33a5888a5 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -845,6 +845,10 @@ static void check_ban(ChannelInfo * ci, User * u, int ttbtype)
if (!bd)
return;
+ /* Bug #1135 - Don't kick/ban ULined clients */
+ if (is_ulined(u->server->name))
+ return;
+
bd->ttb[ttbtype]++;
if (bd->ttb[ttbtype] == ci->ttb[ttbtype]) {
char *av[4];
@@ -894,6 +898,10 @@ static void bot_kick(ChannelInfo * ci, User * u, int message, ...)
if (!ci || !ci->bi || !ci->c || !u)
return;
+ /* Bug #1135 - Don't kick ULined clients */
+ if (is_ulined(u->server->name))
+ return;
+
va_start(args, message);
fmt = getstring(u->na, message);
if (!fmt)