m_info: Correct description of general::client_exit like in example confs.

[solanum.git] / modules / core / m_nick.c

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index 51c049802d97091dd6dddef868b5aad94a5ade14..6d26fbf544b1106a613358d87e2f6c7930fccf34 100644 (file)
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -115,7 +115,6 @@ mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
 {
        struct Client *target_p;
        char nick[NICKLEN];
-       char *s;
 
        if (strlen(client_p->id) == 3)
        {
@@ -123,20 +122,13 @@ mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
                return 0;
        }
 
-       if(parc < 2 || EmptyString(parv[1]) || (parv[1][0] == '~'))
+       if(parc < 2 || EmptyString(parv[1]))
        {
                sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN),
                           me.name, EmptyString(source_p->name) ? "*" : source_p->name);
                return 0;
        }
 
-       /* due to the scandinavian origins, (~ being uppercase of ^) and ~
-        * being disallowed as a nick char, we need to chop the first ~
-        * instead of just erroring.
-        */
-       if((s = strchr(parv[1], '~')))
-               *s = '\0';
-
        /* copy the nick and terminate it */
        rb_strlcpy(nick, parv[1], ConfigFileEntry.nicklen);
 
@@ -181,21 +173,13 @@ m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *p
 {
        struct Client *target_p;
        char nick[NICKLEN];
-       char *s;
 
-       if(parc < 2 || EmptyString(parv[1]) || (parv[1][0] == '~'))
+       if(parc < 2 || EmptyString(parv[1]))
        {
                sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN), me.name, source_p->name);
                return 0;
        }
 
-       /* due to the scandinavian origins, (~ being uppercase of ^) and ~
-        * being disallowed as a nick char, we need to chop the first ~
-        * instead of just erroring.
-        */
-       if((s = strchr(parv[1], '~')))
-               *s = '\0';
-
        /* mark end of grace period, to prevent nickflooding */
        if(!IsFloodDone(source_p))
                flood_endgrace(source_p);
@@ -365,8 +349,8 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
        if(!clean_uid(parv[8], source_p->id))
        {
                rb_snprintf(squitreason, sizeof squitreason,
-                               "Invalid UID %s for nick %s on %s",
-                               parv[8], parv[1], source_p->name);
+                               "Invalid UID %s for nick %s on %s/%s",
+                               parv[8], parv[1], source_p->name, source_p->id);
                exit_client(client_p, client_p, client_p, squitreason);
                return 0;
        }
@@ -456,8 +440,8 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
        if(!clean_uid(parv[8], source_p->id))
        {
                rb_snprintf(squitreason, sizeof squitreason,
-                               "Invalid UID %s for nick %s on %s",
-                               parv[8], parv[1], source_p->name);
+                               "Invalid UID %s for nick %s on %s/%s",
+                               parv[8], parv[1], source_p->name, source_p->id);
                exit_client(client_p, client_p, client_p, squitreason);
                return 0;
        }
@@ -1025,8 +1009,8 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
                        {
                                ServerStats.is_kill++;
 
-                               sendto_one_numeric(target_p, ERR_NICKCOLLISION,
-                                               form_str(ERR_NICKCOLLISION), target_p->name);
+                               sendto_one_numeric(source_p, ERR_NICKCOLLISION,
+                                               form_str(ERR_NICKCOLLISION), source_p->name);
 
                                /* kill the client issuing the nickchange */
                                kill_client_serv_butone(client_p, source_p,