No profanity.

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

diff --git a/src/s_serv.c b/src/s_serv.c
index 7c1199579b2d2b64c93f2423fbfa00b56a506b9a..3acae73852db3419372b77d1b070cae1a50470c3 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -55,8 +55,6 @@
 #include "reject.h"
 #include "sslproc.h"
 
-extern char *crypt();
-
 #ifndef INADDR_NONE
 #define INADDR_NONE ((unsigned int) 0xffffffff)
 #endif
@@ -158,41 +156,23 @@ hunt_server(struct Client *client_p, struct Client *source_p,
         * Again, if there are no wild cards involved in the server
         * name, use the hash lookup
         */
-       if(!target_p)
+       if(!target_p && wilds)
        {
-               if(!wilds)
-               {
-                       if(MyClient(source_p) || !IsDigit(parv[server][0]))
-                               sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
-                                                  form_str(ERR_NOSUCHSERVER),
-                                                  parv[server]);
-                       return (HUNTED_NOSUCH);
-               }
-               else
+               RB_DLINK_FOREACH(ptr, global_client_list.head)
                {
-                       target_p = NULL;
-
-                       RB_DLINK_FOREACH(ptr, global_client_list.head)
+                       if(match(new, ((struct Client *) (ptr->data))->name))
                        {
-                               if(match(new, ((struct Client *) (ptr->data))->name))
-                               {
-                                       target_p = ptr->data;
-                                       break;
-                               }
+                               target_p = ptr->data;
+                               break;
                        }
                }
        }
 
+       if(target_p && !IsRegistered(target_p))
+               target_p = NULL;
+
        if(target_p)
        {
-               if(!IsRegistered(target_p))
-               {
-                       sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
-                                          form_str(ERR_NOSUCHSERVER),
-                                          parv[server]);
-                       return HUNTED_NOSUCH;
-               }
-
                if(IsMe(target_p) || MyClient(target_p))
                        return HUNTED_ISME;
 
@@ -343,7 +323,7 @@ check_server(const char *name, struct Client *client_p)
 
                        if(ServerConfEncrypted(tmp_p))
                        {
-                               if(!strcmp(tmp_p->passwd, crypt(client_p->localClient->passwd,
+                               if(!strcmp(tmp_p->passwd, rb_crypt(client_p->localClient->passwd,
                                                                tmp_p->passwd)))
                                {
                                        server_p = tmp_p;
@@ -509,7 +489,7 @@ burst_TS6(struct Client *client_p)
                        ubuf[1] = '\0';
                }
 
-               if(has_id(target_p) && IsCapable(client_p, CAP_EUID))
+               if(IsCapable(client_p, CAP_EUID))
                        sendto_one(client_p, ":%s EUID %s %d %ld %s %s %s %s %s %s %s :%s",
                                   target_p->servptr->id, target_p->name,
                                   target_p->hopcount + 1, 
@@ -520,7 +500,7 @@ burst_TS6(struct Client *client_p)
                                   IsDynSpoof(target_p) ? target_p->orighost : "*",
                                   EmptyString(target_p->user->suser) ? "*" : target_p->user->suser,
                                   target_p->info);
-               else if(has_id(target_p))
+               else
                        sendto_one(client_p, ":%s UID %s %d %ld %s %s %s %s %s :%s",
                                   target_p->servptr->id, target_p->name,
                                   target_p->hopcount + 1, 
@@ -528,16 +508,8 @@ burst_TS6(struct Client *client_p)
                                   target_p->username, target_p->host,
                                   IsIPSpoof(target_p) ? "0" : target_p->sockhost,
                                   target_p->id, target_p->info);
-               else
-                       sendto_one(client_p, "NICK %s %d %ld %s %s %s %s :%s",
-                                       target_p->name,
-                                       target_p->hopcount + 1,
-                                       (long) target_p->tsinfo,
-                                       ubuf,
-                                       target_p->username, target_p->host,
-                                       target_p->servptr->name, target_p->info);
-
-               if(!has_id(target_p) || !IsCapable(client_p, CAP_EUID))
+
+               if(!IsCapable(client_p, CAP_EUID))
                {
                        if(IsDynSpoof(target_p))
                                sendto_one(client_p, ":%s ENCAP * REALHOST %s",
@@ -762,7 +734,6 @@ server_estab(struct Client *client_p)
        set_chcap_usage_counts(client_p);
 
        rb_dlinkAdd(client_p, &client_p->lnode, &me.serv->servers);
-       del_unknown_ip(client_p);
        rb_dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &serv_list);
        rb_dlinkAddTailAlloc(client_p, &global_serv_list);
 
@@ -895,8 +866,7 @@ server_estab(struct Client *client_p)
 
        free_pre_client(client_p);
 
-       if (!IsCapable(client_p, CAP_ZIP))
-               send_pop_queue(client_p);
+       send_pop_queue(client_p);
 
        return 0;
 }
@@ -1178,13 +1148,6 @@ serv_connect(struct server_conf *server_p, struct Client *by)
        }
 }
 
-static void
-serv_connect_ev(void *data)
-{
-       struct Client *client_p = data;
-       serv_connect_callback(client_p->localClient->F, RB_OK, client_p);
-}
-
 static void
 serv_connect_ssl_callback(rb_fde_t *F, int status, void *data)
 {
@@ -1204,7 +1167,7 @@ serv_connect_ssl_callback(rb_fde_t *F, int status, void *data)
 
        client_p->localClient->ssl_ctl = start_ssld_connect(F, xF[1], rb_get_fd(xF[0]));
        SetSSL(client_p);
-       rb_event_addonce("serv_connect_ev", serv_connect_ev, client_p, 1);              
+       serv_connect_callback(client_p->localClient->F, RB_OK, client_p);
 }
 
 /*
@@ -1289,9 +1252,6 @@ serv_connect_callback(rb_fde_t *F, int status, void *data)
        /* Next, send the initial handshake */
        SetHandshake(client_p);
 
-       /* kludge, if we're not using TS6, dont ever send
-        * ourselves as being TS6 capable.
-        */
        if(!EmptyString(server_p->spasswd))
        {
                sendto_one(client_p, "PASS %s TS %d :%s",