summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2010-01-15 19:29:39 +0000
committerAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2010-01-15 19:29:39 +0000
commit5559f91fae373d93c2ceead1f8b90131efac6a8f (patch)
treef82f61c32d6d806a43548f6cc2ce910509a7d066
parent3dd71f207d8fb37ea27846a1c0a711b7ad46a318 (diff)
Fixed bug #1135 - Don't allow BotServ to kick and ban ULined clients
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2761 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--Changes1
-rw-r--r--src/botserv.c8
-rw-r--r--version.log3
3 files changed, 11 insertions, 1 deletions
diff --git a/Changes b/Changes
index 4851d5a6d..97c323c7d 100644
--- a/Changes
+++ b/Changes
@@ -22,6 +22,7 @@ Provided by Anope Dev. <team@anope.org> - 2009
11/25 F Fixed a bug in CLEAR OPS causing incorrect mode removal. [#1114]
12/01 F Fixed tracking of users host when they disable their vhost [#1106]
12/20 F Fixed nickcores access list being loaded from SQL with RDB [ #00]
+1/15 F Fixed BotServ from kicking and banning ULined clients [#1135]
Provided by Han` <Han@mefalcon.org> - 2009
07/28 F Updated german language file. [ #00]
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)
diff --git a/version.log b/version.log
index d07361404..6d42d353d 100644
--- a/version.log
+++ b/version.log
@@ -9,9 +9,10 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="2"
VERSION_EXTRA="-svn"
-VERSION_BUILD="2752"
+VERSION_BUILD="2761"
# $Log$ # Changes since 1.8.2 Release
+#Revision 2761 - Don't kick or ban ulined clients for flood etc
#Revision 2747 - Fixed a reply in bs_bot to be correct when you use an invalid ident
#Revision 2743 - Fix a crash introduced in r2679 cause by is_on_access messing up the users host buffers
#Revision 2735 - Added two missing language strings to de.l and ru.l