diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/core/m_join.c | 3 | ||||
| -rw-r--r-- | modules/m_resv.c | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/core/m_join.c b/modules/core/m_join.c index 7937d0c..c5b21e4 100644 --- a/modules/core/m_join.c +++ b/modules/core/m_join.c @@ -36,6 +36,7 @@ #include "conf.h" #include "parse.h" #include "modules.h" +#include "resv.h" static void do_join_0(struct Client *, struct Client *); @@ -134,7 +135,7 @@ m_join(struct Client *client_p, struct Client *source_p, if (!IsExemptResv(source_p) && !(HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.oper_pass_resv) && - (!(conf = hash_find_resv(chan)) == ConfigChannel.restrict_channels)) + (!(conf = match_find_resv(chan)) == ConfigChannel.restrict_channels)) { if (conf) ++conf->count; diff --git a/modules/m_resv.c b/modules/m_resv.c index 785c068..6cdd293 100644 --- a/modules/m_resv.c +++ b/modules/m_resv.c @@ -221,7 +221,7 @@ parse_resv(struct Client *source_p, char *name, int tkline_time, char *reason) { struct MaskItem *conf = NULL; - if ((conf = create_channel_resv(name, reason, 0)) == NULL) + if ((conf = create_channel_resv(name, reason)) == NULL) { sendto_one(source_p, ":%s NOTICE %s :A RESV has already been placed on channel: %s", @@ -281,7 +281,7 @@ parse_resv(struct Client *source_p, char *name, int tkline_time, char *reason) return; } - if ((conf = create_nick_resv(name, reason, 0)) == NULL) + if ((conf = create_nick_resv(name, reason)) == NULL) { sendto_one(source_p, ":%s NOTICE %s :A RESV has already been placed on nick %s", @@ -334,8 +334,7 @@ remove_resv(struct Client *source_p, const char *name) if (IsChanPrefix(*name)) { - if (resv_channel_list.head == NULL || - !(conf = hash_find_resv(name))) + if ((conf = find_exact_name_conf(CONF_CRESV, NULL, name, NULL, NULL)) == NULL) { sendto_one(source_p, ":%s NOTICE %s :A RESV does not exist for channel: %s", @@ -351,7 +350,7 @@ remove_resv(struct Client *source_p, const char *name) return; } - delete_channel_resv(conf); + conf_free(conf); sendto_one(source_p, ":%s NOTICE %s :The RESV has been removed on channel: %s", me.name, source_p->name, name); |