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

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

diff --git a/modules/m_services.c b/modules/m_services.c
index af0e9c30d93790a4c228fdef0f40a3f1adbac287..c1536e3e20579509ef274cbf8ad726de687cd59e 100644 (file)
--- a/modules/m_services.c
+++ b/modules/m_services.c
@@ -45,7 +45,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "whowas.h"
 #include "monitor.h"
 
@@ -106,7 +105,7 @@ me_su(struct Client *client_p, struct Client *source_p,
        if(EmptyString(parv[2]))
                target_p->user->suser[0] = '\0';
        else
-               strlcpy(target_p->user->suser, parv[2], sizeof(target_p->user->suser));
+               rb_strlcpy(target_p->user->suser, parv[2], sizeof(target_p->user->suser));
 
        invalidate_bancache_user(target_p);
 
@@ -120,7 +119,7 @@ me_login(struct Client *client_p, struct Client *source_p,
        if(!IsPerson(source_p))
                return 0;
 
-       strlcpy(source_p->user->suser, parv[1], sizeof(source_p->user->suser));
+       rb_strlcpy(source_p->user->suser, parv[1], sizeof(source_p->user->suser));
        return 0;
 }
 
@@ -196,7 +195,7 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
                        kill_client_serv_butone(NULL, exist_p, "%s (Nickname regained by services)",
                                                me.name);
 
-               snprintf(buf, sizeof(buf), "Killed (%s (Nickname regained by services))",
+               rb_snprintf(buf, sizeof(buf), "Killed (%s (Nickname regained by services))",
                        me.name);
                exit_client(NULL, exist_p, &me, buf);
        }
@@ -225,8 +224,6 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
        add_history(target_p, 1);
        sendto_server(NULL, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
                        use_id(target_p), parv[2], (long) target_p->tsinfo);
-       sendto_server(NULL, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
-                       target_p->name, parv[2], (long) target_p->tsinfo);
 
        del_from_client_hash(target_p->name, target_p);
        strcpy(target_p->name, parv[2]);
@@ -243,7 +240,6 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
 
 /*
 ** me_nickdelay
-**      parv[0] = sender prefix
 **      parv[1] = duration in seconds (0 to remove)
 **      parv[2] = nick
 */