Merge pull request #288 from edk0/umode-o-split

[solanum.git] / extensions / extb_channel.c

diff --git a/extensions/extb_channel.c b/extensions/extb_channel.c
index a40a05f4bdbc5ef12e74c346c037e778ee1b04dd..0de1d6ddfcca44ee9c4d65b8f3cbb7e700362eb2 100644 (file)
--- a/extensions/extb_channel.c
+++ b/extensions/extb_channel.c
@@ -1,8 +1,6 @@
 /*
- * Channel extban type: matches users who are in a certain public channel
+ * Channel extban type: matches users who are in a certain channel
  * -- jilles
- *
- * $Id: extb_channel.c 1723 2006-07-06 15:23:58Z jilles $
  */
 
 #include "stdinc.h"
@@ -12,11 +10,13 @@
 #include "hash.h"
 #include "ircd.h"
 
+static const char extb_desc[] = "Channel ($c) extban type";
+
 static int _modinit(void);
 static void _moddeinit(void);
 static int eb_channel(const char *data, struct Client *client_p, struct Channel *chptr, long mode_type);
 
-DECLARE_MODULE_AV1(extb_channel, _modinit, _moddeinit, NULL, NULL, NULL, "$Revision: 1723 $");
+DECLARE_MODULE_AV2(extb_channel, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, extb_desc);
 
 static int
 _modinit(void)
@@ -47,8 +47,5 @@ static int eb_channel(const char *data, struct Client *client_p,
        /* require consistent target */
        if (chptr->chname[0] == '#' && data[0] == '&')
                return EXTBAN_INVALID;
-       /* privacy! don't allow +s/+p channels to influence another channel */
-       if (!PubChannel(chptr2) && chptr2 != chptr)
-               return EXTBAN_INVALID;
        return IsMember(client_p, chptr2) ? EXTBAN_MATCH : EXTBAN_NOMATCH;
 }