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 43276b7499d090af07eebdbc08d2e2a4a09c5b5a..df8dfe4a20489a78ec1861640ddf06defcc466ce 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_serv.c 3542 2007-08-01 20:18:12Z jilles $
+ *  $Id: s_serv.c 3550 2007-08-09 06:47:26Z nenolod $
  */
 
 #include "stdinc.h"
@@ -695,7 +695,7 @@ burst_TS5(struct Client *client_p)
                           target_p->name, target_p->hopcount + 1,
                           (long) target_p->tsinfo, ubuf,
                           target_p->username, target_p->host,
-                          target_p->user->server, target_p->info);
+                          target_p->servptr->name, target_p->info);
 
                if(IsDynSpoof(target_p))
                        sendto_one(client_p, ":%s ENCAP * REALHOST %s",
@@ -849,7 +849,7 @@ burst_TS6(struct Client *client_p)
                                        (long) target_p->tsinfo,
                                        ubuf,
                                        target_p->username, target_p->host,
-                                       target_p->user->server, target_p->info);
+                                       target_p->servptr->name, target_p->info);
 
                if(!has_id(target_p) || !IsCapable(client_p, CAP_EUID))
                {
@@ -1049,15 +1049,8 @@ server_estab(struct Client *client_p)
                 */
                if(!EmptyString(server_p->spasswd))
                {
-                       /* kludge, if we're not using TS6, dont ever send
-                        * ourselves as being TS6 capable.
-                        */
-                       if(ServerInfo.use_ts6)
-                               sendto_one(client_p, "PASS %s TS %d :%s", 
-                                          server_p->spasswd, TS_CURRENT, me.id);
-                       else
-                               sendto_one(client_p, "PASS %s :TS",
-                                          server_p->spasswd);
+                       sendto_one(client_p, "PASS %s TS %d :%s", 
+                                  server_p->spasswd, TS_CURRENT, me.id);
                }
 
                /* pass info to new server */
@@ -1114,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;
 
@@ -1126,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 */
 
@@ -1225,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);
 
@@ -1572,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);
 
@@ -1724,12 +1712,8 @@ serv_connect_callback(int fd, int status, void *data)
         */
        if(!EmptyString(server_p->spasswd))
        {
-               if(ServerInfo.use_ts6)
-                       sendto_one(client_p, "PASS %s TS %d :%s", 
-                                  server_p->spasswd, TS_CURRENT, me.id);
-               else
-                       sendto_one(client_p, "PASS %s :TS",
-                                  server_p->spasswd);
+               sendto_one(client_p, "PASS %s TS %d :%s", 
+                          server_p->spasswd, TS_CURRENT, me.id);
        }
 
        /* pass my info to the new server */