Change default --with-nicklen to 31, like atheme-services.

[solanum.git] / modules / m_services.c

diff --git a/modules/m_services.c b/modules/m_services.c
index af0e9c30d93790a4c228fdef0f40a3f1adbac287..5295c762f8613724e74c098966da852ae5a2c00d 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,11 @@ 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));
+
+       sendto_common_channels_local_butone(target_p, CLICAP_ACCOUNT_NOTIFY, ":%s!%s@%s ACCOUNT %s",
+                                           target_p->name, target_p->username, target_p->host,
+                                           EmptyString(target_p->user->suser) ? "*" : target_p->user->suser);
 
        invalidate_bancache_user(target_p);
 
@@ -120,7 +123,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;
 }
 
@@ -184,7 +187,7 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
                 * safety --anfl
                 */
                if(target_p == exist_p)
-                       return 0;
+                       goto doit;
 
                if(MyClient(exist_p))
                        sendto_one(exist_p, ":%s KILL %s :(Nickname regained by services)",
@@ -193,14 +196,20 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
                exist_p->flags |= FLAGS_KILLED;
                /* Do not send kills to servers for unknowns -- jilles */
                if(IsClient(exist_p))
+               {
                        kill_client_serv_butone(NULL, exist_p, "%s (Nickname regained by services)",
                                                me.name);
+                       sendto_realops_snomask(SNO_SKILL, L_ALL,
+                                       "Nick collision due to services forced nick change on %s",
+                                       parv[2]);
+               }
 
-               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);
        }
 
+doit:
        newts = atol(parv[3]);
 
        /* timestamp is older than 15mins, ignore it */
@@ -218,18 +227,16 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
                        target_p->name, parv[2], target_p->username,
                        target_p->host);
 
-       sendto_common_channels_local(target_p, ":%s!%s@%s NICK :%s",
+       sendto_common_channels_local(target_p, NOCAPS, ":%s!%s@%s NICK :%s",
                                target_p->name, target_p->username,
                                target_p->host, parv[2]);
 
        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]);
+       rb_strlcpy(target_p->name, parv[2], NICKLEN);
        add_to_client_hash(target_p->name, target_p);
 
        monitor_signon(target_p);
@@ -243,7 +250,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
 */
@@ -306,9 +312,8 @@ h_svc_whois(hook_data_client *data)
                if(*p == '\0')
                        p = data->target->user->suser;
 
-               sendto_one(data->client, form_str(RPL_WHOISLOGGEDIN),
-                               get_id(&me, data->client),
-                               get_id(data->client, data->client),
+               sendto_one_numeric(data->client, RPL_WHOISLOGGEDIN,
+                               form_str(RPL_WHOISLOGGEDIN),
                                data->target->name, p);
        }
 }
@@ -325,7 +330,7 @@ h_svc_stats(hook_data_int *data)
                {
                        sendto_one_numeric(data->client, RPL_STATSULINE,
                                                form_str(RPL_STATSULINE),
-                                               ptr->data, "*", "*", "s");
+                                               (const char *)ptr->data, "*", "*", "s");
                }
        }
 }