]> jfr.im git - irc/rqf/shadowircd.git/blobdiff - modules/core/m_nick.c
Remove more TS5 remnants.
[irc/rqf/shadowircd.git] / modules / core / m_nick.c
index 27c9f9be11a2c6b2dee6e111f51aa96e386dcbd7..81d5c6b94703018e656795bfc678ea24337ab6fe 100644 (file)
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
@@ -38,7 +38,7 @@
 #include "s_serv.h"
 #include "send.h"
 #include "channel.h"
-#include "s_log.h"
+#include "logger.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
@@ -64,10 +64,11 @@ static int ms_euid(struct Client *, struct Client *, int, const char **);
 static int ms_save(struct Client *, struct Client *, int, const char **);
 static int can_save(struct Client *);
 static void save_user(struct Client *, struct Client *, struct Client *);
+static void bad_nickname(struct Client *, const char *);
 
 struct Message nick_msgtab = {
        "NICK", 0, 0, 0, MFLG_SLOW,
-       {{mr_nick, 0}, {m_nick, 0}, {mc_nick, 3}, {ms_nick, 8}, mg_ignore, {m_nick, 0}}
+       {{mr_nick, 0}, {m_nick, 0}, {mc_nick, 3}, {ms_nick, 0}, mg_ignore, {m_nick, 0}}
 };
 struct Message uid_msgtab = {
        "UID", 0, 0, 0, MFLG_SLOW,
@@ -138,7 +139,7 @@ mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
                *s = '\0';
 
        /* copy the nick and terminate it */
-       strlcpy(nick, parv[1], sizeof(nick));
+       rb_strlcpy(nick, parv[1], sizeof(nick));
 
        /* check the nickname is ok */
        if(!clean_nick(nick, 1))
@@ -202,7 +203,7 @@ m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *p
                flood_endgrace(source_p);
 
        /* terminate nick to NICKLEN, we dont want clean_nick() to error! */
-       strlcpy(nick, parv[1], sizeof(nick));
+       rb_strlcpy(nick, parv[1], sizeof(nick));
 
        /* check the nickname is ok */
        if(!clean_nick(nick, 1))
@@ -254,23 +255,12 @@ m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *p
        return 0;
 }
 
-/* ms_nick()
+/* mc_nick()
  *      
  * server -> server nick change
  *    parv[0] = sender prefix
  *    parv[1] = nickname
  *    parv[2] = TS when nick change
- *
- * server introducing new nick
- *    parv[0] = sender prefix
- *    parv[1] = nickname
- *    parv[2] = hop count
- *    parv[3] = TS
- *    parv[4] = umode
- *    parv[5] = username
- *    parv[6] = hostname
- *    parv[7] = server
- *    parv[8] = ircname
  */
 static int
 mc_nick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
@@ -281,18 +271,7 @@ mc_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
        /* if nicks erroneous, or too long, kill */
        if(!clean_nick(parv[1], 0))
        {
-               ServerStats->is_kill++;
-               sendto_realops_snomask(SNO_DEBUG, L_ALL,
-                                    "Bad Nick: %s From: %s(via %s)",
-                                    parv[1], source_p->servptr->name, client_p->name);
-               sendto_one(client_p, ":%s KILL %s :%s (Bad Nickname)", me.name, parv[1], me.name);
-
-               /* bad nick change, issue kill for the old nick to the rest
-                * of the network.
-                */
-               kill_client_serv_butone(client_p, source_p, "%s (Bad Nickname)", me.name);
-               source_p->flags |= FLAGS_KILLED;
-               exit_client(client_p, source_p, &me, "Bad Nickname");
+               bad_nickname(client_p, parv[1]);
                return 0;
        }
 
@@ -326,78 +305,21 @@ mc_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
 static int
 ms_nick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-       struct Client *target_p;
-       time_t newts = 0;
+       const char *nick, *server;
 
-       if(parc != 9)
-       {
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                    "Dropping server %s due to (invalid) command 'NICK' "
-                                    "with %d arguments (expecting 9)", client_p->name, parc);
-               ilog(L_SERVER, "Excess parameters (%d) for command 'NICK' from %s.",
-                    parc, client_p->name);
-               exit_client(client_p, client_p, client_p, "Excess parameters to NICK command");
-               return 0;
-       }
+       nick = parc > 1 ? parv[1] : "?";
+       server = parc > 7 ? parv[7] : "?";
 
-       /* if nicks empty, erroneous, or too long, kill */
-       if(!clean_nick(parv[1], 0))
-       {
-               ServerStats->is_kill++;
-               sendto_realops_snomask(SNO_DEBUG, L_ALL,
-                                    "Bad Nick: %s From: %s(via %s)",
-                                    parv[1], parv[7], client_p->name);
-               sendto_one(client_p, ":%s KILL %s :%s (Bad Nickname)", me.name, parv[1], me.name);
-               return 0;
-       }
+       sendto_wallops_flags(UMODE_WALLOP, &me,
+                       "Link %s cancelled, TS5 nickname %s on %s introduced (old server?)",
+                       client_p->name, nick, server);
+       sendto_server(NULL, NULL, CAP_TS6, NOCAPS,
+                       ":%s WALLOPS :Link %s cancelled, TS5 nickname %s on %s introduced (old server?)",
+                       me.id, client_p->name, nick, server);
+       ilog(L_SERVER, "Link %s cancelled, TS5 nickname %s on %s introduced (old server?)",
+                       client_p->name, nick, server);
 
-       /* invalid username or host? */
-       if(!clean_username(parv[5]) || !clean_host(parv[6]))
-       {
-               ServerStats->is_kill++;
-               sendto_realops_snomask(SNO_DEBUG, L_ALL,
-                                    "Bad user@host: %s@%s From: %s(via %s)",
-                                    parv[5], parv[6], parv[7], client_p->name);
-               sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.name, parv[1], me.name);
-               return 0;
-       }
-
-       /* check the length of the clients gecos */
-       if(strlen(parv[8]) > REALLEN)
-       {
-               char *s = LOCAL_COPY(parv[8]);
-               /* why exactly do we care? --fl */
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                    "Long realname from server %s for %s", parv[7], parv[1]);
-
-               s[REALLEN] = '\0';
-               parv[8] = s;
-       }
-
-       newts = atol(parv[3]);
-
-       target_p = find_named_client(parv[1]);
-
-       /* if the nick doesnt exist, allow it and process like normal */
-       if(target_p == NULL)
-       {
-               register_client(client_p, NULL, parv[1], newts, parc, parv);
-       }
-       else if(IsUnknown(target_p))
-       {
-               exit_client(NULL, target_p, &me, "Overridden");
-               register_client(client_p, NULL, parv[1], newts, parc, parv);
-       }
-       else if(target_p == source_p)
-       {
-               /* client changing case of nick */
-               if(strcmp(target_p->name, parv[1]))
-                       register_client(client_p, NULL, parv[1], newts, parc, parv);
-       }
-       /* we've got a collision! */
-       else
-               perform_nick_collides(source_p, client_p, target_p, parc, parv,
-                                     newts, parv[1], NULL);
+       exit_client(client_p, client_p, &me, "TS5 nickname introduced");
 
        return 0;
 }
@@ -418,6 +340,7 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 {
        struct Client *target_p;
        time_t newts = 0;
+       char squitreason[120];
 
        newts = atol(parv[3]);
 
@@ -428,38 +351,36 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
                                     "with %d arguments (expecting 10)", client_p->name, parc);
                ilog(L_SERVER, "Excess parameters (%d) for command 'UID' from %s.",
                     parc, client_p->name);
-               exit_client(client_p, client_p, client_p, "Excess parameters to UID command");
+               rb_snprintf(squitreason, sizeof squitreason,
+                               "Excess parameters (%d) to %s command, expecting %d",
+                               parc, "UID", 10);
+               exit_client(client_p, client_p, client_p, squitreason);
                return 0;
        }
 
        /* if nicks erroneous, or too long, kill */
        if(!clean_nick(parv[1], 0))
        {
-               ServerStats->is_kill++;
-               sendto_realops_snomask(SNO_DEBUG, L_ALL,
-                                    "Bad Nick: %s From: %s(via %s)",
-                                    parv[1], source_p->name, client_p->name);
-               sendto_one(client_p, ":%s KILL %s :%s (Bad Nickname)", me.id, parv[8], me.name);
+               bad_nickname(client_p, parv[1]);
                return 0;
        }
 
-       if(!clean_username(parv[5]) || !clean_host(parv[6]))
+       if(!clean_uid(parv[8]))
        {
-               ServerStats->is_kill++;
-               sendto_realops_snomask(SNO_DEBUG, L_ALL,
-                                    "Bad user@host: %s@%s From: %s(via %s)",
-                                    parv[5], parv[6], source_p->name, client_p->name);
-               sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.id, parv[8], me.name);
+               rb_snprintf(squitreason, sizeof squitreason,
+                               "Invalid UID %s for nick %s on %s",
+                               parv[8], parv[1], source_p->name);
+               exit_client(client_p, client_p, client_p, squitreason);
                return 0;
        }
 
-       if(!clean_uid(parv[8]))
+       if(!clean_username(parv[5]) || !clean_host(parv[6]))
        {
-               ServerStats->is_kill++;
+               ServerStats.is_kill++;
                sendto_realops_snomask(SNO_DEBUG, L_ALL,
-                                    "Bad UID: %s From: %s(via %s)",
-                                    parv[8], source_p->name, client_p->name);
-               sendto_one(client_p, ":%s KILL %s :%s (Bad UID)", me.id, parv[8], me.name);
+                                    "Bad user@host: %s@%s From: %s(via %s)",
+                                    parv[5], parv[6], source_p->name, client_p->name);
+               sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.id, parv[8], me.name);
                return 0;
        }
 
@@ -510,6 +431,7 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
 {
        struct Client *target_p;
        time_t newts = 0;
+       char squitreason[120];
 
        newts = atol(parv[3]);
 
@@ -520,44 +442,42 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
                                     "with %d arguments (expecting 12)", client_p->name, parc);
                ilog(L_SERVER, "Excess parameters (%d) for command 'EUID' from %s.",
                     parc, client_p->name);
-               exit_client(client_p, client_p, client_p, "Excess parameters to EUID command");
+               rb_snprintf(squitreason, sizeof squitreason,
+                               "Excess parameters (%d) to %s command, expecting %d",
+                               parc, "EUID", 12);
+               exit_client(client_p, client_p, client_p, squitreason);
                return 0;
        }
 
        /* if nicks erroneous, or too long, kill */
        if(!clean_nick(parv[1], 0))
        {
-               ServerStats->is_kill++;
-               sendto_realops_snomask(SNO_DEBUG, L_ALL,
-                                    "Bad Nick: %s From: %s(via %s)",
-                                    parv[1], source_p->name, client_p->name);
-               sendto_one(client_p, ":%s KILL %s :%s (Bad Nickname)", me.id, parv[8], me.name);
+               bad_nickname(client_p, parv[1]);
                return 0;
        }
 
-       if(!clean_username(parv[5]) || !clean_host(parv[6]))
+       if(!clean_uid(parv[8]))
        {
-               ServerStats->is_kill++;
-               sendto_realops_snomask(SNO_DEBUG, L_ALL,
-                                    "Bad user@host: %s@%s From: %s(via %s)",
-                                    parv[5], parv[6], source_p->name, client_p->name);
-               sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.id, parv[8], me.name);
+               rb_snprintf(squitreason, sizeof squitreason,
+                               "Invalid UID %s for nick %s on %s",
+                               parv[8], parv[1], source_p->name);
+               exit_client(client_p, client_p, client_p, squitreason);
                return 0;
        }
 
-       if(!clean_uid(parv[8]))
+       if(!clean_username(parv[5]) || !clean_host(parv[6]))
        {
-               ServerStats->is_kill++;
+               ServerStats.is_kill++;
                sendto_realops_snomask(SNO_DEBUG, L_ALL,
-                                    "Bad UID: %s From: %s(via %s)",
-                                    parv[8], source_p->name, client_p->name);
-               sendto_one(client_p, ":%s KILL %s :%s (Bad UID)", me.id, parv[8], me.name);
+                                    "Bad user@host: %s@%s From: %s(via %s)",
+                                    parv[5], parv[6], source_p->name, client_p->name);
+               sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.id, parv[8], me.name);
                return 0;
        }
 
        if(strcmp(parv[9], "*") && !clean_host(parv[9]))
        {
-               ServerStats->is_kill++;
+               ServerStats.is_kill++;
                sendto_realops_snomask(SNO_DEBUG, L_ALL,
                                     "Bad realhost: %s From: %s(via %s)",
                                     parv[9], source_p->name, client_p->name);
@@ -734,7 +654,7 @@ set_initial_nick(struct Client *client_p, struct Client *source_p, char *nick)
        char note[NICKLEN + 10];
 
        /* This had to be copied here to avoid problems.. */
-       source_p->tsinfo = CurrentTime;
+       source_p->tsinfo = rb_current_time();
        if(source_p->name[0])
                del_from_client_hash(source_p->name, source_p);
 
@@ -746,7 +666,7 @@ set_initial_nick(struct Client *client_p, struct Client *source_p, char *nick)
 
        if(source_p->flags & FLAGS_SENTUSER)
        {
-               strlcpy(buf, source_p->username, sizeof(buf));
+               rb_strlcpy(buf, source_p->username, sizeof(buf));
 
                /* got user, heres nick. */
                register_local_user(client_p, source_p, buf);
@@ -759,7 +679,7 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
                char *nick, int dosend)
 {
        struct Client *target_p;
-       rb_dlink_node *ptr, *rb_free(;
+       rb_dlink_node *ptr, *next_ptr;
        struct Channel *chptr;
        char note[NICKLEN + 10];
        int samenick;
@@ -774,10 +694,10 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
                                        nick, chptr->chname);
                        return;
                }
-               if((source_p->localClient->last_nick_change + ConfigFileEntry.max_nick_time) < CurrentTime)
+               if((source_p->localClient->last_nick_change + ConfigFileEntry.max_nick_time) < rb_current_time())
                        source_p->localClient->number_of_nick_changes = 0;
 
-               source_p->localClient->last_nick_change = CurrentTime;
+               source_p->localClient->last_nick_change = rb_current_time();
                source_p->localClient->number_of_nick_changes++;
 
                if(ConfigFileEntry.anti_nick_flood && !IsOper(source_p) &&
@@ -796,10 +716,10 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
        if(!samenick)
        {
                /* force the TS to increase -- jilles */
-               if (source_p->tsinfo >= CurrentTime)
+               if (source_p->tsinfo >= rb_current_time())
                        source_p->tsinfo++;
                else
-                       source_p->tsinfo = CurrentTime;
+                       source_p->tsinfo = rb_current_time();
                monitor_signoff(source_p);
                /* we only do bancache for local users -- jilles */
                if(source_p->user)
@@ -823,8 +743,6 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
                {
                        sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
                                        use_id(source_p), nick, (long) source_p->tsinfo);
-                       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
-                                       source_p->name, nick, (long) source_p->tsinfo);
                }
        }
 
@@ -843,7 +761,7 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
         * to clear a clients own list of accepted clients.  So just remove
         * them from everyone elses list --anfl
         */
-       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, source_p->on_allow_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, source_p->on_allow_list.head)
        {
                target_p = ptr->data;
 
@@ -870,7 +788,7 @@ change_remote_nick(struct Client *client_p, struct Client *source_p,
        /* client changing their nick - dont reset ts if its same */
        if(!samenick)
        {
-               source_p->tsinfo = newts ? newts : CurrentTime;
+               source_p->tsinfo = newts ? newts : rb_current_time();
                monitor_signoff(source_p);
        }
 
@@ -884,8 +802,6 @@ change_remote_nick(struct Client *client_p, struct Client *source_p,
                {
                        sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
                                        use_id(source_p), nick, (long) source_p->tsinfo);
-                       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
-                                       source_p->name, nick, (long) source_p->tsinfo);
                }
        }
 
@@ -923,14 +839,14 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
        /* if we dont have a ts, or their TS's are the same, kill both */
        if(!newts || !target_p->tsinfo || (newts == target_p->tsinfo))
        {
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                     "Nick collision on %s(%s <- %s)(both %s)",
                                     target_p->name, target_p->from->name, client_p->name, action);
 
                if (use_save)
                {
                        save_user(&me, &me, target_p);
-                       ServerStats->is_save++;
+                       ServerStats.is_save++;
                        sendto_one(client_p, ":%s SAVE %s %ld", me.id,
                                        uid, (long)newts);
                        register_client(client_p, source_p,
@@ -950,7 +866,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
 
                        /* we then need to KILL the old client everywhere */
                        kill_client_serv_butone(NULL, target_p, "%s (Nick collision (new))", me.name);
-                       ServerStats->is_kill++;
+                       ServerStats.is_kill++;
 
                        target_p->flags |= FLAGS_KILLED;
                        exit_client(client_p, target_p, &me, "Nick collision (new)");
@@ -986,24 +902,24 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
                else
                {
                        if(sameuser)
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                                     "Nick collision on %s(%s <- %s)(older %s)",
                                                     target_p->name, target_p->from->name,
                                                     client_p->name, action);
                        else
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                                     "Nick collision on %s(%s <- %s)(newer %s)",
                                                     target_p->name, target_p->from->name,
                                                     client_p->name, action);
 
                        if (use_save)
                        {
-                               ServerStats->is_save++;
+                               ServerStats.is_save++;
                                save_user(&me, &me, target_p);
                        }
                        else
                        {
-                               ServerStats->is_kill++;
+                               ServerStats.is_kill++;
                                sendto_one_numeric(target_p, ERR_NICKCOLLISION,
                                                form_str(ERR_NICKCOLLISION), target_p->name);
 
@@ -1015,7 +931,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
                                (void) exit_client(client_p, target_p, &me, "Nick collision");
                        }
 
-                       register_client(client_p, parc >= 10 ? source_p : NULL,
+                       register_client(client_p, source_p,
                                        nick, newts, parc, parv);
 
                        return 0;
@@ -1040,14 +956,14 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
        /* its a client changing nick and causing a collide */
        if(!newts || !target_p->tsinfo || (newts == target_p->tsinfo) || !source_p->user)
        {
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                     "Nick change collision from %s to %s(%s <- %s)(both %s)",
                                     source_p->name, target_p->name, target_p->from->name,
                                     client_p->name, action);
 
                if (use_save)
                {
-                       ServerStats->is_save += 2;
+                       ServerStats.is_save += 2;
                        save_user(&me, &me, target_p);
                        sendto_one(client_p, ":%s SAVE %s %ld", me.id,
                                        source_p->id, (long)newts);
@@ -1057,13 +973,13 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
                }
                else
                {
-                       ServerStats->is_kill++;
+                       ServerStats.is_kill++;
                        sendto_one_numeric(target_p, ERR_NICKCOLLISION,
                                        form_str(ERR_NICKCOLLISION), target_p->name);
 
                        kill_client_serv_butone(NULL, source_p, "%s (Nick change collision)", me.name);
 
-                       ServerStats->is_kill++;
+                       ServerStats.is_kill++;
 
                        kill_client_serv_butone(NULL, target_p, "%s (Nick change collision)", me.name);
 
@@ -1083,19 +999,19 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
                   (!sameuser && newts > target_p->tsinfo))
                {
                        if(sameuser)
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                                     "Nick change collision from %s to %s(%s <- %s)(older %s)",
                                                     source_p->name, target_p->name,
                                                     target_p->from->name, client_p->name, action);
                        else
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                                     "Nick change collision from %s to %s(%s <- %s)(newer %s)",
                                                     source_p->name, target_p->name,
                                                     target_p->from->name, client_p->name, action);
 
                        if (use_save)
                        {
-                               ServerStats->is_save++;
+                               ServerStats.is_save++;
                                /* can't broadcast a SAVE because the
                                 * nickchange has happened at client_p
                                 * but not in other directions -- jilles */
@@ -1107,7 +1023,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
                        }
                        else
                        {
-                               ServerStats->is_kill++;
+                               ServerStats.is_kill++;
 
                                sendto_one_numeric(target_p, ERR_NICKCOLLISION,
                                                form_str(ERR_NICKCOLLISION), target_p->name);
@@ -1128,19 +1044,19 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
                else
                {
                        if(sameuser)
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                                     "Nick collision on %s(%s <- %s)(older %s)",
                                                     target_p->name, target_p->from->name,
                                                     client_p->name, action);
                        else
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                                     "Nick collision on %s(%s <- %s)(newer %s)",
                                                     target_p->name, target_p->from->name,
                                                     client_p->name, action);
 
                        if (use_save)
                        {
-                               ServerStats->is_save++;
+                               ServerStats.is_save++;
                                save_user(&me, &me, target_p);
                        }
                        else
@@ -1151,7 +1067,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
                                /* kill the client who existed before hand */
                                kill_client_serv_butone(client_p, target_p, "%s (Nick collision)", me.name);
 
-                               ServerStats->is_kill++;
+                               ServerStats.is_kill++;
 
                                target_p->flags |= FLAGS_KILLED;
                                (void) exit_client(client_p, target_p, &me, "Nick collision");
@@ -1174,19 +1090,6 @@ register_client(struct Client *client_p, struct Client *server,
        const char *m;
        int flag;
 
-       if(server == NULL)
-       {
-               if((server = find_server(NULL, parv[7])) == NULL)
-               {
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                            "Ghost killed: %s on invalid server %s",
-                                            nick, parv[7]);
-                       sendto_one(client_p, ":%s KILL %s :%s (Server doesn't exist)",
-                                       get_id(&me, client_p), nick, me.name);
-                       return 0;
-               }
-       }
-
        source_p = make_client(client_p);
        user = make_user(source_p);
        rb_dlinkAddTail(source_p, &source_p->node, &global_client_list);
@@ -1195,35 +1098,35 @@ register_client(struct Client *client_p, struct Client *server,
        source_p->tsinfo = newts;
 
        strcpy(source_p->name, nick);
-       strlcpy(source_p->username, parv[5], sizeof(source_p->username));
-       strlcpy(source_p->host, parv[6], sizeof(source_p->host));
-       strlcpy(source_p->orighost, source_p->host, sizeof(source_p->orighost));
+       rb_strlcpy(source_p->username, parv[5], sizeof(source_p->username));
+       rb_strlcpy(source_p->host, parv[6], sizeof(source_p->host));
+       rb_strlcpy(source_p->orighost, source_p->host, sizeof(source_p->orighost));
 
        if(parc == 12)
        {
-               strlcpy(source_p->info, parv[11], sizeof(source_p->info));
-               strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
-               strlcpy(source_p->id, parv[8], sizeof(source_p->id));
+               rb_strlcpy(source_p->info, parv[11], sizeof(source_p->info));
+               rb_strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
+               rb_strlcpy(source_p->id, parv[8], sizeof(source_p->id));
                add_to_id_hash(source_p->id, source_p);
                if (strcmp(parv[9], "*"))
                {
-                       strlcpy(source_p->orighost, parv[9], sizeof(source_p->orighost));
+                       rb_strlcpy(source_p->orighost, parv[9], sizeof(source_p->orighost));
                        if (irccmp(source_p->host, source_p->orighost))
                                SetDynSpoof(source_p);
                }
                if (strcmp(parv[10], "*"))
-                       strlcpy(source_p->user->suser, parv[10], sizeof(source_p->user->suser));
+                       rb_strlcpy(source_p->user->suser, parv[10], sizeof(source_p->user->suser));
        }
        else if(parc == 10)
        {
-               strlcpy(source_p->info, parv[9], sizeof(source_p->info));
-               strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
-               strlcpy(source_p->id, parv[8], sizeof(source_p->id));
+               rb_strlcpy(source_p->info, parv[9], sizeof(source_p->info));
+               rb_strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
+               rb_strlcpy(source_p->id, parv[8], sizeof(source_p->id));
                add_to_id_hash(source_p->id, source_p);
        }
        else
        {
-               strlcpy(source_p->info, parv[8], sizeof(source_p->info));
+               s_assert(0);
        }
 
        /* remove any nd entries for this nick */
@@ -1284,23 +1187,6 @@ register_client(struct Client *client_p, struct Client *server,
 
        rb_dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
 
-       /* fake direction */
-       if(source_p->servptr->from != source_p->from)
-       {
-               struct Client *target_p = source_p->servptr->from;
-
-               sendto_realops_snomask(SNO_DEBUG, L_ALL,
-                                    "Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
-                                    client_p->name, source_p->name,
-                                    source_p->username, source_p->host,
-                                    server->name, target_p->name, target_p->from->name);
-               kill_client(client_p, source_p,
-                           "%s (NICK from wrong direction (%s != %s))",
-                           me.name, server->name, target_p->from->name);
-               source_p->flags |= FLAGS_KILLED;
-               return exit_client(source_p, source_p, &me, "USER server wrong direction");
-       }
-
        call_hook(h_new_remote_user, source_p);
 
        return (introduce_client(client_p, source_p, user, nick, parc == 12));
@@ -1339,7 +1225,7 @@ save_user(struct Client *client_p, struct Client *source_p,
                                "Killed %s!%s@%s for nick collision detected by %s (%s does not support SAVE)",
                                target_p->name, target_p->username, target_p->host, source_p->name, target_p->from->name);
                kill_client_serv_butone(NULL, target_p, "%s (Nick collision (no SAVE support))", me.name);
-               ServerStats->is_kill++;
+               ServerStats.is_kill++;
 
                target_p->flags |= FLAGS_KILLED;
                (void) exit_client(NULL, target_p, &me, "Nick collision (no SAVE support)");
@@ -1349,8 +1235,6 @@ save_user(struct Client *client_p, struct Client *source_p,
                        source_p->id, target_p->id, (long)target_p->tsinfo);
        sendto_server(client_p, NULL, CAP_TS6, CAP_SAVE, ":%s NICK %s :%ld",
                        target_p->id, target_p->id, (long)SAVE_NICKTS);
-       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
-                       target_p->name, target_p->id, (long)SAVE_NICKTS);
        if (!IsMe(client_p))
                sendto_realops_snomask(SNO_SKILL, L_ALL,
                                "Received SAVE message for %s from %s",
@@ -1365,3 +1249,21 @@ save_user(struct Client *client_p, struct Client *source_p,
        else
                change_remote_nick(target_p, target_p, SAVE_NICKTS, target_p->id, 0);
 }
+
+static void bad_nickname(struct Client *client_p, const char *nick)
+{
+       char squitreason[100];
+
+       sendto_wallops_flags(UMODE_WALLOP, &me,
+                       "Squitting %s because of bad nickname %s (NICKLEN mismatch?)",
+                       client_p->name, nick);
+       sendto_server(NULL, NULL, CAP_TS6, NOCAPS,
+                       ":%s WALLOPS :Squitting %s because of bad nickname %s (NICKLEN mismatch?)",
+                       me.id, client_p->name, nick);
+       ilog(L_SERVER, "Link %s cancelled, bad nickname %s sent (NICKLEN mismatch?)",
+                       client_p->name, nick);
+
+       rb_snprintf(squitreason, sizeof squitreason,
+                       "Bad nickname introduced [%s]", nick);
+       exit_client(client_p, client_p, &me, squitreason);
+}