Allow /ojoin !#channel/%#channel, if admin/halfop are enabled.

[irc/rqf/shadowircd.git] / modules / m_ison.c

diff --git a/modules/m_ison.c b/modules/m_ison.c
index cfb15f303662df5aee50fa0238fc2431dca3acdd..d918b7bf22693b2ceaa2a5a8307d4dfc49f360ff 100644 (file)
--- a/modules/m_ison.c
+++ b/modules/m_ison.c
@@ -26,8 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
@@ -77,7 +76,7 @@ m_ison(struct Client *client_p, struct Client *source_p, int parc, const char *p
        current_insert_point2 = buf2;
        *buf2 = '\0';
 
-       ircsprintf(buf, form_str(RPL_ISON), me.name, source_p->name);
+       rb_sprintf(buf, form_str(RPL_ISON), me.name, source_p->name);
        len = strlen(buf);
        current_insert_point = buf + len;
 
@@ -87,7 +86,7 @@ m_ison(struct Client *client_p, struct Client *source_p, int parc, const char *p
        for (i = 1; i < parc; i++)
        {
                char *cs = LOCAL_COPY(parv[i]);
-               for (nick = strtoken(&p, cs, " "); nick; nick = strtoken(&p, NULL, " "))
+               for (nick = rb_strtok_r(cs, " ", &p); nick; nick = rb_strtok_r(NULL, " ", &p))
                {
                        target_p = find_named_client(nick);