summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2010-05-23 20:50:06 +0000
committerAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2010-05-23 20:50:06 +0000
commit15c66af4e50ec2096268b858a68a4f51d086a5d9 (patch)
tree114fe6e4dd6b9c21a34bb86cd26374575e1b72e3
parent6661c3ebdbd144ab5fb0bf5e85007e2da9e1a5b5 (diff)
Backport of r2980 - Fixed bug #1167 - Fixed SQUITing juped servers on InspIRCd 1.2
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2981 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--Changes1
-rw-r--r--src/protocol/inspircd12.c9
-rw-r--r--version.log3
3 files changed, 12 insertions, 1 deletions
diff --git a/Changes b/Changes
index c72090715..da76df863 100644
--- a/Changes
+++ b/Changes
@@ -12,6 +12,7 @@ Anope Version 1.8 - SVN
4/19 F Fixed ns_info to show nick expire times to opers not only admins [ #00]
4/28 F Fixed a bug that could make some nick requests disappear [ #00]
5/18 F Fixed English and grammar in e-mail messages [ #00]
+5/23 F Fixed SQUITing juped servers on InspIRCd 1.2 [#1165]
Anope Version 1.8.4
-------------------
diff --git a/src/protocol/inspircd12.c b/src/protocol/inspircd12.c
index e887db7e0..78eda0106 100644
--- a/src/protocol/inspircd12.c
+++ b/src/protocol/inspircd12.c
@@ -1449,6 +1449,15 @@ int anope_event_rsquit(char *source, int ac, char **av)
if (ac < 1 || ac > 3)
return MOD_CONT;
+ /* On InspIRCd we must send a SQUIT when we receive RSQUIT for a server we have juped */
+ Server *s = findserver(servlist, av[0]);
+ if (!s)
+ s = findserver_uid(servlist, av[0]);
+ if (s && s->flags & SERVER_JUPED)
+ {
+ send_cmd(TS6SID, "SQUIT %s :%s", s->suid, ac > 1 ? av[1] : "");
+ }
+
do_squit(source, ac, av);
return MOD_CONT;
}
diff --git a/version.log b/version.log
index 9501af3f8..042409e4d 100644
--- a/version.log
+++ b/version.log
@@ -9,9 +9,10 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="4"
VERSION_EXTRA="-svn"
-VERSION_BUILD="2978"
+VERSION_BUILD="2981"
# $Log$ # Changes since the 1.8.4 Release
+#Revision 2981 - Fixed SQUITing juped servers on InspIRCd 1.2
#Revision 2978 - Added param to EVENT_CHANGE_NICK for old nickname
#Revision 2976 - Added internal events called when nick is ghosted and when nick is recovered
#Revision 2969 - Extension to r2952 adding logging for BS BOT