Remove more TS5 remnants.

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index 1d3cc19ec28a7aa70dbb2924842fb39d73ee2ce8..81d5c6b94703018e656795bfc678ea24337ab6fe 100644 (file)
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -931,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;
@@ -1090,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);
@@ -1139,7 +1126,7 @@ register_client(struct Client *client_p, struct Client *server,
        }
        else
        {
-               rb_strlcpy(source_p->info, parv[8], sizeof(source_p->info));
+               s_assert(0);
        }
 
        /* remove any nd entries for this nick */
@@ -1200,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));