summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO3
-rw-r--r--src/protocol/inspircd12.cpp3
2 files changed, 5 insertions, 1 deletions
diff --git a/TODO b/TODO
index 61a62e957..18dae68a9 100644
--- a/TODO
+++ b/TODO
@@ -27,7 +27,7 @@ Legend:
[x] Fix anope_cmd_* stuff to just use IRCdProto methods directly
[ ] Fix command parsing (TBD)
[x] SendClientIntroduction should take a UID param, rather than generating one(?)
- [ ] Fix permanent channels (+P) stuff. Currently it tries to parse modes as users, but that's wrong.. this may rely on killing do_sjoin().
+ [x] Fix permanent channels (+P) stuff.
[x] Remove UnRestrictSAdmin, UseTS6, UseSVSHOLD
[?] Remote identification (1.9.1? will this break stuff?)
[?] Immediate protection enforcement
@@ -49,6 +49,7 @@ Legend:
[ ] HelpServ must die (1.9.1?)
[ ] Command parser cleanup
[ ] mod_current_buffer needs to go away and be replaced by a proper parser. Commands should then indicate how they want the buffer split.
+[ ] Fix permanent channels support properly. This will require removing do_sjoin().
1.9.2
-----
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index 4d5a314e0..fd48fb924 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -826,6 +826,9 @@ int anope_event_fjoin(const char *source, int ac, const char **av)
*nicklist = '\0';
*prefixandnick = '\0';
+ if (ac <= 4)
+ return MOD_CONT;
+
curnick = myStrGetToken(av[ac - 1], ' ', curtoken);
while (curnick != NULL)
{