summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/protocol/inspircd12.c5
-rw-r--r--version.log3
2 files changed, 6 insertions, 2 deletions
diff --git a/src/protocol/inspircd12.c b/src/protocol/inspircd12.c
index c1b08711a..221ec928a 100644
--- a/src/protocol/inspircd12.c
+++ b/src/protocol/inspircd12.c
@@ -848,11 +848,14 @@ endnick:
newav[0] = av[1]; /* timestamp */
newav[1] = av[0]; /* channel name */
- for (i = 2; i != ac; i++)
+ for (i = 2; i < ac - 1; i++)
newav[i] = av[i]; /* Modes */
newav[i] = nicklist; /* Nicknames */
i++;
+ if (debug)
+ alog("debug: Final FJOIN string: %s", merge_args(i, newav));
+
do_sjoin(source, i, newav);
return MOD_CONT;
}
diff --git a/version.log b/version.log
index c9acc1c9e..63ee2eada 100644
--- a/version.log
+++ b/version.log
@@ -8,9 +8,10 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="4"
VERSION_EXTRA="-git"
-VERSION_BUILD="3028"
+VERSION_BUILD="3029"
# $Log$ # Changes since the 1.8.4 Release
+#Revision 3029 - Fixed InspIRCd1.2 protocol module passing invalid users in the SJOIN string which made internal debug messages confusing/wrong
#Revision 3028 - We tell everyone to use 127.0.0.1 instead of localhost, so we should too.
#Revision 3027 - Kill users using our nicks when on InspIRCd 1.2
#Revision 3026 - Updated german language file