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

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

diff --git a/modules/m_signon.c b/modules/m_signon.c
index 4d242daf5fbdf002315029ec688587c912deb0fd..f28021ff044d669a9005d7ee64e862771c95f7e8 100644 (file)
--- a/modules/m_signon.c
+++ b/modules/m_signon.c
@@ -44,12 +44,11 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "whowas.h"
 #include "monitor.h"
 #include "s_stats.h"
 #include "snomask.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_user.h"
 
 static int me_svslogin(struct Client *, struct Client *, int, const char **);
@@ -163,41 +162,41 @@ me_svslogin(struct Client *client_p, struct Client *source_p,
 
        if(clean_nick(parv[2]))
        {
-               strlcpy(nick, parv[2], NICKLEN + 1);
+               rb_strlcpy(nick, parv[2], NICKLEN + 1);
                valid |= NICK_VALID;
        }
        else if(*target_p->name)
-               strlcpy(nick, target_p->name, NICKLEN + 1);
+               rb_strlcpy(nick, target_p->name, NICKLEN + 1);
        else
                strcpy(nick, "*");
 
        if(clean_username(parv[3]))
        {
-               strlcpy(user, parv[3], USERLEN + 1);
+               rb_strlcpy(user, parv[3], USERLEN + 1);
                valid |= USER_VALID;
        }
        else
-               strlcpy(user, target_p->username, USERLEN + 1);
+               rb_strlcpy(user, target_p->username, USERLEN + 1);
 
        if(clean_host(parv[4]))
        {
-               strlcpy(host, parv[4], HOSTLEN + 1);
+               rb_strlcpy(host, parv[4], HOSTLEN + 1);
                valid |= HOST_VALID;
        }
        else
-               strlcpy(host, target_p->host, HOSTLEN + 1);
+               rb_strlcpy(host, target_p->host, HOSTLEN + 1);
 
        if(*parv[5] == '*')
        {
                if(target_p->user)
-                       strlcpy(login, target_p->user->suser, NICKLEN + 1);
+                       rb_strlcpy(login, target_p->user->suser, NICKLEN + 1);
                else
                        login[0] = '\0';
        }
        else if(!strcmp(parv[5], "0"))
                login[0] = '\0';
        else
-               strlcpy(login, parv[5], NICKLEN + 1);
+               rb_strlcpy(login, parv[5], NICKLEN + 1);
 
        /* Login (mostly) follows nick rules. */
        if(*login && !clean_nick(login))
@@ -215,7 +214,7 @@ me_svslogin(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);
        }else if((exist_p = find_client(nick)) && IsUnknown(exist_p) && exist_p != target_p) {
@@ -251,7 +250,7 @@ me_svslogin(struct Client *client_p, struct Client *source_p,
                if(valid & HOST_VALID)
                        strcpy(target_p->preClient->spoofhost, host);
 
-               strlcpy(user_p->suser, login, NICKLEN + 1);
+               rb_strlcpy(user_p->suser, login, NICKLEN + 1);
        }
        else
        {
@@ -317,7 +316,7 @@ ms_signon(struct Client *client_p, struct Client *source_p,
        else if(*parv[5] != '*')
        {
                if (clean_nick(parv[5]))
-                       strlcpy(login, parv[5], NICKLEN + 1);
+                       rb_strlcpy(login, parv[5], NICKLEN + 1);
                else
                        return 0;
        }
@@ -432,9 +431,6 @@ send_signon(struct Client *client_p, struct Client *target_p,
        sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s SIGNON %s %s %s %ld %s",
                        use_id(target_p), nick, user, host,
                        (long) target_p->tsinfo, *login ? login : "0");
-       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s SIGNON %s %s %s %ld %s",
-                       target_p->name, nick, user, host,
-                       (long) target_p->tsinfo, *login ? login : "0");
 
        strcpy(target_p->user->suser, login);