Added an option to prevent non-IRCops creating channels if the option…

… is enabled
evilnet · May 1, 2014 · 66e8f3a · 66e8f3a
1 parent 273d06c
commit 66e8f3a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,5 @@ ircu.tags
 autom4te.cache
 stamp-h1
 include/patchlist.h
+.orig
 
diff --git a/doc/example.conf b/doc/example.conf
@@ -1269,6 +1269,7 @@ features
 #  "CHMODE_m_NONICKCHANGE" = "TRUE";
 #  "CHMODE_r_NONICKCHANGE" = "TRUE";
 #  "SILENCE_CHANMSGS" = "TRUE";
+#  "CHANNEL_CREATE_IRCOPONLY" = "FALSE";
 #  "CHMODE_a" = "TRUE";
 #  "CHMODE_c" = "TRUE";
 #  "CHMODE_C" = "TRUE";

diff --git a/doc/readme.features b/doc/readme.features
@@ -1273,6 +1273,12 @@ SILENCE_CHANMSGS
 When enabled SILENCE masks are applied to channel messages as well as to private
 messages.
 
+CHANNEL_CREATE_IRCOPONLY
+ * Type: boolean
+ * Default: FALSE
+
+When enabled only IRCops can create channels.
+
 CHMODE_a
  * Type: boolean
  * Default: TRUE

diff --git a/include/ircd_features.h b/include/ircd_features.h
@@ -216,6 +216,7 @@ enum Feature {
   FEAT_CHMODE_m_NONICKCHANGE,
   FEAT_CHMODE_r_NONICKCHANGE,
   FEAT_SILENCE_CHANMSGS,
+  FEAT_CHANNEL_CREATE_IRCOPONLY,
 
   /* Extended channel modes */
   FEAT_CHMODE_a,

diff --git a/ircd/ircd_features.c b/ircd/ircd_features.c
@@ -684,6 +684,7 @@ static struct FeatureDesc {
   F_B(CHMODE_m_NONICKCHANGE, 0, 1, 0 ),
   F_B(CHMODE_r_NONICKCHANGE, 0, 1, 0 ),
   F_B(SILENCE_CHANMSGS, 0, 1, 0 ),
+  F_B(CHANNEL_CREATE_IRCOPONLY, 0, 0, 0 ),
 
   /* Extended channel modes */
   F_B(CHMODE_a, 0, 1, 0),

diff --git a/ircd/m_join.c b/ircd/m_join.c
@@ -122,6 +122,11 @@ void do_join(struct Client *cptr, struct Client *sptr, struct JoinBuf *join,
       return;
     }
 
+    if (feature_bool(FEAT_CHANNEL_CREATE_IRCOPONLY) && !IsAnOper(sptr) && !IsChannelService(sptr)) {
+      send_reply(sptr, ERR_NOSUCHCHANNEL, chan);
+      return;
+    }
+
     if (!(chptr = get_channel(sptr, chan, CGT_CREATE)))
       return;