Remove various unused macros.

[irc/rqf/shadowircd.git] / modules / core / m_server.c

diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index bc64f3b2bf35be94bd6c1d6e1c144c98784c8eb2..8ccfeb3edff3df5d0e63de765cc75aa8c14bba41 100644 (file)
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -38,7 +38,7 @@
 #include "s_log.h"             /* log level defines */
 #include "s_serv.h"            /* server_estab, check_server */
 #include "s_stats.h"           /* ServerStats */
-#include "scache.h"            /* find_or_add */
+#include "scache.h"
 #include "send.h"              /* sendto_one */
 #include "msg.h"
 #include "parse.h"
@@ -418,11 +418,6 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 
        set_server_gecos(target_p, info);
 
-       target_p->serv->up = find_or_add(source_p->name);
-
-       if(has_id(source_p))
-               target_p->serv->upid = source_p->id;
-
        target_p->servptr = source_p;
 
        SetServer(target_p);
@@ -432,6 +427,8 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
        add_to_client_hash(target_p->name, target_p);
        dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
 
+       target_p->serv->nameinfo = scache_connect(target_p->name, target_p->info, IsHidden(target_p));
+
        sendto_server(client_p, NULL, NOCAPS, NOCAPS,
                      ":%s SERVER %s %d :%s%s",
                      source_p->name, target_p->name, target_p->hopcount + 1,
@@ -570,11 +567,6 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
        strcpy(target_p->id, parv[3]);
        set_server_gecos(target_p, parv[4]);
 
-       target_p->serv->up = find_or_add(source_p->name);
-
-       if(has_id(source_p))
-               target_p->serv->upid = source_p->id;
-
        target_p->servptr = source_p;
        SetServer(target_p);
 
@@ -584,6 +576,8 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
        add_to_id_hash(target_p->id, target_p);
        dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
 
+       target_p->serv->nameinfo = scache_connect(target_p->name, target_p->info, IsHidden(target_p));
+
        sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
                      ":%s SID %s %d %s :%s%s",
                      source_p->id, target_p->name, target_p->hopcount + 1,