From f8283571ad0eba2e8848728cb9e204bdfe7bdead Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Wed, 21 Jan 2009 20:15:07 +0100 Subject: [PATCH] Simplify hunt_server(), send ERR_NOSUCHSERVER from only one place. --- src/s_serv.c | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/src/s_serv.c b/src/s_serv.c index 069fac4..f45be64 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -156,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) + RB_DLINK_FOREACH(ptr, global_client_list.head) { - 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 - { - 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;