From 26c553d0b0b4edb6088324d44c9b05c513d4253e Mon Sep 17 00:00:00 2001
From: michael <michael@82007160-df01-0410-b94d-b575c5fd34c7>
Date: Thu, 25 Apr 2013 15:00:52 +0000
Subject: - 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
---
 modules/core/m_join.c | 5 ++---
 modules/m_info.c      | 6 ------
 modules/m_resv.c      | 4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'modules')

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,
diff --git a/modules/m_info.c b/modules/m_info.c
index e03d06a..f2c29a1 100644
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -150,12 +150,6 @@ static const struct InfoStruct info_table[] =
     &ConfigChannel.disable_fake_channels,
     "Forbids channels with special ASCII characters in their name"
   },
-  {
-    "restrict_channels",
-    OUTPUT_BOOLEAN_YN,
-    &ConfigChannel.restrict_channels,
-    "Only reserved channels are allowed"
-  },
   {
     "knock_delay",
     OUTPUT_DECIMAL,
diff --git a/modules/m_resv.c b/modules/m_resv.c
index 6cdd293..9fd3cbb 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)) == NULL)
+    if ((conf = create_resv(name, reason, NULL)) == 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)) == NULL)
+    if ((conf = create_resv(name, reason, NULL)) == NULL)
     {
       sendto_one(source_p,
                  ":%s NOTICE %s :A RESV has already been placed on nick %s",
-- 
cgit