diff options
| author | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-04-25 15:00:52 +0000 |
|---|---|---|
| committer | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-04-25 15:00:52 +0000 |
| commit | 26c553d0b0b4edb6088324d44c9b05c513d4253e (patch) | |
| tree | 2e712920fa5f79385b3a2f69e02f63bdca481984 /modules/core | |
| parent | bdb5e02835c2dd4120c0b189c2ac7c7ab88f82e1 (diff) | |
- Added basic support for libGeoIP
- Added exempt configuration option to resv{} blocks
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1858 82007160-df01-0410-b94d-b575c5fd34c7
Diffstat (limited to 'modules/core')
| -rw-r--r-- | modules/core/m_join.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/core/m_join.c b/modules/core/m_join.c index 2073d5d..f8eef23 100644 --- a/modules/core/m_join.c +++ b/modules/core/m_join.c @@ -135,10 +135,9 @@ m_join(struct Client *client_p, struct Client *source_p, if (!IsExemptResv(source_p) && !(HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.oper_pass_resv) && - (!(conf = match_find_resv(chan)) == ConfigChannel.restrict_channels)) + ((conf = match_find_resv(chan)) && !resv_find_exempt(source_p, conf))) { - if (conf) - ++conf->count; + ++conf->count; sendto_one(source_p, form_str(ERR_CHANBANREASON), me.name, source_p->name, chan, conf ? conf->reason : "Reserved channel"); sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE, |