Merge branch 'isupport-charset' of github.com:grawity/charybdis

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

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index 0caa45966099ca5e213aa4ae20da4e465b6f9230..1cff2842c40b0b947e340ffc6dc1b31af5e018bd 100644 (file)
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -47,6 +47,7 @@
 #include "scache.h"
 #include "s_newconf.h"
 #include "monitor.h"
+#include "s_assert.h"
 
 /* Give all UID nicks the same TS. This ensures nick TS is always the same on
  * all servers for each nick-user pair, also if a user with a UID nick changes
@@ -94,7 +95,7 @@ static int change_remote_nick(struct Client *, struct Client *, time_t,
 static int clean_nick(const char *, int loc_client);
 static int clean_username(const char *);
 static int clean_host(const char *);
-static int clean_uid(const char *uid);
+static int clean_uid(const char *uid, const char *sid);
 
 static void set_initial_nick(struct Client *client_p, struct Client *source_p, char *nick);
 static void change_local_nick(struct Client *client_p, struct Client *source_p, char *nick, int);
@@ -115,7 +116,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 +123,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 +174,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);
@@ -362,11 +347,11 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
                return 0;
        }
 
-       if(!clean_uid(parv[8]))
+       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;
        }
@@ -453,11 +438,11 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
                return 0;
        }
 
-       if(!clean_uid(parv[8]))
+       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;
        }
@@ -623,10 +608,13 @@ clean_host(const char *host)
 }
 
 static int
-clean_uid(const char *uid)
+clean_uid(const char *uid, const char *sid)
 {
        int len = 1;
 
+       if(strncmp(uid, sid, strlen(sid)))
+               return 0;
+
        if(!IsDigit(*uid++))
                return 0;
 
@@ -1022,8 +1010,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,