Automated merge with ssh://hg.atheme.org//hg/charybdis

[irc/rqf/shadowircd.git] / src / s_serv.c

diff --git a/src/s_serv.c b/src/s_serv.c
index 1c62d6494a6e7e5102939e6727d1bea0adb3c617..df8dfe4a20489a78ec1861640ddf06defcc466ce 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -1107,8 +1107,6 @@ server_estab(struct Client *client_p)
        add_to_client_hash(client_p->name, client_p);
        /* doesnt duplicate client_p->serv if allocated this struct already */
        make_server(client_p);
-       client_p->serv->up = me.name;
-       client_p->serv->upid = me.id;
 
        client_p->serv->caps = client_p->localClient->caps;
 
@@ -1119,8 +1117,7 @@ server_estab(struct Client *client_p)
                client_p->localClient->fullcaps = NULL;
        }
 
-       /* add it to scache */
-       find_or_add(client_p->name);
+       client_p->serv->nameinfo = scache_connect(client_p->name, client_p->info, IsHidden(client_p));
        client_p->localClient->firsttime = CurrentTime;
        /* fixing eob timings.. -gnp */
 
@@ -1218,12 +1215,12 @@ server_estab(struct Client *client_p)
                /* presumption, if target has an id, so does its uplink */
                if(has_id(client_p) && has_id(target_p))
                        sendto_one(client_p, ":%s SID %s %d %s :%s%s",
-                                  target_p->serv->upid, target_p->name,
+                                  target_p->servptr->id, target_p->name,
                                   target_p->hopcount + 1, target_p->id,
                                   IsHidden(target_p) ? "(H) " : "", target_p->info);
                else
                        sendto_one(client_p, ":%s SERVER %s %d :%s%s",
-                                  target_p->serv->up,
+                                  target_p->servptr->name,
                                   target_p->name, target_p->hopcount + 1,
                                   IsHidden(target_p) ? "(H) " : "", target_p->info);
 
@@ -1565,8 +1562,6 @@ serv_connect(struct server_conf *server_p, struct Client *by)
                        free_user(client_p->serv->user, NULL);
                client_p->serv->user = NULL;
        }
-       client_p->serv->up = me.name;
-       client_p->serv->upid = me.id;
        SetConnecting(client_p);
        dlinkAddTail(client_p, &client_p->node, &global_client_list);