From 031c4b89d360e329c5d3eb4cb5a34b9b7323e30a Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Tue, 21 Apr 2009 18:43:07 +0200 Subject: [PATCH] Move check for required CAPABs to mr_server -- CAPAB may not be sent. Also fix exit message. --- modules/core/m_server.c | 18 ++++++++++++++++++ modules/m_capab.c | 17 ----------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/modules/core/m_server.c b/modules/core/m_server.c index e4abd35..fc9a453 100644 --- a/modules/core/m_server.c +++ b/modules/core/m_server.c @@ -75,6 +75,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char const char *name; struct Client *target_p; int hop; + struct Capability *cap; name = parv[1]; hop = atoi(parv[2]); @@ -108,6 +109,23 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char return 0; } + /* check to ensure any "required" caps are set. --nenolod */ + for (cap = captab; cap->name; cap++) + { + if (!cap->required) + continue; + + if (!(client_p->localClient->caps & cap->cap)) + { + char exitbuf[BUFSIZE]; + + rb_snprintf(exitbuf, BUFSIZE, "Missing required CAPAB [%s]", cap->name); + exit_client(client_p, client_p, client_p, exitbuf); + + return 0; + } + } + /* Now we just have to call check_server and everything should be * check for us... -A1kmm. */ switch (check_server(name, client_p)) diff --git a/modules/m_capab.c b/modules/m_capab.c index 650d8ab..227a997 100644 --- a/modules/m_capab.c +++ b/modules/m_capab.c @@ -96,23 +96,6 @@ mr_capab(struct Client *client_p, struct Client *source_p, int parc, const char } } - /* check to ensure any "required" caps are set. --nenolod */ - for (cap = captab; cap->name; cap++) - { - if (!cap->required) - continue; - - if (!(client_p->localClient->caps & cap->cap)) - { - char exitbuf[BUFSIZE]; - - rb_snprintf(exitbuf, BUFSIZE, "Missing required CAPAB [%s]", cap->cap); - exit_client(client_p, client_p, client_p, exitbuf); - - return 0; - } - } - return 0; }